root/liaoNingShengHua2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复点位校验出现异常、工单关联为id

Browse Source
This commit is contained in:
liyongde
2023-04-14 21:28:08 +08:00
parent b258e973fa
commit d9d680a309
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/modules/common/utils/PointUpdateUtil.java
View File

@@ -110,6 +110,7 @@ public class PointUpdateUtil {
devices.add(device); devices.add(device);
// 向ACS查询点位状态 // 向ACS查询点位状态
JSONObject deviceStatus = wmsToAcsService.getPointStatus(devices); JSONObject deviceStatus = wmsToAcsService.getPointStatus(devices);
if (ObjectUtil.isEmpty(deviceStatus.get("data"))) return null;
JSONArray statusJSONArray = deviceStatus.getJSONArray("data"); JSONArray statusJSONArray = deviceStatus.getJSONArray("data");
if (ObjectUtil.isEmpty(statusJSONArray)) return DeviceStatusEnum.SHUTDOWN.getCode(); if (ObjectUtil.isEmpty(statusJSONArray)) return DeviceStatusEnum.SHUTDOWN.getCode();
JSONObject deviceJson = statusJSONArray.getJSONObject(0); JSONObject deviceJson = statusJSONArray.getJSONObject(0);

3
lms/nladmin-system/src/main/java/org/nl/wms/cockpit/wql/COCKPIT_DEVICE.wql
View File

@@ -77,8 +77,7 @@
IF(NULLIF(m.material_name, '') IS NULL, '-', m.material_name) as material_name IF(NULLIF(m.material_name, '') IS NULL, '-', m.material_name) as material_name
FROM FROM
`pdm_bi_device` d `pdm_bi_device` d
LEFT JOIN pdm_bd_workorder w ON ( d.device_code = w.device_code LEFT JOIN pdm_bd_workorder w ON (d.device_id = w.device_id) AND w.order_status <> '5'
OR d.extend_code = w.device_code ) AND w.order_status <> '5'
LEFT JOIN md_me_material_detail m ON w.material_id = m.material_id LEFT JOIN md_me_material_detail m ON w.material_id = m.material_id
WHERE WHERE
d.is_used = '1' d.is_used = '1'