diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 496b5d57..94453774 100644 Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls differ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index e928e2df..cb013141 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -189,14 +189,14 @@ public class RegionServiceImpl implements RegionService{ jsonMst.put("value", json.getString("value")); jsonMst.put("label", json.getString("label")); // 查询子类 - JSONArray DtlArr = WQL.getWO("QSCH_REGION_01").addParam("flag", "3").addParam("product_area", json.getString("value")).process().getResultJSONArray(0); + JSONArray DtlArr =WQLObject.getWQLObject("st_ivt_sectattr").query("product_area = '"+json.getString("label")+"' and is_used = '" + 1 + "' and is_delete = '0'").getResultJSONArray(0); if(DtlArr.size() > 0) { JSONArray sect_ja = new JSONArray(); for(int j = 0; j < DtlArr.size(); j++) { JSONObject json2 = DtlArr.getJSONObject(j); JSONObject sect_cas = new JSONObject(); - sect_cas.put("value", json2.getString("region_code")); - sect_cas.put("label", json2.getString("region_name")); + sect_cas.put("value", json2.getString("sect_code")); + sect_cas.put("label", json2.getString("sect_name")); sect_ja.add(sect_cas); } jsonMst.put("children", sect_ja);