From 89ea853b85620401e102e42f672990fe291adadf Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 5 Aug 2022 14:25:08 +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/ext/lk/wql/QLK01.wql               | 6 +++---
 .../org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql
index e617758d..3dc50794 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql
@@ -106,19 +106,17 @@
     IF 输入.flag = "3"
 		PAGEQUERY
 			SELECT
-                SUM (weight) AS weight,
+                SUM (ISNULL(weight,0)) AS weight,
                 pallet_code,
                 material_code,
                 material_name,
                 pcsn,
                 status,
-                available,
                 MAX(inputtime) AS inputtime
             FROM
             	VWmsInventory
             WHERE
                 1=1
-            group by material_code,material_name,pcsn,status,available,pallet_code
 
             OPTION 输入.material_code <> ""
                    (material_code like 输入.material_code or
@@ -145,6 +143,8 @@
                    available = 输入.available
             ENDOPTION
 
+            group by material_code,material_name,pcsn,status,pallet_code
+
 			ENDSELECT
 		ENDPAGEQUERY
 	ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
index 58a34652..04c7e2c4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
@@ -49,7 +49,7 @@ public class LibraryqueryServiceImpl implements LibraryqueryService {
         map.put("status", MapUtil.getStr(whereJson,"status"));
         map.put("available", MapUtil.getStr(whereJson,"available"));
 
-        JSONObject json = WQL.getWO("QLK01").setDbname("dataSource2").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
+        JSONObject json = WQL.getWO("QLK01").setDbname("dataSource2").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "inputtime DESC");
         return json;
 
     }