root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-08-05 14:25:08 +08:00
parent 751ff4cb87
commit 89ea853b85
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/wql/QLK01.wql
View File

@@ -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

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/lk/service/impl/LibraryqueryServiceImpl.java
View File

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