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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-12 10:54:56 +08:00
parent 5ee83fa27d
commit 2bc060ede5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -522,7 +522,7 @@
OPTION 输入.ext_code <> "" OPTION 输入.ext_code <> ""
plan.resource_name = 输入.ext_code plan.resource_name = 输入.ext_code
ENDOPTION ENDOPTION
order by plan.manufacture_sort,plan.split_group,del.point_code order by plan.manufacture_sort,del.point_code,plan.split_group
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

4
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -62,7 +62,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
map.put("begin_time", MapUtil.getStr(whereJson, "begin_time")); map.put("begin_time", MapUtil.getStr(whereJson, "begin_time"));
map.put("end_time", MapUtil.getStr(whereJson, "end_time")); map.put("end_time", MapUtil.getStr(whereJson, "end_time"));
map.put("pcsn", MapUtil.getStr(whereJson, "pcsn")); 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("is_writeoff", MapUtil.getStr(whereJson, "is_writeoff"));
map.put("vbeln", MapUtil.getStr(whereJson, "vbeln")); map.put("vbeln", MapUtil.getStr(whereJson, "vbeln"));
if (!ObjectUtil.isEmpty(bill_code)) map.put("bill_code", "%" + bill_code + "%"); 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); 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; return jo;
} }