From a35bd633086274011f8e5272f488249244a44611 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 7 Aug 2025 09:43:49 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvOutServiceImpl.java      | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 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 73c8ae4..4577c98 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
@@ -1996,17 +1996,24 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             //如果是转单和换标出库
             /**
              *  request_param.put("isRePrintPackageBoxLabel", isRePrintPackageBoxLabel);
-             *                         request_param.put("isUnPackBox", isUnPackBox);
-             *                         request_param.put("UpdatedDateOfProduction", UpdatedDateOfProduction);
-             *                         request_param.put("DemandDate", DemandDate);
-             *                         request_param.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
+             *  request_param.put("isUnPackBox", isUnPackBox);
+             *  request_param.put("UpdatedDateOfProduction", UpdatedDateOfProduction);
+             *  request_param.put("DemandDate", DemandDate);
+             *  request_param.put("bill_type", IOSEnum.OUT_TYPE.code("转单出库"));
              */
-            if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("转单出库")) || mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
+            if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("转单出库"))) {
                 StIvtIostorinvdtl dtl = iStIvtIostorinvdtlService.getById(disDaoList.get(0).getIostorinvdtl_id());
                 //设置业务参数到任务参数里
                 if (ObjectUtil.isNotEmpty(dtl.getRemark())) {
                     request_param = JSONObject.parseObject(dtl.getRemark());
                 }
+            }else if (mst.getBill_type().equals(IOSEnum.OUT_TYPE.code("换标出库"))) {
+                //是否需要重打外包装标签
+                request_param.put("isRePrintPackageBoxLabel", IOSEnum.IS_NOTANDYES.code("是"));
+                //是否需要拆包重打子卷标签
+                request_param.put("isUnPackBox", IOSEnum.IS_NOTANDYES.code("否"));
+                //订单类型
+                request_param.put("bill_type", mst.getBill_type());
             }
             request_param.put("containerType", boxDao.getVehicle_type());
             jsonTaskParam.put("request_param", request_param);