From 7ceae64eef433d7bb46f312003abc2367cead8d6 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Mon, 25 Aug 2025 13:48:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=87=BA=E5=BA=93=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A1=AB=E5=86=99=E7=89=A9=E6=B5=81=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E5=92=8C=E9=A2=84=E4=BC=B0=E8=BF=90=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/StIvtIostorinvOutServiceImpl.java       |  8 ++++----
 .../service/impl/CheckOutBillServiceImpl.java    | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 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 cc930f682..ef38ed3f6 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
@@ -231,7 +231,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         StIvtIostorinv mstDao = this.getById(whereJson.getLongValue("iostorinv_id"));
 
         // 如果是发货出库则判断运费和物流公司不能为空
-        if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("发货出库"))) {
+        /*if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("发货出库"))) {
 
             if (ObjectUtil.isEmpty(mstDao.getTrans_code())) {
                 throw new BadRequestException("物流公司不能为空!");
@@ -241,7 +241,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
                 throw new BadRequestException("预估运费不能为空!");
             }
 
-        }
+        }*/
 
         /*
          * 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0
@@ -330,7 +330,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
         StIvtIostorinv mstDao = this.getById(whereJson.getJSONObject("row").getString("iostorinv_id"));
 
         // 如果是发货出库则判断运费和物流公司不能为空
-        if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("发货出库"))) {
+        /*if (mstDao.getBill_type().equals(IOSEnum.OUT_TYPE.code("发货出库"))) {
 
             if (ObjectUtil.isEmpty(mstDao.getTrans_code())) {
                 throw new BadRequestException("物流公司不能为空!");
@@ -339,7 +339,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
             if (ObjectUtil.isEmpty(mstDao.getEstimated_freight())) {
                 throw new BadRequestException("预估运费不能为空!");
             }
-        }
+        }*/
 
         /*
          * 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 7cc779ae5..d58791e71 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -1594,7 +1594,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 如果是发货出库则判断运费和物流公司不能为空
         String bill_type = jo_mst.getString("bill_type");
-        if (StrUtil.equals(bill_type, "1001")) {
+        /*if (StrUtil.equals(bill_type, "1001")) {
             String trans_code = jo_mst.getString("trans_code");
             String estimated_freight = jo_mst.getString("estimated_freight");
 
@@ -1605,7 +1605,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 throw new BadRequestException("预估运费不能为空");
             }
 
-        }
+        }*/
         RedissonUtils.lock(a->{
             //查询生成和未分配完的明细
             JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -1863,7 +1863,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 如果是发货出库则判断运费和物流公司不能为空
         String bill_type = jo_mst.getString("bill_type");
-        if (StrUtil.equals(bill_type, "1001")) {
+        /*if (StrUtil.equals(bill_type, "1001")) {
             String trans_code = jo_mst.getString("trans_code");
             String estimated_freight = jo_mst.getString("estimated_freight");
 
@@ -1874,7 +1874,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 throw new BadRequestException("预估运费不能为空");
             }
 
-        }
+        }*/
 
         //查询生成和未分配完的明细
         JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -2146,7 +2146,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 如果是发货出库则判断运费和物流公司不能为空
         String bill_type = jo_mst.getString("bill_type");
-        if (StrUtil.equals(bill_type, "1001")) {
+        /*if (StrUtil.equals(bill_type, "1001")) {
             String trans_code = jo_mst.getString("trans_code");
             String estimated_freight = jo_mst.getString("estimated_freight");
 
@@ -2157,7 +2157,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 throw new BadRequestException("预估运费不能为空");
             }
 
-        }
+        }*/
 
         //查询生成和未分配完的明细
         JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -4769,7 +4769,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 如果是发货出库则判断运费和物流公司不能为空
         String bill_type = jo_mst.getString("bill_type");
-        if (StrUtil.equals(bill_type, "1001")) {
+        /*if (StrUtil.equals(bill_type, "1001")) {
             String trans_code = jo_mst.getString("trans_code");
             String estimated_freight = jo_mst.getString("estimated_freight");
 
@@ -4780,7 +4780,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 throw new BadRequestException("预估运费不能为空");
             }
 
-        }
+        }*/
 
         //查询生成和未分配完的明细
         JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL")