From 06c84bcb141c7c99f465f012bc7428699a785478 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sat, 21 Sep 2024 18:06:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E4=B8=8A=E8=B4=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderBackupService.java  | 19 ++++++++-----------
 .../service/inout/IoSplitFifoInvService.java  |  9 ++++++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index 6ffd661c0..73cee8413 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -83,7 +83,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     private ErpBasicClient erpBasicClient;
 
 
-
     public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
         if (collectOrderRequest == null) {
             return Collections.emptyList();
@@ -107,8 +106,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     public List<CollectOrderBizResponse> combieOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
         List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterList(collectOrderBizRequest);
 
-        List<IoCollectOrderCodeAuto> splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 1);
-        List<IoCollectOrderCodeAuto> unSplitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 2);
+        List<IoCollectOrderCodeAuto> splitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), null);
+//        List<IoCollectOrderCodeAuto> unSplitCodes = collectOrderCodeAutoService.listByBillNo(collectOrderBizRequest.getOrderIdFk(), 2);
         List<IoCollectOrderCodeMan> manList = collectOrderCodeManService.listByBillNo(collectOrderBizRequest.getOrderIdFk());
 
         List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
@@ -124,12 +123,12 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             if (StrUtil.isNotEmpty(collectOrderBizResponse.getSplitUdiCode())) {
                 collectOrderBizResponse.setSplitUdiCode(collectOrderBizResponse.getSplitUdiCode().substring(1));
             }
-            //整取
-            for (IoCollectOrderCodeAuto collectOrderCodeAuto : unSplitCodes) {
-                if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
-                    collectOrderBizResponse.setUnSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getUnSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode());
-                }
-            }
+//            //整取
+//            for (IoCollectOrderCodeAuto collectOrderCodeAuto : unSplitCodes) {
+//                if (IntUtil.value(collectOrderCodeAuto.getBizIdFk()) == IntUtil.value(collectOrderBiz.getId())) {
+//                    collectOrderBizResponse.setUnSplitUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getUnSplitUdiCode()) + "," + collectOrderCodeAuto.getUdiCode());
+//                }
+//            }
             if (StrUtil.isNotEmpty(collectOrderBizResponse.getUnSplitUdiCode())) {
                 collectOrderBizResponse.setUnSplitUdiCode(collectOrderBizResponse.getUnSplitUdiCode().substring(1));
             }
@@ -159,8 +158,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     }
 
 
-
-
     @Transactional(rollbackFor = Exception.class)
     public void generateOrder(String billNo) {
 
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
index 212771b6c..4101af71b 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java
@@ -81,7 +81,9 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
             IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
             if (splitFifoInv != null) {
                 splitFifoInv.setInCount(IntUtil.value(splitFifoInv.getInCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
-                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
+                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getAvailableCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
+                updateById(splitFifoInv);
             } else {
                 splitFifoInv = IoSplitFifoInv.builder()
                         .id(IdUtil.getSnowflakeNextId())
@@ -112,6 +114,7 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
             }
             ioSplitFifoCodeEntity.setInvIdFk(splitFifoInv.getId());
         }
+
         splitFifoCodeService.saveBatch(splitCodeEntities);
     }
 
@@ -140,12 +143,12 @@ public class IoSplitFifoInvService extends ServiceImpl<IoSplitFifoInvMapper, IoS
             }
         }
         splitFifoCodeService.removeBatchByIds(splitCodeEntities);
-
         for (IoSplitFifoCodeEntity ioSplitFifoCodeEntity : splitCodeEntities) {
             IoSplitFifoInv splitFifoInv = findByFifoCode(ioSplitFifoCodeEntity);
             if (splitFifoInv != null) {
                 splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(ioSplitFifoCodeEntity.getTotalCount()));
-                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
+                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                updateById(splitFifoInv);
             }
         }