From 361407a5e473200e546c30a11568d76c3fa0bf84 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 22 Jul 2024 11:03:58 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=B0=83=E6=8B=A8=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvOutServiceImpl.java    | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
index 49471551f..733c2db03 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
@@ -718,6 +718,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
 
         // 更新单据
         mstDao.setBill_status(IOSEnum.BILL_STATUS.code("完成"));
+        mstDao.setConfirm_optid(Long.parseLong(SecurityUtils.getCurrentUserId()));
+        mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
+        mstDao.setConfirm_time(DateUtil.now());
         this.updateById(mstDao);
 
         /*
@@ -967,6 +970,12 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             throw new BadRequestException("未查询到对应的移入仓库信息！");
         }
 
+        // 查询出库单的一条明细
+        StIvtIostorinvdtl dtlDao = iStIvtIostorinvdtlService.list(
+                new QueryWrapper<StIvtIostorinvdtl>().lambda()
+                        .eq(StIvtIostorinvdtl::getIostorinv_id, mstDao.getIostorinv_id())
+        ).stream().findFirst().orElse(null);
+
         // 计算总数量
         BigDecimal total_qty = disDaoList.stream()
                 .map(row -> BigDecimal.valueOf(row.getPlan_qty().doubleValue()))
@@ -1012,6 +1021,8 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             jsonDtl.put("customer_name", suJobList.get(0).getString("customer_name"));
             jsonDtl.put("sale_order_name", suJobList.get(0).getString("sale_order_name"));
             jsonDtl.put("product_description", suJobList.get(0).getString("product_description"));
+            jsonDtl.put("source_bill_code", suJobList.get(0).getString("sale_order_name"));
+            jsonDtl.put("vbeln", dtlDao.getVbeln());
             jsonDtl.put("quality_scode", IOSEnum.QUALITY_SCODE.code("合格品"));
             jsonDtl.put("ivt_level", IOSEnum.CREATE_MODE.code("PC产生"));
             jsonDtl.put("is_active", IOSEnum.IS_NOTANDYES.code("是"));
@@ -1454,11 +1465,17 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         if (one_create) {
             // 至少一个别的状态
             mstDao.setBill_status(IOSEnum.BILL_STATUS.code("分配中"));
+            mstDao.setDis_optid(Long.parseLong(SecurityUtils.getCurrentUserId()));
+            mstDao.setDis_optname(SecurityUtils.getCurrentNickName());
+            mstDao.setDis_time(DateUtil.now());
         }
 
         if (div_create) {
             // 分配完状态
             mstDao.setBill_status(IOSEnum.BILL_STATUS.code("分配完"));
+            mstDao.setDis_optid(Long.parseLong(SecurityUtils.getCurrentUserId()));
+            mstDao.setDis_optname(SecurityUtils.getCurrentNickName());
+            mstDao.setDis_time(DateUtil.now());
         }
 
         if (confirm_create) {
@@ -1467,8 +1484,6 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             mstDao.setConfirm_optid(Long.parseLong(SecurityUtils.getCurrentUserId()));
             mstDao.setConfirm_optname(SecurityUtils.getCurrentNickName());
             mstDao.setConfirm_time(DateUtil.now());
-
-            // 调用单据确认
         }
 
         this.updateById(mstDao);