设备点检、维修模块更新

common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java

@@ -127,7 +127,7 @@ public enum HandleEnum {
     INSPECTION_TASK_DETAIL("InspectionTaskDetailBO:","InspectionTaskDetailBO:{0},{1}"),
 
     /**用户**/
-    USR("UserBo","UserBo:{0},{1}");
+    USR("UserBO","UserBO:{0},{1}");
 
 
     private String prefix;

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java

@@ -146,11 +146,10 @@ public class ResourceInspectPlanController {
     @PostMapping(value = "/saveOrUpdate")
     public R saveOrUpdate(@RequestBody ResourceInspectPlan resourceInspectPlan) {
         try{
-            resourceInspectPlanService.saveResourcePlanData(resourceInspectPlan);
+            return R.ok(resourceInspectPlanService.saveResourcePlanData(resourceInspectPlan));
         }catch (Exception e){
             return R.failed("更新或保存失败：" + e.getMessage());
         }
-        return R.ok();
     }
 
     /**

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java

@@ -146,8 +146,9 @@ public class ResourceInspectTaskController {
         String planNo = resourceInspectTaskDto.getPlanNo();
         String resourceNo = resourceInspectTaskDto.getResourceNo();
         String resourceTypeNo = resourceInspectTaskDto.getResourceTypeNo();
+        String workCenter = resourceInspectTaskDto.getWorkCenter();
         if (planNo != null){
-            resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo));
+            resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo,"_"));
         }
         if (resourceNo != null){
             resourceInspectTaskDto.setResourceBo(HandleEnum.RESOURCE.getHandle(site,resourceNo));
@@ -155,6 +156,9 @@ public class ResourceInspectTaskController {
         if (resourceTypeNo != null){
             resourceInspectTaskDto.setResourceTypeBo(HandleEnum.RESOURCE_TYPE.getHandle(site,resourceTypeNo));
         }
+        if (workCenter != null){
+            resourceInspectTaskDto.setWorkCenter(HandleEnum.WORK_CENTER.getHandle(site,workCenter));
+        }
         try{
             return R.ok(resourceInspectTaskService.findResourceInspectTaskList(resourceInspectTaskDto));
         }catch (Exception e){

equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java

@@ -157,7 +157,7 @@ public class ResourceRepairTaskController {
         try{
             resourceRepairTaskService.saveRepairTask(resourceRepairTask);
         }catch (Exception e){
-            R.failed("提报失败，"+e.getMessage());
+            return R.failed("提报失败，"+e.getMessage());
         }
         return R.ok();
     }

equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java

@@ -55,9 +55,9 @@ public class ResourceInspectTaskDto implements Serializable {
     /**备注**/
     private String remark;
     /**检索时间段的开始时间**/
-    private LocalDateTime compareStartTime;
+    private String compareStartDate;
     /**检索时间段的结束时间**/
-    private LocalDateTime compareEndTime;
+    private String compareEndDate;
     /**设备编号NO**/
     private String resourceNo;
     /**设备描述**/
@@ -87,6 +87,24 @@ public class ResourceInspectTaskDto implements Serializable {
     /**消耗备品**/
     private List<ResourceInspectTaskSpare> taskSpareList;
 
+
+
+    public String getCompareStartDate() {
+        return compareStartDate;
+    }
+
+    public void setCompareStartDate(String compareStartDate) {
+        this.compareStartDate = compareStartDate;
+    }
+
+    public String getCompareEndDate() {
+        return compareEndDate;
+    }
+
+    public void setCompareEndDate(String compareEndDate) {
+        this.compareEndDate = compareEndDate;
+    }
+
     public List<ResourceInspectTaskParam> getTaskItemDetailList() {
         return taskItemDetailList;
     }
@@ -298,22 +316,6 @@ public class ResourceInspectTaskDto implements Serializable {
         this.remark = remark;
     }
 
-    public LocalDateTime getCompareStartTime() {
-        return compareStartTime;
-    }
-
-    public void setCompareStartTime(LocalDateTime compareStartTime) {
-        this.compareStartTime = compareStartTime;
-    }
-
-    public LocalDateTime getCompareEndTime() {
-        return compareEndTime;
-    }
-
-    public void setCompareEndTime(LocalDateTime compareEndTime) {
-        this.compareEndTime = compareEndTime;
-    }
-
     public String getCurrentUser() {
         return currentUser;
     }

equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java

@@ -27,7 +27,7 @@ public interface ResourceInspectPlanService extends IService<ResourceInspectPlan
 
     List<ResourceInspectPlan> selectList(ResourceInspectPlan resourceInspectPlan);
 
-    void saveResourcePlanData(ResourceInspectPlan resourceInspectPlan);
+    Boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan);
 
     ResourceInspectPlan getInspectPlanByHandle(ResourceInspectPlan resourceInspectPlan);
 

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

@@ -79,7 +79,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
      * @param resourceInspectPlan
      */
     @Override
-    public void saveResourcePlanData(ResourceInspectPlan resourceInspectPlan) {
+    public Boolean saveResourcePlanData(ResourceInspectPlan resourceInspectPlan) {
         // 判断检验项目清单HANDLE是否存在
         String inspectionItemBo = resourceInspectPlan.getInspectionItemBo();
         InspectionItem inspectionItem = inspectionItemService.getById(inspectionItemBo);
@@ -97,11 +97,14 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
         ResourceInspectPlan planHandle = resourceInspectPlanService.getById(handle);
         // 创建/修改人员
         String user = CommonMethods.getUser();
+        Boolean returnStatus = false;
         //计划是否已存在
         if (planHandle==null){
             // 创建人员和创建时间
             resourceInspectPlan.setCreatedDateTime(LocalDateTime.now());
             resourceInspectPlan.setCreateUser(user);
+            returnStatus = true;
+            resourceInspectPlan.setStatus("401");
         }else{
             // 保留创建人员和创建时间
             String createUser = planHandle.getCreateUser();
@@ -119,8 +122,6 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
             inspectPlanUserGroupService.deleteAll(inspectPlanUserGroup);
         }
         resourceInspectPlan.setHandle(handle);
-        // 任务数量-数字型
-        Long planTaskCount = resourceInspectPlan.getPlanTaskCount();
         //保存计划下设备清单(全删全增)
         List<ResourceInspectResource> equips = resourceInspectPlan.getMaintainPlanEquipList();
         if (equips.size()<1||equips.equals(null)){
@@ -150,6 +151,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
         if (resourceInspectPlan.getStatus().equals("301")){
             resourceInspectPlanService.autoCreateTaskByResourceInspectPlan(resourceInspectPlan);
         }
+        return returnStatus;
     }
 
     /**
@@ -347,7 +349,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl<ResourceInspectP
         String scheduleType = inspectPlan.getScheduleType();
         String resourceBo = resourceInspectTask.getResourceBo();
         ResourceInspectTask newInspectTask = new ResourceInspectTask();
-        if (scheduleType.equals("1")){
+        if (scheduleType.equals("CYC")){
             LocalDateTime maxCreateTime = resourceInspectTaskMapper.selectMaxCreateTimeByPlanBoAnd(resourceInspectTask);
             LocalDateTime nextTaskDate = addTime(frequencyUnit, frequency, maxCreateTime);
             newInspectTask.setTaskCreateDate(nextTaskDate);

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

@@ -610,16 +610,16 @@
             AND SD.STATUS = #{status}
         </if>
         <if test="resourceInspectPlanBo != null and resourceInspectPlanBo != ''">
-            AND SD.RESOURCE_INSPECT_PLAN_BO = #{resourceInspectPlanBo}
+            AND SD.RESOURCE_INSPECT_PLAN_BO LIKE #{resourceInspectPlanBo}
         </if>
         <if test="resourceBo != null and resourceBo != ''">
             AND SD.RESOURCE_BO = #{resourceBo}
         </if>
-        <if test="compareStartTime != null and compareStartTime != ''">
+        <if test="compareStartDate != null and compareStartDate != ''">
-            AND SD.TASK_CREATE_DATE &gt; #{compareStartTime}
+            AND SD.TASK_CREATE_DATE &gt; TO_DATE( #{compareStartDate},'yyyy-MM-dd hh24:mi-ss' )
         </if>
-        <if test="compareEndTime != null and compareEndTime != ''">
+        <if test="compareEndDate != null and compareEndDate != ''">
-            AND SD.TASK_CREATE_DATE &lt; #{compareEndTime}
+            AND SD.TASK_CREATE_DATE &lt; TO_DATE( #{compareEndDate},'yyyy-MM-dd hh24:mi-ss' )
         </if>
         ) ZK
         LEFT JOIN Z_INSPECT_PLAN_USER_GROUP ZG ON ZG.RESOURCE_INSPECT_PLAN_BO = ZK.RESOURCE_INSPECT_PLAN_BO

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

@@ -882,17 +882,17 @@
     <!--自定义sql-->
         <!--批量获取维修任务-->
     <select id="findResourceRepairTaskList" resultType="com.foreverwin.mesnac.equip.model.ResourceRepairTask">
-        SELECT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
+        SELECT DISTINCT RRT.*,R.DESCRIPTION AS RESOURCE_DESCRIPTION,R.RESRCE AS RESOURCE_NO,
         NCT.DESCRIPTION AS NC_CODE_DESCRIPTION,WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION
         FROM
         WIP.Z_RESOURCE_REPAIR_TASK RRT
-        LEFT JOIN WIP.RESRCE R ON R.RESRCE = RRT.RESOURCE_NO
+        INNER JOIN WIP.RESRCE R ON RRT.SITE = R.SITE AND R.RESRCE = RRT.RESOURCE_NO
-        LEFT JOIN WIP.NC_CODE NC ON NC.NC_CODE = RRT.NC_CODE_NO
+        INNER JOIN WIP.NC_CODE NC ON RRT.SITE = NC.SITE AND NC.NC_CODE = RRT.NC_CODE_NO
-        LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE
+        LEFT JOIN WIP.NC_CODE_T NCT ON NCT.NC_CODE_BO = NC.HANDLE AND NCT.LOCALE = 'zh'
         LEFT JOIN WIP.WORK_CENTER_MEMBER WCM ON WCM.WORK_CENTER_OR_RESOURCE_GBO = R.HANDLE
         LEFT JOIN WIP.WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WCM.WORK_CENTER_BO
         INNER JOIN WIP.RESOURCE_TYPE_RESOURCE RTR ON RTR.RESOURCE_BO = R.HANDLE
-        WHERE RRT.SITE = #{site} AND R.SITE = #{site} AND NC.SITE = #{site}
+        WHERE RRT.SITE = #{site}
         <if test="resourceBo != null and resourceBo != ''">
             AND RRT.RESOURCE_BO = #{resourceBo}
         </if>

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ResrceController.java

@@ -35,7 +35,10 @@ public class ResrceController {
     @GetMapping("")
     public R getResourceList(Resrce resrce){
         List<Resrce> result;
+        String site = CommonMethods.getSite();
+
         QueryWrapper<Resrce> queryWrapper = new QueryWrapper<>();
+        resrce.setSite(site);
         queryWrapper.setEntity(resrce);
         result = resrceService.list(queryWrapper);
         return R.ok(result);