From e26c48f355d86e5314b0bcd824f887048d1be8aa Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Thu, 28 Sep 2023 22:14:41 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=A4=A7=E5=B1=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/szls/service/impl/LmsToBigScreenServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java index 695e65e60..316e78e9f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/szls/service/impl/LmsToBigScreenServiceImpl.java @@ -45,16 +45,20 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { @Override public JSONArray getStructInfo(JSONObject jo) { - JSONArray rows = WQLObject.getWQLObject("st_ivt_structattr").query("sect_code = 'ZC01'").getResultJSONArray(0); + JSONArray rows = WQLObject.getWQLObject("st_ivt_structattr").query("sect_code IN ('ZC01','KTP01','ZZ01','PD01')").getResultJSONArray(0); JSONArray data = new JSONArray(); for (int i = 0; i < rows.size(); i++) { JSONObject row = rows.getJSONObject(i); JSONObject json = new JSONObject(); String struct_code = row.getString("struct_code"); json.put("struct_code", struct_code); + json.put("struct_status", "0"); String storagevehicle_code = row.getString("storagevehicle_code"); if (StrUtil.isNotEmpty(storagevehicle_code)) { json.put("storagevehicle_code", storagevehicle_code); + if (storagevehicle_code.startsWith("KTP")){ + json.put("struct_status", "1"); + } String struct_id = row.getString("struct_id"); JSONArray array = WQL .getWO("QST_STRUCTATTR") @@ -70,6 +74,7 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { json.put("sale_order_name", object.getString("sale_order_name")); json.put("quanlity_in_box", object.getString("quanlity_in_box")); json.put("box_weight", object.getString("box_weight")); + json.put("struct_status", "2"); JSONArray detail = new JSONArray(); for (int j = 0; j < array.size(); j++) { JSONObject dtl = array.getJSONObject(j);