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{ //查询生成和未分配完的明细 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")