From 24fd90e76f044e57be55c94f499c6fa97ab2d0dd Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 11 Mar 2025 19:48:24 +0800
Subject: [PATCH] =?UTF-8?q?3/11=20=E9=80=89=E5=85=A5=E5=B7=B2=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=8D=95=E6=8D=AE=20=E4=BF=AE=E6=94=B91.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inout/IoCodeTempController.java           | 21 +++++++++++++++----
 .../glxp/api/req/inout/AddOrderRequest.java   |  5 +++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 102f315fe..fbdcb3cd5 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -134,6 +134,10 @@ public class IoCodeTempController extends BaseController {
     @Autowired
     IoSplitFifoCodeService ioSplitFifoCodeService;
 
+    @Autowired
+    IoCollectOrderCodeManService collectOrderCodeManService;
+
+
 
     /**
      * PDA-----单据上传
@@ -1045,10 +1049,14 @@ public class IoCodeTempController extends BaseController {
                 }
 
                 //计算实际数量
-                if (bussinessTypeEntity.isUse()) {
-                    codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
-                } else {
-                    codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                if (addOrderRequest.getScanActCount() != null){
+                    codeEnttity.setReCount(addOrderRequest.getScanActCount());
+                }else {
+                    if (bussinessTypeEntity.isUse()) {
+                        codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                    } else {
+                        codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                    }
                 }
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
@@ -2911,6 +2919,11 @@ public class IoCodeTempController extends BaseController {
                 }
 
             } else {
+//                IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(orderFinishBillNo);
+                IoCollectOrderCodeMan one = collectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
+                        .eq(IoCollectOrderCodeMan::getOrderIdFk, orderFinishBillNo)
+                        .eq(IoCollectOrderCodeMan::getUdiCode, code));
+                addOrderRequest.setScanActCount(one.getScanActCount());
                 baseResponse = addMaterOrder(addOrderRequest, udiEntity, code,groupNumber);
             }
 
diff --git a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
index 5a80f7876..4d7062b16 100644
--- a/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/AddOrderRequest.java
@@ -71,5 +71,10 @@ public class AddOrderRequest {
     @TableField(value = "fifoSplitTag")
     private Integer fifoSplitTag;
 
+    /**
+     * 选入已经完成单据的实际数量
+     */
+    private Integer scanActCount;
+
 
 }