From 7901d3f9fbda961667bc0c500e5b67f93fb9b365 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 17 Jul 2023 10:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql | 5 +++-- .../src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql index 5800641..941ba2b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql @@ -114,7 +114,8 @@ IF 输入.flag = "3" ivt.workprocedure_id, ivt.producetask_id, material.stewing_time, - ruledis.out_seq_no + ruledis.out_seq_no, + ivt.instorage_time FROM st_ivt_structivt ivt left join md_me_material material on material.material_id = ivt.material_id @@ -142,7 +143,7 @@ IF 输入.flag = "3" OPTION 输入.is_full <> "" ivt.is_full = 输入.is_full ENDOPTION - order by material.stewing_time desc,ruledis.out_seq_no + order by ivt.instorage_time, material.stewing_time desc,ruledis.out_seq_no ENDSELECT ENDQUERY ENDIF diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql index 7465522..cb39faa 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/WMSTOJN_001.wql @@ -102,9 +102,9 @@ 1=1 OPTION 输入.vehicle_code <> "" kiln.vehicle_code = 输入.vehicle_code - ENDOPTION + ENDOPTION + ORDER BY in_time desc ENDSELECT - ORDER BY in_time desc ENDQUERY ENDIF IF 输入.flag = "4"