From 2bc060ede59833e551d24bf20deb7840027db9f4 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sun, 12 Feb 2023 10:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql | 2 +- .../st/returns/service/impl/InAndOutRetrunServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index 777be0ad5..c09bb9cbb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -522,7 +522,7 @@ OPTION 输入.ext_code <> "" plan.resource_name = 输入.ext_code ENDOPTION - order by plan.manufacture_sort,plan.split_group,del.point_code + order by plan.manufacture_sort,del.point_code,plan.split_group ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 9156a1ae4..bec56307a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -62,7 +62,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { map.put("begin_time", MapUtil.getStr(whereJson, "begin_time")); map.put("end_time", MapUtil.getStr(whereJson, "end_time")); map.put("pcsn", MapUtil.getStr(whereJson, "pcsn")); - map.put("sap_pcsn", MapUtil.getStr(whereJson, "pcsn")); + map.put("sap_pcsn", MapUtil.getStr(whereJson, "sap_pcsn")); map.put("is_writeoff", MapUtil.getStr(whereJson, "is_writeoff")); map.put("vbeln", MapUtil.getStr(whereJson, "vbeln")); if (!ObjectUtil.isEmpty(bill_code)) map.put("bill_code", "%" + bill_code + "%"); @@ -75,7 +75,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); - JSONObject jo = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc"); + JSONObject jo = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc"); return jo; }