From 283ed84c24dfa1ce27a740c8ae1924561c13f6b0 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Mon, 28 Aug 2023 17:28:25 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=9B=91=E6=8E=A7=E8=A1=A8=E7=9B=B8=E5=85=B3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FaultDeviceServiceImpl.java | 10 +++++----- .../wms/basedata/master/wql/QMD_BI_FAULT.wql | 6 +++--- .../impl/LmsToBigScreenServiceImpl.java | 8 ++++---- .../src/main/java/org/nl/wms/pdm/wql/em.xls | Bin 182272 -> 182272 bytes 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java index b4bae7841..0a64a7567 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java @@ -62,8 +62,8 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { String device_code = MapUtil.getStr(whereJson, "device_code"); String is_fault = MapUtil.getStr(whereJson, "is_fault"); String region_code = MapUtil.getStr(whereJson, "region_code"); - String plant_code = MapUtil.getStr(whereJson, "plant_code"); - if (StrUtil.isEmpty(plant_code)){ + String product_area = MapUtil.getStr(whereJson, "plant_code"); + if (StrUtil.isEmpty(product_area)){ throw new BadRequestException("输入的区域不能为空！"); } @@ -71,13 +71,13 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { if (ObjectUtil.isNotEmpty(device_code)) { JSONObject device_jo = WQLObject.getWQLObject("EM_BI_MonitorDevice").query("device_code = '"+device_code+"'").uniqueResult(0); param.put("device_code",device_code); - param.put("product_area",device_jo.getString("plant_code")); + param.put("product_area",device_jo.getString("product_area")); } else { // 不为空则只需要查询专机设备 JSONObject jsonStr = WQL.getWO("QMD_BI_FAULT").addParam("flag", "3").process().uniqueResult(0); String str = jsonStr.getString("str"); param.put("device_code",str); - param.put("product_area",plant_code); + param.put("product_area",product_area); } // 调用acs接口获取设备 @@ -120,7 +120,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("region_code", region_code); - map.put("plant_code", plant_code); + map.put("product_area", product_area); map.put("device_code", json.getString("device_code")); JSONObject jsonDevice = WQL.getWO("QMD_BI_FAULT").addParamMap(map).process().uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql index 3c86ec3c6..630bf3532 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql @@ -17,7 +17,7 @@ 输入.fault_code TYPEAS s_string 输入.fault_type TYPEAS s_string 输入.region_code TYPEAS s_string - 输入.plant_code TYPEAS s_string + 输入.product_area TYPEAS s_string 输入.device_code TYPEAS s_string [临时表] @@ -76,8 +76,8 @@ region_code = 输入.region_code ENDOPTION - OPTION 输入.plant_code <> "" - plant_code = 输入.plant_code + OPTION 输入.product_area <> "" + product_area = 输入.product_area ENDOPTION OPTION 输入.device_code <> "" 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 380078bfe..695e65e60 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 @@ -36,8 +36,8 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { JSONObject json = new JSONObject(); for (URLEnum url : URLEnum.values()) { String product_area = url.getProduct_area(); - JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND plant_code = '" + product_area + "'").getResultJSONArray(0); - JSONObject device_info = wmsToAcsService.getPointStatus(rows); + JSONArray rows = WQLObject.getWQLObject("em_bi_monitordevice").query("send_szls = '1' AND product_area = '" + product_area + "'").getResultJSONArray(0); + JSONObject device_info = wmsToAcsService.getHotPointStatus(rows); json.put(product_area, device_info.getJSONArray("data")); } return json; @@ -71,7 +71,7 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { json.put("quanlity_in_box", object.getString("quanlity_in_box")); json.put("box_weight", object.getString("box_weight")); JSONArray detail = new JSONArray(); - for (int j = 0; i < array.size(); i++) { + for (int j = 0; j < array.size(); j++) { JSONObject dtl = array.getJSONObject(j); String container_name = dtl.getString("container_name"); String net_weight = dtl.getString("net_weight"); @@ -82,8 +82,8 @@ public class LmsToBigScreenServiceImpl implements LmsToBigScreenService { } json.put("detail", detail); } - data.add(json); } + data.add(json); } return data; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/em.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/em.xls index fe344c19dbd89f7158db6d057ef2c0c954e8e70d..3f213294dae36450eace27f6f8d7e4f9070002ef 100644 GIT binary patch delta 6852 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 Sc!~I_FQ7TyoWA{m5&Z`)vyR~a delta 6982 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 XMaB^BZU2e;pD_VlVc@p)dq(tM^U;Tc