From 9946284db076d3f3fc47f37f4301da38d181e746 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 7 Feb 2025 15:13:29 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=BB=A1=E5=85=A5=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=B7=B7=E9=81=93=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/iostorInv/impl/StIvtIostorinvServiceImpl.java    | 3 +++
 .../service/iostorInv/util/impl/InBussManageServiceImpl.java | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
index b961fadb6..c2b11d9e9 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
@@ -339,6 +339,9 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
                         jsonAttr = attrTab.query("sect_id = '" + jsonObject.getString("sect_id") + "' AND lock_type = '1' AND is_delete = '0' AND IFNULL( storagevehicle_code, '' ) = ''").uniqueResult(0);
                     } else {
                         //TODO jsonAttr = inBussManageService.getOneStruct(attrParam);
+                        if (ObjectUtil.isNotEmpty(whereJson.get("in_buss"))) {
+                            attrParam.put("move_block_num", MapUtil.getStr(whereJson, "move_block_num"));
+                        }
                         jsonAttr = twoInBussManageService.getOneStruct(attrParam);
                     }
                 } else {
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
index 5a1fd12bf..307abc0b0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java
@@ -379,6 +379,9 @@ public class InBussManageServiceImpl implements InBussManageService {
                         .eq(StIvtIostorinvdtl::getIostorinvdtl_id, disList.get(0).get("iostorinvdtl_id"))
         ).get(0);
 
+        // 获取当前巷道
+        JSONObject jsonAttr = attrTab.query("struct_code = '" + taskDao.getPoint_code2() + "'").uniqueResult(0);
+
         JSONObject jsonDiv = new JSONObject();
         jsonDiv.put("dtl_row", JSONObject.parseObject(JSON.toJSONString(dtlDao)));
         jsonDiv.put("tableMater", disList);
@@ -386,6 +389,8 @@ public class InBussManageServiceImpl implements InBussManageService {
         jsonDiv.put("is_send", IOSEnum.IS_SEND.code("否"));
         jsonDiv.put("sect_id", IOSEnum.SECT_ID.code("二期主存区"));
         jsonDiv.put("stor_id", IOSEnum.STOR_ID.code("二期"));
+        jsonDiv.put("move_block_num", jsonAttr.getString("block_num"));
+        jsonDiv.put("in_buss", IOSEnum.IS_NOTANDYES.code("是"));
 
         iStIvtIostorinvService.divStruct(jsonDiv);