From ae497594fc251f2161cdac57357d8375cd34321b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 28 Jun 2023 19:08:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/service/impl/BigScreenServiceImpl.java | 13 ++++++------- .../org/nl/wms/cockpit/wql/COCKPIT_MIX_AND_TRAP.wql | 6 ++++++ .../wms/cockpit/wql/COCKPIT_PROCESS_PRODUCTION.wql | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/BigScreenServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/BigScreenServiceImpl.java index 6a581eb..c27a2be 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/BigScreenServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/service/impl/BigScreenServiceImpl.java @@ -182,7 +182,7 @@ public class BigScreenServiceImpl implements BigScreenService { map.put("LastMonthFailureList", result); }).exceptionally((e) -> { log.error("近一个月故障次数前5台设备: {}", e.getMessage(), e); - map.put("LastMonthFailureList", null); + map.put("LastMonthFailureList", e.getMessage()); return null; }); // TODO: 6、最近10次设备故障 @@ -197,7 +197,7 @@ public class BigScreenServiceImpl implements BigScreenService { map.put("LastTenFailureList", result); }).exceptionally((e) -> { log.error("最近10次设备故障: {}", e.getMessage(), e); - map.put("LastTenFailureList", null); + map.put("LastTenFailureList", e.getMessage()); return null; }); // 7、压制码垛位情况显示 @@ -208,8 +208,7 @@ public class BigScreenServiceImpl implements BigScreenService { .getResultJSONArray(0); JSONObject devicesStatus = PointUpdateUtil.getDevicesStatus(res); // JSONObject devicesStatus = null; - JSONArray data = ObjectUtil.isNotEmpty( - devicesStatus.getJSONArray("data")) ? devicesStatus.getJSONArray("data") : res; + JSONArray data = ObjectUtil.isNotEmpty(devicesStatus) ? devicesStatus.getJSONArray("data") : res; for (int i = 0; i < data.size(); i++) { JSONObject jsonObject = data.getJSONObject(i); if (jsonObject.getInteger("move") == 1 @@ -235,7 +234,7 @@ public class BigScreenServiceImpl implements BigScreenService { map.put("StackingPositionList", result); }).exceptionally((e) -> { log.error("码垛位情况显示: {}", e.getMessage(), e); - map.put("StackingPositionList", null); + map.put("StackingPositionList", e); return null; }); // 8、压机信息显示 @@ -253,7 +252,7 @@ public class BigScreenServiceImpl implements BigScreenService { map.put("PressMachineList", result); }).exceptionally((e) -> { log.error("压机信息显示: {}", e.getMessage(), e); - map.put("PressMachineList", null); + map.put("PressMachineList", e.getMessage()); return null; }); // 9、混料机信息显示 @@ -373,7 +372,7 @@ public class BigScreenServiceImpl implements BigScreenService { map.put("SortAndPalletizingList", result); }).exceptionally((e) -> { log.error("分拣拆码垛: {}", e.getMessage(), e); - map.put("SortAndPalletizingList", null); + map.put("SortAndPalletizingList", e); return null; }); // 15、机械手状态 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_MIX_AND_TRAP.wql b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_MIX_AND_TRAP.wql index a57abd0..1d110d3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_MIX_AND_TRAP.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_MIX_AND_TRAP.wql @@ -128,6 +128,7 @@ p.point_code, p.point_name, p.point_status, + IF(d.device_name IS NULL,'-',d.device_name) AS device_name, IF(LENGTH(p.vehicle_code)>0,p.vehicle_code,'-') AS vehicle_code, IF(LENGTH(SUBSTRING(m.material_code, 6, 6))>0,SUBSTRING(m.material_code, 6, 6),'-') AS bom, IF(LENGTH(LEFT(m.material_code, 11))>0,LEFT(m.material_code, 11),'-') AS material_code, @@ -154,6 +155,8 @@ AND vd.vehicle_type = p.vehicle_type AND vd.is_delete = '0' LEFT JOIN md_me_materialbase m ON m.material_id = vd.material_id + LEFT JOIN pdm_bd_workorder w ON w.workorder_id = vd.workorder_id + LEFT JOIN pdm_bi_device d ON d.device_code = w.device_code WHERE p.region_code = 'KLHJ' AND p.point_type IN ('1','2') ORDER BY p.point_code @@ -169,6 +172,7 @@ LEFT(m.material_code, 11) AS material_code, IF(LENGTH(vd.weight)>0,vd.weight,'-') AS weight, ta.vehicle_code, + IF(d.device_name IS NULL,'-',d.device_name) AS device_name, IF(LENGTH(mix_num)>0,CONCAT(DATE_FORMAT(CURRENT_DATE(), '%Y%m%d'),LPAD(mix_num, 3, '0')),'-') AS mix_num, IF(ta.task_type = '1',ta.point_code2,ta.point_code1) AS point_code, ta.create_time @@ -178,6 +182,8 @@ LEFT JOIN st_ivt_vehicle_detail vd ON vd.vehicle_code = ta.vehicle_code AND vd.vehicle_type = ta.vehicle_type AND vd.is_delete = '0' + LEFT JOIN pdm_bd_workorder w ON w.workorder_id = vd.workorder_id + LEFT JOIN pdm_bi_device d ON d.device_code = w.device_code WHERE ta.handle_class IN ('org.nl.wms.sch.task.send.material.HLSendMaterialTask', 'org.nl.wms.sch.task.call.material.YZCallMaterialTask') AND ta.task_status = '7' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PROCESS_PRODUCTION.wql b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PROCESS_PRODUCTION.wql index bbe47d4..cc280e7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PROCESS_PRODUCTION.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_PROCESS_PRODUCTION.wql @@ -324,7 +324,7 @@ p.region_code FROM `sch_base_point` p - WHERE p.point_type IN ('1', '2') AND p.region_code = 'FJ' + WHERE p.point_type IN ('1', '2') AND p.region_code = 'FJ' AND p.point_code NOT IN ('FJCD02DJ01', 'FJCD02DJ02', 'FJMD02DJ01', 'FJMD02DJ02') ORDER BY p.point_code ENDSELECT ENDPAGEQUERY