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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-08-01 11:21:30 +08:00
parent 1db6d56719
commit 341feb0af3
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
View File

@@ -417,7 +417,7 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
JSONObject order = order_rows.getJSONObject(i); JSONObject order = order_rows.getJSONObject(i);
product_qty += order.getIntValue("real_qty"); product_qty += order.getIntValue("real_qty");
} }
device.put("product_qty", product_qty); // device.put("product_qty", product_qty);
//查询最近的一条开机状态 //查询最近的一条开机状态
JSONObject start_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '02' order by end_time desc").uniqueResult(0); JSONObject start_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '02' order by end_time desc").uniqueResult(0);
@@ -432,11 +432,11 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
} }
} }
//查询最近的一个工单 // //查询最近的一个工单
JSONObject order_jo = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND is_delete = '0' order by realproducestart_date desc").uniqueResult(0); // JSONObject order_jo = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND is_delete = '0' order by realproducestart_date desc").uniqueResult(0);
if (ObjectUtil.isNotEmpty(order_jo)) { // if (ObjectUtil.isNotEmpty(order_jo)) {
device.put("product_time", order_jo.getString("produce_date")); // device.put("product_time", order_jo.getString("produce_date"));
} // }
result.add(device); result.add(device);
} }
JSONObject returnjo = new JSONObject(); JSONObject returnjo = new JSONObject();

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
View File

@@ -150,7 +150,7 @@
LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id
WHERE WHERE
run.status_type = '05' run.status_type = '05'
AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( start_time ) AND DATE_SUB( CURDATE(), INTERVAL 10 DAY ) <= date( start_time )
GROUP BY GROUP BY
run.device_id run.device_id
LIMIT 10 LIMIT 10