From b10c478bafe508ee94c60cb847415209af600b91 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 11 Apr 2025 09:18:42 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E3=80=81=E5=9B=9E=E4=BC=A0=E5=A2=9E=E5=8A=A0=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7=E5=87=BA=E5=BA=93=E7=9B=B8=E5=85=B3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java   | 2 +-
 .../service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java  | 4 +++-
 .../st/returns/service/impl/InAndOutRetrunServiceImpl.java    | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
index 706f67eac..292dc4512 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/enums/IOSEnum.java
@@ -43,7 +43,7 @@ public enum IOSEnum {
     //出库单据类型
     OUT_TYPE(MapOf.of("发货出库", "1001", "改切出库", "1003", "调拨出库", "1004", "拆箱出库", "1005",
             "返检出库", "1006", "超期报废", "1007", "退货报废", "1008", "质量问题报废", "1010", "其他报废", "1002",
-            "手工出库", "1009"
+            "手工出库", "1009","管控出库", "1099"
     )),
 
     //移库单据类型
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 43db3fddb..bf266eb93 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
@@ -947,7 +947,9 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         /*
          * 如果为返检出库或者改切出库删除对应的包装关系
          */
-        if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("返检出库")) || mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("改切出库"))) {
+        if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("返检出库")) || mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("改切出库"))
+                || mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("管控出库"))
+        ) {
 
             // 查询库区
             String sect_in = disDaoList.stream()
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 7a01f1afe..df192d25a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -269,7 +269,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
                 }
 
                 // 返检出库：回传mes
-                if (StrUtil.equals(bill_type, "1006")) {
+                if (StrUtil.equals(bill_type, "1006") || StrUtil.equals(bill_type, "1099")) {
                     JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                     // 判断是否有未完成的任务
                     ifUnTask(disArr.toJavaList(JSONObject.class));
@@ -1546,7 +1546,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
             }
 
             // 返检出库：回传mes
-            if (StrUtil.equals(bill_type, "1006")) {
+            if (StrUtil.equals(bill_type, "1006") || StrUtil.equals(bill_type, "1099")) {
                 JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0);
                 // 判断是否有未完成的任务
                 ifUnTask(disArr.toJavaList(JSONObject.class));