From 19d62e09ea5a62d756200ed3221a1998fb1051f4 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 4 Jan 2025 11:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManService.java | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index 99c4b838d..a4e317fbf 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -186,7 +186,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         // 拿到产品采购类型
         // code  purType  查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
         if (collectSet.getIsScanCodeCheck()) {
-            if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1  && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
+            if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
                 IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
                         .eq(IoCollectCodeBackup::getCode, code)
                         .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType()));
@@ -409,10 +409,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
                         collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                     } else {
-//                        collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-//                        collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
-                        collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                        collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+                        collectOrderBiz.setAddScanCount(1);
+                        collectOrderBiz.setAddScanActCount(scanCount);
                     }
                     break;
                 case 2: //不插入
@@ -430,10 +428,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                         }
                         throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出！");
                     }
-//                    collectOrderBiz.setScanCount(count);
-//                    collectOrderBiz.setScanActCount(actCount);
-                    collectOrderBiz.setAddScanCount(count);
-                    collectOrderBiz.setAddScanActCount(actCount);
+                    collectOrderBiz.setAddScanCount(1);
+                    collectOrderBiz.setAddScanActCount(scanCount);
                     break;
                 case 3: //提醒是否插入
 
@@ -461,26 +457,21 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                             }
 
                         }
-//                        collectOrderBiz.setScanCount(count1);
-//                        collectOrderBiz.setScanActCount(actCount1);
-                        collectOrderBiz.setAddScanCount(count1);
-                        collectOrderBiz.setAddScanActCount(actCount1);
+                        collectOrderBiz.setAddScanCount(1);
+                        collectOrderBiz.setAddScanActCount(scanCount);
                     } else {
                         if (collectOrderBiz == null) {
                             collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
                             collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
                         } else {
-//                            collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-//                            collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
-                            collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
-                            collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
+                            collectOrderBiz.setAddScanCount(1);
+                            collectOrderBiz.setAddScanActCount(scanCount);
                         }
                     }
                     break;
                 default:
                     break;
             }
-//            collectOrderBiz.setAddScanCount(1);
             collectOrderBizService.insertOrUpdate(collectOrderBiz);
         }