From e5d446d0010da8a400e7ba20fa7ac908e43c2086 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 5 Apr 2025 13:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBizService.java     | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

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 1d4d6a745..b7042e038 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBizService.java
@@ -13,6 +13,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
 import com.glxp.api.service.basic.UdiProductService;
+import com.glxp.api.util.IntUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -38,14 +39,14 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
             PageHelper.offsetPage(offset, collectOrderRequest.getLimit());
         }
         List<CollectOrderBizResponse> data = collectOrderBizMapper.filterList(collectOrderRequest);
-        if (collectOrderRequest.getIsOrderCheck() == null){
-            for (CollectOrderBizResponse collectOrderBizResponse : data){
+        if (collectOrderRequest.getIsOrderCheck() == null) {
+            for (CollectOrderBizResponse collectOrderBizResponse : data) {
                 collectOrderBizResponse.setProductLocation(setProductName(collectOrderBizResponse));
             }
         }
         //设置 应该扫码数量 shouldCount
-        if (data.size() > 0){
-            for (CollectOrderBizResponse collectOrderBizResponse : data){
+        if (data.size() > 0) {
+            for (CollectOrderBizResponse collectOrderBizResponse : data) {
                 List<BasicProductsEntity> productList = basicProductsDao.selectList(
                         new LambdaQueryWrapper<BasicProductsEntity>()
                                 .eq(BasicProductsEntity::getYbbm, collectOrderBizResponse.getYbbm())
@@ -53,28 +54,28 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
                 BasicProductsEntity product = productList.get(0);
                 Integer myBhxjsl = product.getBhxjsl();
                 Integer shouldCount = 0;
-                double quotient = (double)collectOrderBizResponse.getCount() / myBhxjsl;
+                double quotient = (double) collectOrderBizResponse.getCount() / myBhxjsl;
                 int integerPart = (int) quotient;
                 if (quotient == integerPart) {
-                    if (integerPart == 0){
-                        if (collectOrderBizResponse.getAutoTagStatus() != 2){
+                    if (integerPart == 0) {
+                        if (collectOrderBizResponse.getAutoTagStatus() != 2) {
                             shouldCount = 1;
                         }
                     } else {
                         shouldCount = integerPart;
                     }
                 } else {
-                    if (collectOrderBizResponse.getAutoTagStatus() == 2){
+                    if (IntUtil.value(collectOrderBizResponse.getAutoTagStatus()) == 2) {
                         shouldCount = 0;
-                    }else {
+                    } else {
                         shouldCount = integerPart + 1;
                     }
                 }
                 collectOrderBizResponse.setShouldCount(shouldCount);
-                if (collectOrderBizResponse.getScanCount() == null){
+                if (collectOrderBizResponse.getScanCount() == null) {
                     collectOrderBizResponse.setScanCount(0);
                 }
-                if (collectOrderBizResponse.getScanActCount() == null){
+                if (collectOrderBizResponse.getScanActCount() == null) {
                     collectOrderBizResponse.setScanActCount(0);
                 }
             }
@@ -82,8 +83,8 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         return data;
     }
 
-    public String setProductName(CollectOrderBizResponse collectOrderBizResponse){
-        if (StrUtil.isEmpty(collectOrderBizResponse.getWorkplaceQueueCode())){
+    public String setProductName(CollectOrderBizResponse collectOrderBizResponse) {
+        if (StrUtil.isEmpty(collectOrderBizResponse.getWorkplaceQueueCode())) {
             //todo 暂时解决办法
             return "";
         }
@@ -93,26 +94,26 @@ public class IoCollectOrderBizService extends ServiceImpl<IoCollectOrderBizMappe
         // 检查分割后的数组长度是否符合预期
         if (parts.length == 3) {
             // 分别赋值给对应的变量
-             shelf = parts[0];  // 货架
-             layer = parts[1];  // 层
+            shelf = parts[0];  // 货架
+            layer = parts[1];  // 层
         }
         StringBuilder sb = new StringBuilder();
-            if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) {
-                sb.append(collectOrderBizResponse.getRegionName());
-            }
-            if (collectOrderBizResponse.getFreightName() != null && !collectOrderBizResponse.getFreightName().isEmpty()) {
-                if (sb.length() > 0) {
-                    sb.append("-");
-                }
-                sb.append(collectOrderBizResponse.getFreightName());
+        if (collectOrderBizResponse.getRegionName() != null && !collectOrderBizResponse.getRegionName().isEmpty()) {
+            sb.append(collectOrderBizResponse.getRegionName());
+        }
+        if (collectOrderBizResponse.getFreightName() != null && !collectOrderBizResponse.getFreightName().isEmpty()) {
+            if (sb.length() > 0) {
+                sb.append("-");
             }
+            sb.append(collectOrderBizResponse.getFreightName());
+        }
         if (layer != null && !layer.isEmpty()) {
             if (sb.length() > 0) {
                 sb.append("-");
             }
             sb.append(layer + "层");
         }
-            return sb.toString();
+        return sb.toString();
     }