From e1d40f78846a0121822f26850007d734a3556a7e Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 14 Apr 2023 11:35:27 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8C=BA=E5=9F=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 225280 -> 225792 bytes .../sch/service/impl/RegionServiceImpl.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) 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 496b5d5767f5ba35b13473a30cdfbc485550b6a3..94453774eea2c5b281560c875ee0a72486a35d98 100644 GIT binary patch delta 24054 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 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);