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

更新

Browse Source
This commit is contained in:
张江玮
2022-10-14 18:05:16 +08:00
parent 276c35e3f0
commit f37d12b94b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/wql/QSTRUCT_RULE.wql
View File

@@ -308,6 +308,9 @@ IF 输入.flag = "9"
OPTION 输入.material_id <> "" OPTION 输入.material_id <> ""
ivt.material_id = 输入.material_id ivt.material_id = 输入.material_id
ENDOPTION ENDOPTION
OPTION 输入.material_code <> ""
ivt.material_code = 输入.material_code
ENDOPTION
order by ruledis.out_seq_no order by ruledis.out_seq_no
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/SectattrServiceImpl.java
View File

@@ -205,7 +205,7 @@ public class SectattrServiceImpl implements SectattrService {
JSONArray sect_ja = new JSONArray(); JSONArray sect_ja = new JSONArray();
for (int j = 0; j < sect_arr.size(); j++) { for (int j = 0; j < sect_arr.size(); j++) {
JSONObject sect_jo = sect_arr.getJSONObject(j); JSONObject sect_jo = sect_arr.getJSONObject(j);
net.sf.json.JSONObject sect_cas = new net.sf.json.JSONObject(); JSONObject sect_cas = new JSONObject();
sect_cas.put("value", sect_jo.getString("sect_id")); sect_cas.put("value", sect_jo.getString("sect_id"));
sect_cas.put("label", sect_jo.getString("sect_name")); sect_cas.put("label", sect_jo.getString("sect_name"));
sect_ja.add(sect_cas); sect_ja.add(sect_cas);