diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java index 7d995ee3..b8af826f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java @@ -531,13 +531,43 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService { public JSONObject getTodayTask() { JSONObject resultJson = new JSONObject(); JSONObject resultData = new JSONObject(); - + WQLObject EM_BI_DeviceRepairRequest = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest"); HashMap map = new HashMap<>(); map.put("flag", "4"); JSONArray resultJSONArray = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParamMap(map).process().getResultJSONArray(0); - resultData.put("device_group_arr", resultJSONArray); + JSONArray ja = new JSONArray(); + for(int i=0;i= min_10){ + jo.put("needCast","1"); + } + } + } + } + } + ja.add(jo); + } + + resultData.put("device_group_arr", ja); resultJson.put("srb", resultData); resultJson.put("code", "1"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql index e7348b99..b3f5f1f9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql @@ -315,7 +315,7 @@ SELECT st.request_id AS id, - IF(process_id IS NULL AND IF(warn_time IS NULL,CURDATE(),warn_time)