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; }