代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java

@@ -126,6 +126,11 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
         JSONArray useArr = fileTab.query("status = '10' and is_delete ='0'").getResultJSONArray(0);
         resultData.put("device_use_num", String.valueOf(useArr.size()));
 
+        // 3.0获取总故障台数
+        JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "9").process().getResultJSONArray(0);
+        resultData.put("device_request_num",String.valueOf(arr.size()));
+
+
         // 3.1获取各个部门的台数：
         // 棒料事业部：H900000 矿用合金事业部：H800000 型材事业部：H400000 混合料厂：H1300000 武汉运营保障部：H1200200 精密零件事业部：H1000000
         JSONObject map = new JSONObject();
@@ -326,13 +331,13 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
         JSONObject resultJson = new JSONObject();
         JSONObject resultData = new JSONObject();
 
-        JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "7").process().getResultJSONArray(0);
+        JSONArray arr = WQL.getWO("EM_DEVICEBIGSCREEN_01").addParam("flag", "8").process().getResultJSONArray(0);
         for (int i = 0; i < arr.size(); i++) {
             JSONObject json = arr.getJSONObject(i);
             // 保养倒计时： 计划日期 - 当前日期
             Date date1 = DateUtil.parse(DateUtil.today()); // 当前日期
             Date date2 = DateUtil.parse(json.getString("plan_time")); // 计划日期
-            long betweenDay = DateUtil.between(date1, date2, DateUnit.HOUR, false);
+            long betweenDay = DateUtil.between(date1, date2, DateUnit.DAY, false);
             json.put("main_time", String.valueOf(betweenDay));
 
             // 延期时间: （ 计划日期 - 实际结束时间 ） 为负数则为延期

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_01.wql

@@ -175,4 +175,55 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
+	ENDIF
+
+	IF 输入.flag = "8"
+		QUERY
+			SELECT
+			    dept.name AS dept_name,
+			    file.device_name,
+			    file.device_code,
+			    mst.plan_start_date AS plan_time,
+			    (
+			        case mst.maint_object
+			        WHEN '01' THEN '班组'
+			        WHEN '02' THEN '维修班'
+			        END
+			    ) AS maint_object,
+			    mst.real_start_date AS impl_time,
+			    mst.remark,
+			    mst.real_end_date,
+			    dtl.num
+            FROM
+            	EM_BI_DeviceMaintenancePlanMst mst
+            	LEFT JOIN
+            	(
+            	    SELECT count(*)AS num,d.maint_plan_id FROM EM_BI_DeviceMaintenancePlanDtl d
+            	    LEFT JOIN EM_BI_DeviceMaintenancePlanMst m ON m.maint_plan_id = d.maint_plan_id
+            	    GROUP BY d.maint_plan_dtl_id
+            	) AS dtl ON mst.maint_plan_id = dtl.maint_plan_id
+            	LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
+            	LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
+            WHERE
+                mst.is_delete = '0'
+                AND mst.maintenancecycle = '01'
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
+
+	IF 输入.flag = "9"
+		QUERY
+			SELECT
+			    count(*) AS num
+            FROM
+            	EM_BI_DeviceRepairRequest
+            WHERE
+                is_delete = '0'
+                AND status <> '99'
+
+                group by devicerecord_id
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/wql/EM_DEVICEBIGSCREEN_02.wql

@@ -70,8 +70,8 @@
                 mst.is_delete = '0'
                 AND mst.maintenancecycle = '01'
                 AND dept.code = 输入.dept_code
-                AND mst.real_start_date is null
+                AND IFNULL(mst.real_start_date, '') = ''
-                AND mst.real_end_date is null
+                AND IFNULL(mst.real_end_date, '') = ''
 
 			ENDSELECT
 		ENDQUERY
@@ -89,8 +89,8 @@
                 mst.is_delete = '0'
                 AND mst.maintenancecycle = '01'
                 AND dept.code = 输入.dept_code
-                AND mst.real_start_date is not null
+                AND IFNULL(mst.real_start_date, '') <> ''
-                AND mst.real_end_date is not null
+                AND IFNULL(mst.real_end_date, '') <> ''
 
 			ENDSELECT
 		ENDQUERY

mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/service/impl/DevicemaintenanceplanmstServiceImpl.java

@@ -299,10 +299,12 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void changeActive(JSONObject json) {
+    public void changeActive(JSONObject whereJson) {
         Long currentUserId = SecurityUtils.getCurrentUserId();
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
+        WQLObject tab = WQLObject.getWQLObject("EM_BI_DeviceMaintenancePlanMst");
+        JSONObject json = tab.query("maint_plan_id = '" + whereJson.getString("maint_plan_id") + "'").uniqueResult(0);
         String is_active = "1";
         if (StrUtil.equals("1", json.getString("is_active"))) {
             is_active = "0";
@@ -315,7 +317,7 @@ public class DevicemaintenanceplanmstServiceImpl implements Devicemaintenancepla
             json.put("confirm_time", now);
         }
         json.put("is_active", is_active);
-        WQLObject.getWQLObject("EM_BI_DeviceMaintenancePlanMst").update(json);
+        tab.update(json);
     }
 
     @Override