From 3f0e8cf45cfb7b54d84f4135c273c9723d50034c Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 9 Apr 2025 23:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=961.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/collect/CollectOrderBizResponse.java  |  3 +++
 .../collect/IoCollectOrderBizService.java     | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

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<IoCollectOrderBizMappe
         //设置 应该扫码数量 shouldCount
         if (data.size() > 0) {
             for (CollectOrderBizResponse collectOrderBizResponse : data) {
-                collectOrderBizResponse.setShouldCount(setShouldCount(collectOrderBizResponse));
+                List<Integer> 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<IoCollectOrderBizMappe
         return data;
     }
 
-    public Integer setShouldCount(CollectOrderBizResponse collectOrderBizResponse){
+    public List<Integer> setShouldCount(CollectOrderBizResponse collectOrderBizResponse){
+        ArrayList<Integer> integers = new ArrayList<>();
         List<BasicProductsEntity> productList = basicProductsDao.selectList(
                 new LambdaQueryWrapper<BasicProductsEntity>()
                         .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm())
@@ -224,13 +225,11 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         BasicProductsEntity product = productList.get(0);
         Integer myBhxjsl = product.getBhxjsl();
         Integer shouldCount = 0;
+        int remainder = collectOrderBizResponse.getCount() % myBhxjsl;
         double quotient = (double) collectOrderBizResponse.getCount() / myBhxjsl;
         int integerPart = (int) quotient;
         if (quotient == integerPart) {
             if (integerPart == 0) {
-                if (collectOrderBizResponse.getAutoTagStatus() != 2) {
-                    shouldCount = 1;
-                }
             } else {
                 shouldCount = integerPart;
             }
@@ -238,9 +237,11 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
             if (IntUtil.value(collectOrderBizResponse.getAutoTagStatus()) == 2) {
                 shouldCount = 0;
             } else {
-                shouldCount = integerPart + 1;
+                shouldCount = integerPart;
             }
         }
-        return shouldCount;
+        integers.add(shouldCount);
+        integers.add(remainder);
+        return integers;
     }
 }