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

优化

Browse Source
This commit is contained in:
zds
2022-11-27 14:51:58 +08:00
parent e1e2a5d237
commit 06fe040d4f
5 changed files with 109 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
View File

@@ -116,10 +116,18 @@ public abstract class AbstractInManage {
String begin_time = (String) whereJson.get("begin_time");
String end_time = (String) whereJson.get("end_time");
map.put("flag", "2");
map.put("receive_code", receive_code);
map.put("material_search", material_search);
map.put("begin_time", begin_time);
map.put("end_time", end_time);
if (StrUtil.isNotEmpty(receive_code)) {
map.put("bill_code", "%" +receive_code + "%");
}
if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" +material_search + "%");
}
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo;
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/RawManage.java
View File

@@ -27,8 +27,12 @@ public class RawManage extends InManage {
if (StrUtil.isNotEmpty(material_search)) {
map.put("material_search", "%" +material_search + "%");
}
map.put("begin_time", begin_time);
map.put("end_time", end_time);
if (StrUtil.isNotEmpty(begin_time)) {
map.put("begin_time", begin_time.substring(0,10));
}
if (StrUtil.isNotEmpty(end_time)) {
map.put("end_time", end_time.substring(0,10));
}
JSONObject jo = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "input_time desc");
return jo;
}