From ac93d7eee43511b30e68d7feeede43474c8c4902 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Wed, 1 Feb 2023 02:03:54 +0800 Subject: [PATCH] =?UTF-8?q?mdf:=E5=87=BA=E5=BA=93=E5=8C=BA=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E5=88=86=E9=85=8D=E6=94=B9=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index d46a30f57..805916862 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -354,7 +354,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ObjectUtil.isEmpty(point_jo)) { throw new BadRequestException("未查询到相同销售订单的放货区点位或空的一排！"); } 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 ASC").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 desc").uniqueResult(0); point_code = jsonNewRow.getString("point_code"); } } else { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql index e02ae64a6..8587f030b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_ACSTOLMSTYPE4.wql @@ -85,7 +85,7 @@ AND is_delete = '0' ) - ORDER BY po.out_order_seq + ORDER BY po.out_order_seq desc ENDSELECT ENDQUERY @@ -143,7 +143,7 @@ LEFT JOIN sch_base_point point2 ON point1.row_num = point2.row_num WHERE 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' OPTION 输入.point_code <> "" @@ -179,4 +179,4 @@ ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF