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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-11 15:04:38 +08:00
parent b16d022b80 8544b03a40
commit 0af858c482
4 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -446,6 +446,8 @@
plan.qzzno = 输入.qzzno
AND
plan.is_delete = '0'
AND
plan.is_child_ps_ok = '0'
OPTION 输入.product_area <> ""
cut.product_area = 输入.product_area
ENDOPTION

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
View File

@@ -60,14 +60,14 @@
) AS task_status,
class.class_name AS task_type,
car_no,
create_time,
task.create_time,
vehicle_code2,
material_code
FROM
SCH_BASE_Task task
LEFT JOIN md_pb_classstandard class ON class.class_code = task.task_type
WHERE
is_delete = '0'
task.is_delete = '0'
AND task_status <> '07'
OPTION 输入.search <> ""

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

@@ -787,6 +787,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("查不到出库单信息");
}
// 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type");
if (StrUtil.equals(bill_type, "1001")) {
String trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight");
if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
}
//查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
.addParam("flag", "2")
@@ -1010,6 +1021,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("查不到出库单信息");
}
// 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type");
if (StrUtil.equals(bill_type, "1001")) {
String trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight");
if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
}
//查询生成和未分配完的明细
JSONArray dtls = WQL.getWO("QST_IVT_CHECKOUTBILL")
.addParam("flag", "2")
@@ -3659,6 +3681,17 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
throw new BadRequestException("当前订单无可分配出库明细");
}
// 如果是发货出库则判断运费和物流公司不能为空
String bill_type = jo_mst.getString("bill_type");
if (StrUtil.equals(bill_type, "1001")) {
String trans_code = jo_mst.getString("trans_code");
String estimated_freight = jo_mst.getString("estimated_freight");
if (ObjectUtil.isEmpty(trans_code)) throw new BadRequestException("物流公司不能为空");
if (ObjectUtil.isEmpty(estimated_freight)) throw new BadRequestException("预估运费不能为空");
}
//查询生成和未分配完的明细
JSONObject dtl = WQL.getWO("QST_IVT_CHECKOUTBILL")
.addParam("flag", "2")