diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java index c3cccadc3..4bee47564 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java @@ -214,6 +214,9 @@ public class CollectOrderBizResponse { private Integer sumScanCount; + + private Integer splitCount; + // /** // * 未赋码数量 // */ diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java index a8fc8d2b4..717a8d736 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java @@ -18,13 +18,11 @@ import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.util.IntUtil; import com.ibm.icu.text.UFormat; +import org.aspectj.weaver.ast.Var; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Service @@ -57,7 +55,9 @@ public class IoCollectOrderBizService extends ServiceImpl 0) { for (CollectOrderBizResponse collectOrderBizResponse : data) { - collectOrderBizResponse.setShouldCount(setShouldCount(collectOrderBizResponse)); + List integers = setShouldCount(collectOrderBizResponse); + collectOrderBizResponse.setShouldCount(integers.get(0)); + collectOrderBizResponse.setSplitCount(integers.get(1)); if (collectOrderBizResponse.getScanCount() == null) { collectOrderBizResponse.setScanCount(0); } @@ -216,7 +216,8 @@ public class IoCollectOrderBizService extends ServiceImpl setShouldCount(CollectOrderBizResponse collectOrderBizResponse){ + ArrayList integers = new ArrayList<>(); List productList = basicProductsDao.selectList( new LambdaQueryWrapper() .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm()) @@ -224,13 +225,11 @@ public class IoCollectOrderBizService extends ServiceImpl