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

代码更新

Browse Source
This commit is contained in:
liuxy
2023-02-01 18:14:49 +08:00
parent 3006aede1c
commit c51cbf509d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -355,7 +355,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(point_jo)) { if (ObjectUtil.isEmpty(point_jo)) {
throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排！"); throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排！");
} else { } else {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' order by out_order_seq desc").uniqueResult(0); JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' order by out_order_seq ASC").uniqueResult(0);
point_code = jsonNewRow.getString("point_code"); point_code = jsonNewRow.getString("point_code");
} }
} else { } else {
@@ -386,7 +386,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(point_jo)) { if (ObjectUtil.isEmpty(point_jo)) {
throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排！"); throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排！");
} else { } else {
JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' order by out_order_seq desc").uniqueResult(0); JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' order by out_order_seq ASC").uniqueResult(0);
point_code = jsonNewRow.getString("point_code"); point_code = jsonNewRow.getString("point_code");
} }
} }

4
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql
View File

@@ -85,7 +85,7 @@
AND is_delete = '0' AND is_delete = '0'
) )
ORDER BY po.out_order_seq desc ORDER BY po.out_order_seq ASC
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
@@ -143,7 +143,7 @@
LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num
WHERE WHERE
IFNULL( point2.vehicle_code, '' ) <> '' IFNULL( point2.vehicle_code, '' ) <> ''
AND point1.out_order_seq > point2.out_order_seq AND point1.out_order_seq < point2.out_order_seq
AND point2.point_type = '9' AND point2.point_type = '9'
OPTION 输入.point_code <> "" OPTION 输入.point_code <> ""

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

@@ -3931,7 +3931,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2'").uniqueResult(0); JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and package_box_sn = '" + dis.getString("box_no") + "' and status = '2'").uniqueResult(0);
if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn")); if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态：" + dis.getString("pcsn"));
// 如果是拆分入库则将包装关系改为生成状态 // 如果是拆分入库则将包装关系改为生成状态
if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009") && StrUtil.isEmpty(dtl_jo.getString("source_bill_code")))) { if (jo_mst.getString("bill_type").equals("1005") || (jo_mst.getString("bill_type").equals("1009"))) {
jsonSub.put("status", "0"); jsonSub.put("status", "0");
} else { } else {
jsonSub.put("status", "3"); jsonSub.put("status", "3");