Compare commits
No commits in common. "52f8a8585fa5759abb67364c4553b376b9c3da4b" and "13ee5b8ee18ad8838f7a9b23e69a81991840acfb" have entirely different histories.
52f8a8585f
...
13ee5b8ee1
|
|
@ -56,10 +56,13 @@ public class DataStatisticsUtil {
|
||||||
// 昨日非激活 排除昨日日结表数据
|
// 昨日非激活 排除昨日日结表数据
|
||||||
excludeDailySettlementData(detailVOList);
|
excludeDailySettlementData(detailVOList);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 2025年6月17日 团队盒数不包含注水,在此无需再次排除
|
||||||
else{
|
else{
|
||||||
// 排除注水数据
|
// 排除注水数据
|
||||||
excludeWaterInjectionData(detailVOList, pkId);
|
excludeWaterInjectionData(detailVOList, pkId);
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
|
CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
|
||||||
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
|
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
|
||||||
Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();
|
Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue