root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:出库校验是否填写物流公司和预估运费

Browse Source
This commit is contained in:
zhouz
2025-08-25 13:48:34 +08:00
parent 2e6c0775b1
commit 7ceae64eef
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvOutServiceImpl.java
View File

@@ -231,7 +231,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
StIvtIostorinv mstDao = this.getById(whereJson.getLongValue("iostorinv_id")); 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())) { if (ObjectUtil.isEmpty(mstDao.getTrans_code())) {
throw new BadRequestException("物流公司不能为空!"); throw new BadRequestException("物流公司不能为空!");
@@ -241,7 +241,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
throw new BadRequestException("预估运费不能为空!"); throw new BadRequestException("预估运费不能为空!");
} }
} }*/
/* /*
* 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0 * 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0
@@ -330,7 +330,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
StIvtIostorinv mstDao = this.getById(whereJson.getJSONObject("row").getString("iostorinv_id")); 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())) { if (ObjectUtil.isEmpty(mstDao.getTrans_code())) {
throw new BadRequestException("物流公司不能为空!"); throw new BadRequestException("物流公司不能为空!");
@@ -339,7 +339,7 @@ public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutM
if (ObjectUtil.isEmpty(mstDao.getEstimated_freight())) { if (ObjectUtil.isEmpty(mstDao.getEstimated_freight())) {
throw new BadRequestException("预估运费不能为空!"); throw new BadRequestException("预估运费不能为空!");
} }
} }*/
/* /*
* 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0 * 查询生成和未分配完的明细, 条件：明细状态小于等于分配中、未分配数大于0

16
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -1594,7 +1594,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 如果是发货出库则判断运费和物流公司不能为空 // 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type"); 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 trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight"); String estimated_freight = jo_mst.getString("estimated_freight");
@@ -1605,7 +1605,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("预估运费不能为空"); throw new BadRequestException("预估运费不能为空");
} }
} }*/
RedissonUtils.lock(a->{ RedissonUtils.lock(a->{
//查询生成和未分配完的明细 //查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -1863,7 +1863,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 如果是发货出库则判断运费和物流公司不能为空 // 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type"); 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 trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight"); String estimated_freight = jo_mst.getString("estimated_freight");
@@ -1874,7 +1874,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("预估运费不能为空"); throw new BadRequestException("预估运费不能为空");
} }
} }*/
//查询生成和未分配完的明细 //查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -2146,7 +2146,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 如果是发货出库则判断运费和物流公司不能为空 // 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type"); 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 trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight"); String estimated_freight = jo_mst.getString("estimated_freight");
@@ -2157,7 +2157,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("预估运费不能为空"); throw new BadRequestException("预估运费不能为空");
} }
} }*/
//查询生成和未分配完的明细 //查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL") JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
@@ -4769,7 +4769,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// 如果是发货出库则判断运费和物流公司不能为空 // 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type"); 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 trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight"); String estimated_freight = jo_mst.getString("estimated_freight");
@@ -4780,7 +4780,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("预估运费不能为空"); throw new BadRequestException("预估运费不能为空");
} }
} }*/
//查询生成和未分配完的明细 //查询生成和未分配完的明细
JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL") JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL")