设备模块更新

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java

@@ -415,6 +415,8 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
             case "M":
                 minutes = Math.round(frequency*60*24*7*30);
                 break;
+            default:
+                throw BusinessException.build("周期时间不存在！");
         }
         return taskTime.plusMinutes(minutes);
     }

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java

@@ -151,6 +151,7 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl<ResourceInspectT
         if( status.equals(Constants.INSPECTION_TASK_STATUS_CANCEL) ){
             task.setExecutor(CommonMethods.getUser());
             task.setReason(reason);
+            task.setModifiedDateTime(LocalDateTime.now());
             // 取消时，创建新任务
             resourceInspectPlanService.autoCreateTaskByResourceInspectTask(task);
         }

equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml

@@ -893,8 +893,8 @@
         LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCMA.WORK_CENTER_BO
         INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
         WHERE RRT.SITE = #{site}
-        <if test="resourceBo != null and resourceBo != ''">
-            AND RRT.RESOURCE_BO = #{resourceBo}
+        <if test="resourceNo != null and resourceNo != ''">
+            AND RRT.RESOURCE_NO = #{resourceNo}
         </if>
         <if test="resourceTypeBo != null and resourceTypeBo != ''">
             AND RTR.RESOURCE_TYPE_BO = #{resourceTypeBo}