From 4bbaa58d36019b34361d838c050a7332639a0804 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 15 Aug 2023 14:23:30 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9B=B4=E6=96=B0=E7=AE=B1?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvCpOutServiceImpl.java  | 23 ++++++++++++++++++-
 .../impl/StIvtIostorinvCpServiceImpl.java     | 22 +++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
index 8ecc36b9..bfa636f4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
@@ -653,7 +653,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
             // 3）解锁起点 / 将此托盘上的库存全部出掉
             unLockNext(dao.getStruct_id());
 
-            // 4) 更新箱记录表为出库
+      /*      // 4) 更新箱记录表为出库
             iMdPbBucketrecordService.update(
                     MdPbBucketrecord.builder()
                         .status(MasterEnum.BOX_STATUS.code("出库"))
@@ -662,6 +662,27 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl<StIvtIostorinvCp
                         .eq(MdPbBucketrecord::getStoragevehicle_code, dao.getStoragevehicle_code())
                         .eq(MdPbBucketrecord::getMaterial_id, dao.getMaterial_id())
                         .eq(MdPbBucketrecord::getStatus, MasterEnum.BOX_STATUS.code("出库"))
+            );*/
+        }
+
+        // 5.更新箱记录表为出库
+        Map<String, List<StIvtIostorinvdisCp>> disMap = iostorinvdisCpService.list(
+                new QueryWrapper<StIvtIostorinvdisCp>().lambda()
+                        .eq(StIvtIostorinvdisCp::getIostorinv_id, whereJson.getString("iostorinv_id"))
+        ).stream()
+                .collect(Collectors.groupingBy(StIvtIostorinvdisCp::getStoragevehicle_code));
+
+        for (String storagevehicle_code : disMap.keySet()) {
+            iMdPbBucketrecordService.update(
+                    MdPbBucketrecord.builder()
+                            .status(MasterEnum.BOX_STATUS.code("出库"))
+                            .outstor_optid(SecurityUtils.getCurrentUserId())
+                            .outstor_optname(SecurityUtils.getCurrentNickName())
+                            .outstor_time(DateUtil.now())
+                            .build(),
+                    new QueryWrapper<MdPbBucketrecord>().lambda()
+                            .eq(MdPbBucketrecord::getStoragevehicle_code, storagevehicle_code)
+                            .eq(MdPbBucketrecord::getStatus, MasterEnum.BOX_STATUS.code("入库"))
             );
         }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
index 22a8037d..19565b5a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java
@@ -730,7 +730,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
         );
 
         // 4.更新箱记录表状态为入库
-        List<StIvtIostorinvdisdtlCp> disDtlList = iStIvtIostorinvdisdtlCpService.list(
+       /* List<StIvtIostorinvdisdtlCp> disDtlList = iStIvtIostorinvdisdtlCpService.list(
                 new QueryWrapper<StIvtIostorinvdisdtlCp>().lambda()
                         .eq(StIvtIostorinvdisdtlCp::getIostorinv_id, whereJson.getString("iostorinv_id"))
         );
@@ -747,6 +747,26 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl<StIvtIostorinvCpMap
                     new QueryWrapper<MdPbBucketrecord>().lambda()
                             .eq(MdPbBucketrecord::getBucketunique, disDtlDao.getBucketunique())
             );
+        }*/
+
+        Map<String, List<StIvtIostorinvdisCp>> disMap = iostorinvdisCpService.list(
+                new QueryWrapper<StIvtIostorinvdisCp>().lambda()
+                        .eq(StIvtIostorinvdisCp::getIostorinv_id, whereJson.getString("iostorinv_id"))
+        ).stream()
+                .collect(Collectors.groupingBy(StIvtIostorinvdisCp::getStoragevehicle_code));
+
+        for (String storagevehicle_code : disMap.keySet()) {
+            iMdPbBucketrecordService.update(
+                    MdPbBucketrecord.builder()
+                            .status(MasterEnum.BOX_STATUS.code("入库"))
+                            .instor_optid(SecurityUtils.getCurrentUserId())
+                            .instor_optname(SecurityUtils.getCurrentNickName())
+                            .instor_time(DateUtil.now())
+                            .build(),
+                    new QueryWrapper<MdPbBucketrecord>().lambda()
+                            .eq(MdPbBucketrecord::getStoragevehicle_code, storagevehicle_code)
+                            .eq(MdPbBucketrecord::getStatus, MasterEnum.BOX_STATUS.code("组盘"))
+            );
         }
 
         // 5.更新任务为完成、更新库存、解锁点位