root/wms1.0
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-11 08:47:16 +08:00
parent bf6064aa7e
commit 68f7ceac87
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,30 +40,34 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
//查询暂未生产设备 //查询暂未生产设备
int prepare_device = task_rows.size() - run_device; int prepare_device = task_rows.size() - run_device;
if (prepare_device < 0) {
prepare_device = 0;
}
//空闲设备 //空闲设备
int free_device = total_num - task_rows.size() - err_device; int free_device = total_num - task_rows.size() - err_device;
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
JSONObject run = new JSONObject(); JSONObject run = new JSONObject();
run.put("name","正常运行"); run.put("name", "正常运行");
run.put("value",run_device); run.put("value", run_device);
result.add(run); result.add(run);
JSONObject pre = new JSONObject(); JSONObject pre = new JSONObject();
pre.put("name","暂未生产"); pre.put("name", "暂未生产");
pre.put("value",prepare_device); pre.put("value", prepare_device);
result.add(pre); result.add(pre);
JSONObject free = new JSONObject(); JSONObject free = new JSONObject();
free.put("name","空闲设备"); free.put("name", "空闲设备");
free.put("value",free_device); free.put("value", free_device);
result.add(free); result.add(free);
JSONObject err = new JSONObject(); JSONObject err = new JSONObject();
err.put("name","故障设备"); err.put("name", "故障设备");
err.put("value",err_device); err.put("value", err_device);
result.add(err); result.add(err);
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
jo.put("ja",result); jo.put("ja", result);
jo.put("total_num",total_num); jo.put("total_num", total_num);
JSONObject returnjo = new JSONObject(); JSONObject returnjo = new JSONObject();
returnjo.put("code", "1"); returnjo.put("code", "1");
returnjo.put("desc", "查询成功！"); returnjo.put("desc", "查询成功！");
@@ -106,7 +110,7 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
@Override @Override
public JSONObject deviceErrorNum(JSONObject param) { public JSONObject deviceErrorNum(JSONObject param) {
String today = DateUtil.today() + "%"; String today = DateUtil.today() + "%";
JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "2").addParam("today",today).process().getResultJSONArray(0); JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "2").addParam("today", today).process().getResultJSONArray(0);
JSONObject returnjo = new JSONObject(); JSONObject returnjo = new JSONObject();
returnjo.put("code", "1"); returnjo.put("code", "1");
returnjo.put("desc", "查询成功！"); returnjo.put("desc", "查询成功！");
@@ -411,9 +415,9 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
for (int i = 0; i < device_rows.size(); i++) { for (int i = 0; i < device_rows.size(); i++) {
int product_qty = 0; int product_qty = 0;
JSONObject device = device_rows.getJSONObject(i); JSONObject device = device_rows.getJSONObject(i);
device.put("start_time",""); device.put("start_time", "");
device.put("end_time",""); device.put("end_time", "");
device.put("product_time",""); device.put("product_time", "");
String device_id = device.getString("device_id"); String device_id = device.getString("device_id");
/*JSONArray order_rows = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND produce_date like '" + date + "' AND is_delete = '0'").getResultJSONArray(0); /*JSONArray order_rows = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND produce_date like '" + date + "' AND is_delete = '0'").getResultJSONArray(0);
for (int j = 0; j < order_rows.size(); j++) { for (int j = 0; j < order_rows.size(); j++) {