From 560e6eb318ae7143156d5794990c8585279548a3 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Wed, 28 Aug 2024 11:57:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/collect/IoCollectOrderService.java  | 17 ++++++++++++++---
 src/main/resources/schemas/io_collect_order.sql |  3 ---
 src/main/resources/schemas/schema_v2.4.sql      |  9 +++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)
 delete mode 100644 src/main/resources/schemas/io_collect_order.sql

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 2da53e562..d0833fd6c 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -43,6 +43,7 @@ import com.glxp.api.service.inout.*;
 import com.glxp.api.service.inout.impl.IoCodeService;
 import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
+import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -89,6 +90,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     IoCollectOrderCodeManService collectOrderCodeManService;
     @Resource
     IoCollectCodeService collectCodeService;
+    @Resource
+    UdiCalCountUtil udiCalCountUtil;
 
     public IoCollectOrder getByBillNo(String billNo) {
         return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
@@ -439,14 +442,14 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             IoCollectOrderBiz bizServiceOne = collectOrderBizService.getOne(new LambdaQueryWrapper<IoCollectOrderBiz>()
                     .eq(IoCollectOrderBiz::getId, bizIdFk));
             if (bizServiceOne == null) throw new JsonException("扫码详情未查找到");
-            //反差单据类型 查看是否来源业务单
+            //反查单据类型 查看是否来源业务单
             String orderIdFk = bizServiceOne.getOrderIdFk();
             IoCollectOrder ioCollectOrder = collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, orderIdFk));
-            if (ioCollectOrder == null) throw new JsonException("反差单据失败");
+            if (ioCollectOrder == null) throw new JsonException("反查单据失败");
             String busType = ioCollectOrder.getBusType();
             Long workPlaceCode = ioCollectOrder.getWorkPlaceCode();
             SysWorkplaceDocumentEntity byWorkplaceCode = sysWorkplaceDocumentService.findByWorkplaceCode(workPlaceCode, busType);
-            if (byWorkplaceCode == null) throw new JsonException("反差工位单据类型失败");
+            if (byWorkplaceCode == null) throw new JsonException("反查工位单据类型失败");
             Integer scanType = byWorkplaceCode.getScanType();
             Integer oneScanCount = bizServiceOne.getScanCount();
             Integer newCount = oneScanCount - delCount;
@@ -454,6 +457,14 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 collectOrderBizService.removeById(bizServiceOne);
             } else {
                 bizServiceOne.setScanCount(newCount);
+
+                List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(bizServiceOne.getNameCode(), null);
+                if (IntUtil.value(byWorkplaceCode.getOrderCirType()) == 1) {
+                    bizServiceOne.setScanActCount(IntUtil.value(bizServiceOne.getScanActCount()) -  udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    bizServiceOne.setScanActCount(IntUtil.value(bizServiceOne.getScanActCount()) -  udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                }
+
                 collectOrderBizService.updateById(bizServiceOne);
             }
         }
diff --git a/src/main/resources/schemas/io_collect_order.sql b/src/main/resources/schemas/io_collect_order.sql
deleted file mode 100644
index 5e1807f9e..000000000
--- a/src/main/resources/schemas/io_collect_order.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- 新增排序时间字段
-ALTER TABLE `udi_wms_ct`.`io_collect_order`
-    ADD COLUMN `orderTime` datetime(0) NULL COMMENT '排序时间' AFTER `remark8`;
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 678951be3..e1e0a3458 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4276,3 +4276,12 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount',
 CALL Pro_Temp_ColumnWork('io_collect_order', 'invAlert',
                          'int NULL DEFAULT b''0'' COMMENT ''库存预警： 1:正常; 2:不足''',
                          1);
+
+CALL Pro_Temp_ColumnWork('io_collect_order', 'orderTime',
+                         ' datetime(0) NULL COMMENT ''排序时间''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('io_collect_order_code_auto', 'bizIdFk',
+                         'int NULL DEFAULT NULL COMMENT ''业务详情ID外键''',
+                         1);