diff --git a/anomaly/anomaly.iml b/anomaly/anomaly.iml deleted file mode 100644 index a986ffdf..00000000 --- a/anomaly/anomaly.iml +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 1c48f152..93aba7bc 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -18,6 +18,30 @@ public interface Constants { //任务编号常量 String RESOURCE_INSPECT_TASK = "RESOURCE_INSPECT_TASK"; + //报修任务单号 + String RESOURCE_REPAIR_TASK = "RESOURCE_REPAIR_TASK"; String SITE_ADMIN = "SITE_ADMIN"; + //首件检验 + String INSPECTION_TYPE_S="S"; + //互检检验 + String INSPECTION_TYPE_H="H"; + //自检检验 + String INSPECTION_TYPE_Z="Z"; + //专检检验 + String INSPECTION_TYPE_P="P"; + //日常保养 + String INSPECTION_TYPE_EM="EM"; + //一级保养 + String INSPECTION_TYPE_OM="OM"; + //二级保养 + String INSPECTION_TYPE_SM="SM"; + //日点检 + String INSPECTION_TYPE_DM="DM"; + //周点检 + String INSPECTION_TYPE_WM="WM"; + //月点检 + String INSPECTION_TYPE_MM="MM"; + //年点检 + String INSPECTION_TYPE_YM="YM"; } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java index 45b70501..eef1f467 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/enums/HandleEnum.java @@ -84,6 +84,9 @@ public enum HandleEnum { /**设备检验任务**/ RESOURCE_INSPECT_TASK("ResourceInspectTaskBo","ResourceInspectTaskBo:{0},{1}"), + /**设备检验任务**/ + RESOURCE_REPAIR_TASK("ResourceRepairTaskBo","ResourceRepairTaskBo:{0},{1}"), + /**物料批次**/ ITEM_BATCH("ItemBatchBo", "ItemBatchBo:{0},{1},{2}"), diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java index 66a458a9..75e5d43a 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectTaskController.java @@ -155,7 +155,11 @@ public class ResourceInspectTaskController { if (resourceTypeNo != null){ resourceInspectTaskDto.setResourceTypeBo(HandleEnum.RESOURCE_TYPE.getHandle(site,resourceTypeNo)); } - return R.ok(resourceInspectTaskService.findResourceInspectTaskList(resourceInspectTaskDto)); + try{ + return R.ok(resourceInspectTaskService.findResourceInspectTaskList(resourceInspectTaskDto)); + }catch (Exception e){ + return R.failed("检索失败：" + e.getMessage()); + } } @@ -179,26 +183,20 @@ public class ResourceInspectTaskController { } /** - * 任务执行：点击开始执行，仅修改任务状态，并绑定执行人 - * @param taskNo + * 任务执行： + * 1、点击开始执行，仅修改任务状态、绑定执行人 + * 2、取消执行，仅修改任务状态 + * @param resourceInspectTask * @return */ @ResponseBody - @GetMapping("/startAndUpdateTask") - public R startAndUpdateTask(String taskNo){ - String handle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(CommonMethods.getSite(), taskNo); - ResourceInspectTask task = resourceInspectTaskService.getById(handle); - task.setStatus("501"); - task.setActualStartDate(LocalDateTime.now()); - task.setExecutor(CommonMethods.getUser()); - // 保存的数据：id或者handle？？？ - //task.setExecutor(CommonMethods.getUser()); + @GetMapping("/startOrCancelTask") + public R startOrCancelTask(ResourceInspectTask resourceInspectTask){ try { - resourceInspectTaskService.saveOrUpdate(task); + return R.ok(resourceInspectTaskService.startOrCancelTask(resourceInspectTask)); }catch (Exception e){ - return R.failed("数据更新失败，开始执行异常" + e.getMessage()); + return R.failed("数据更新失败" + e.getMessage()); } - return R.ok(task); } /*** @@ -208,7 +206,6 @@ public class ResourceInspectTaskController { * @param * @return */ - @PostMapping ("/saveOrUpdateTaskInfo") public R saveOrUpdateTaskInfo(@RequestBody ResourceInspectTaskDto resourceInspectTaskDto){ String user = CommonMethods.getUser(); diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java new file mode 100644 index 00000000..69d34aee --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java @@ -0,0 +1,155 @@ +package com.foreverwin.mesnac.equip.controller; + +import com.foreverwin.modular.core.util.R; +import com.foreverwin.modular.core.util.FrontPage; +import com.foreverwin.modular.core.util.CommonMethods; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import com.foreverwin.mesnac.equip.service.ResourceRepairTaskService; +import com.foreverwin.mesnac.equip.model.ResourceRepairTask; +import java.util.List; + +/** + * + * @author pavel.Liu + * @since 2021-07-06 + */ +@RestController +@RequestMapping("/Z-RESOURCE-REPAIR-TASK") +public class ResourceRepairTaskController { + + @Autowired + public ResourceRepairTaskService resourceRepairTaskService; + + /** + * 根据id查询 + * + * @param id 主键 + * @return + */ + @ResponseBody + @GetMapping("/{id:.+}") + public R getResourceRepairTaskById(@PathVariable String id) { + return R.ok( resourceRepairTaskService.getById(id)); + } + + /** + * 查询所有数据 + * + * @return + */ + @ResponseBody + @GetMapping("") + public R getResourceRepairTaskList(ResourceRepairTask resourceRepairTask){ + return R.ok(resourceRepairTaskService.selectList(resourceRepairTask)); + } + + /** + * 分页查询数据 + * + * @param frontPage 分页信息 + * @return + */ + @ResponseBody + @GetMapping("/page") + public R page(FrontPage frontPage, ResourceRepairTask resourceRepairTask){ + IPage result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceRepairTask); + if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) { + //TODO modify global query + queryWrapper.lambda().and(wrapper -> wrapper + .like(ResourceRepairTask::getHandle, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getSite, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getRepairNo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getStatus, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getResourceBo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getUserNo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getNcCodeBo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getRepairType, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getStopMachine, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getNcDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getFindLink, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getReportSource, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getObjectBo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getRemark, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getOther, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getAnother, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getCreateUser, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getModifyUser, frontPage.getGlobalQuery()) + ); + } + result = resourceRepairTaskService.page(frontPage.getPagePlus(), queryWrapper); + return R.ok(result); + } + + /** + * 新增 + * @param resourceRepairTask 传递的实体 + * @return null 失败 实体成功 + */ + @PostMapping + public R save(@RequestBody ResourceRepairTask resourceRepairTask) { + return R.ok(resourceRepairTaskService.save(resourceRepairTask)); + } + + /** + * 修改 + * @param resourceRepairTask 传递的实体 + * @return null 失败 实体成功 + */ + @PutMapping + public R updateById(@RequestBody ResourceRepairTask resourceRepairTask) { + return R.ok(resourceRepairTaskService.updateById(resourceRepairTask)); + } + + /** + * 根据id删除对象 + * @param id 实体ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.DELETE, value = "/{id:.+}") + public R removeById(@PathVariable("id") String id){ + return R.ok(resourceRepairTaskService.removeById(id)); + } + + /** + * 批量删除对象 + * @param ids 实体集合ID + * @return 0 失败 1 成功 + */ + @ResponseBody + @RequestMapping(method = RequestMethod.POST, value = "/delete-batch") + public R removeByIds(List ids){ + return R.ok(resourceRepairTaskService.removeByIds(ids)); + } + + /** + * 保存提报的维修单，返回维修单号 + * @param resourceRepairTask + * @return + */ + @ResponseBody + @GetMapping("/saveRepairTask") + public R saveRepairTask(ResourceRepairTask resourceRepairTask){ + return R.ok(resourceRepairTaskService.saveRepairTask(resourceRepairTask)); + } + + /** + * 条件查询，查询维修任务 + * + * @return + */ + @ResponseBody + @GetMapping("/getRepairTaskList") + public R getRepairTaskList(ResourceRepairTask resourceRepairTask){ + return R.ok(resourceRepairTaskService.selectList(resourceRepairTask)); + } + + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java index 961a746a..7bc37b0d 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceInspectTaskMapper.java @@ -5,6 +5,7 @@ import com.foreverwin.mesnac.equip.model.ResourceInspectTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springframework.stereotype.Repository; +import java.time.LocalDateTime; import java.util.List; /** @@ -24,4 +25,7 @@ public interface ResourceInspectTaskMapper extends BaseMapper findResourceInspectTaskList(ResourceInspectTaskDto resourceInspectTaskDto); + LocalDateTime selectMaxCreateTimeByPlanBoAnd(ResourceInspectTask resourceInspectTask); + + } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java new file mode 100644 index 00000000..423da878 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java @@ -0,0 +1,18 @@ +package com.foreverwin.mesnac.equip.mapper; + +import com.foreverwin.mesnac.equip.model.ResourceRepairTask; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springframework.stereotype.Repository; + +/** + *

+ * 设备报修任务表 Mapper 接口 + *

+ * + * @author pavel.Liu + * @since 2021-07-06 + */ +@Repository +public interface ResourceRepairTaskMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java new file mode 100644 index 00000000..7235db53 --- /dev/null +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java @@ -0,0 +1,452 @@ +package com.foreverwin.mesnac.equip.model; + +import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableField; +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; + +/** + *

+ * 设备报修任务表 + *

+ * + * @author pavel.Liu + * @since 2021-07-06 + */ + +@TableName("Z_RESOURCE_REPAIR_TASK") + +public class ResourceRepairTask extends Model { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "HANDLE", type = IdType.INPUT) + private String handle; + /** + * 站点 + */ + @TableField("SITE") + private String site; + /** + * 维修编号 + */ + @TableField("REPAIR_NO") + private String repairNo; + /** + * 状态 + */ + @TableField("STATUS") + private String status; + /** + * 设备HANDLE + */ + @TableField("RESOURCE_BO") + private String resourceBo; + /** + * 用户HANDLE + */ + @TableField("USER_NO") + private String userNo; + /** + * 不良代码HANDLE + */ + @TableField("NC_CODE_BO") + private String ncCodeBo; + /** + * 维修类型 + */ + @TableField("REPAIR_TYPE") + private String repairType; + /** + * 是否停机 + */ + @TableField("STOP_MACHINE") + private String stopMachine; + /** + * 故障描述补充 + */ + @TableField("NC_DESCRIPTION") + private String ncDescription; + /** + * 发现环节 + */ + @TableField("FIND_LINK") + private String findLink; + /** + * 上报来源 + */ + @TableField("REPORT_SOURCE") + private String reportSource; + /** + * 关联来源-异常转维修 + */ + @TableField("OBJECT_BO") + private String objectBo; + /** + * 建议维修时间 + */ + @TableField("PLAN_START_DATE") + private LocalDateTime planStartDate; + /** + * 建议完成时间 + */ + @TableField("PLAN_COMPLETE_DATE") + private LocalDateTime planCompleteDate; + /** + * 实际维修时间 + */ + @TableField("ACTUAL_START_DATE") + private LocalDateTime actualStartDate; + /** + * 实际完成时间 + */ + @TableField("ACTUAL_COMPLETE_DATE") + private LocalDateTime actualCompleteDate; + /** + * 备注-预留字段 + */ + @TableField("REMARK") + private String remark; + /** + * 预留字段1 + */ + @TableField("OTHER") + private String other; + /** + * 预留字段2 + */ + @TableField("ANOTHER") + private String another; + /** + * 创建人 + */ + @TableField("CREATE_USER") + private String createUser; + /** + * 创建时间 + */ + @TableField("CREATED_DATE_TIME") + private LocalDateTime createdDateTime; + /** + * 修改人 + */ + @TableField("MODIFY_USER") + private String modifyUser; + /** + * 修改时间 + */ + @TableField("MODIFIED_DATE_TIME") + private LocalDateTime modifiedDateTime; + + /** + * 设备编号 + */ + @TableField(exist = false) + private String resourceNo; + /** + * 设备类型 + */ + @TableField(exist = false) + private String resourceType; + /** + * 故障名称 + */ + @TableField(exist = false) + private String ncName; + /** + * 车间 + */ + @TableField(exist = false) + private String workCenter; + /** + * 序号 + */ + @TableField(exist = false) + private Integer seq; + + + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getRepairNo() { + return repairNo; + } + + public void setRepairNo(String repairNo) { + this.repairNo = repairNo; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getResourceBo() { + return resourceBo; + } + + public void setResourceBo(String resourceBo) { + this.resourceBo = resourceBo; + } + + public String getUserNo() { + return userNo; + } + + public void setUserNo(String userNo) { + this.userNo = userNo; + } + + public String getNcCodeBo() { + return ncCodeBo; + } + + public void setNcCodeBo(String ncCodeBo) { + this.ncCodeBo = ncCodeBo; + } + + public String getRepairType() { + return repairType; + } + + public void setRepairType(String repairType) { + this.repairType = repairType; + } + + public String getStopMachine() { + return stopMachine; + } + + public void setStopMachine(String stopMachine) { + this.stopMachine = stopMachine; + } + + public String getNcDescription() { + return ncDescription; + } + + public void setNcDescription(String ncDescription) { + this.ncDescription = ncDescription; + } + + public String getFindLink() { + return findLink; + } + + public void setFindLink(String findLink) { + this.findLink = findLink; + } + + public String getReportSource() { + return reportSource; + } + + public void setReportSource(String reportSource) { + this.reportSource = reportSource; + } + + public String getObjectBo() { + return objectBo; + } + + public void setObjectBo(String objectBo) { + this.objectBo = objectBo; + } + + public LocalDateTime getPlanStartDate() { + return planStartDate; + } + + public void setPlanStartDate(LocalDateTime planStartDate) { + this.planStartDate = planStartDate; + } + + public LocalDateTime getPlanCompleteDate() { + return planCompleteDate; + } + + public void setPlanCompleteDate(LocalDateTime planCompleteDate) { + this.planCompleteDate = planCompleteDate; + } + + public LocalDateTime getActualStartDate() { + return actualStartDate; + } + + public void setActualStartDate(LocalDateTime actualStartDate) { + this.actualStartDate = actualStartDate; + } + + public LocalDateTime getActualCompleteDate() { + return actualCompleteDate; + } + + public void setActualCompleteDate(LocalDateTime actualCompleteDate) { + this.actualCompleteDate = actualCompleteDate; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getAnother() { + return another; + } + + public void setAnother(String another) { + this.another = another; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public LocalDateTime getCreatedDateTime() { + return createdDateTime; + } + + public void setCreatedDateTime(LocalDateTime createdDateTime) { + this.createdDateTime = createdDateTime; + } + + public String getModifyUser() { + return modifyUser; + } + + public void setModifyUser(String modifyUser) { + this.modifyUser = modifyUser; + } + + public LocalDateTime getModifiedDateTime() { + return modifiedDateTime; + } + + public void setModifiedDateTime(LocalDateTime modifiedDateTime) { + this.modifiedDateTime = modifiedDateTime; + } + +public static final String HANDLE = "HANDLE"; + +public static final String SITE = "SITE"; + +public static final String REPAIR_NO = "REPAIR_NO"; + +public static final String STATUS = "STATUS"; + +public static final String RESOURCE_BO = "RESOURCE_BO"; + +public static final String USER_NO = "USER_NO"; + +public static final String NC_CODE_BO = "NC_CODE_BO"; + +public static final String REPAIR_TYPE = "REPAIR_TYPE"; + +public static final String STOP_MACHINE = "STOP_MACHINE"; + +public static final String NC_DESCRIPTION = "NC_DESCRIPTION"; + +public static final String FIND_LINK = "FIND_LINK"; + +public static final String REPORT_SOURCE = "REPORT_SOURCE"; + +public static final String OBJECT_BO = "OBJECT_BO"; + +public static final String PLAN_START_DATE = "PLAN_START_DATE"; + +public static final String PLAN_COMPLETE_DATE = "PLAN_COMPLETE_DATE"; + +public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE"; + +public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; + +public static final String REMARK = "REMARK"; + +public static final String OTHER = "OTHER"; + +public static final String ANOTHER = "ANOTHER"; + +public static final String CREATE_USER = "CREATE_USER"; + +public static final String CREATED_DATE_TIME = "CREATED_DATE_TIME"; + +public static final String MODIFY_USER = "MODIFY_USER"; + +public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; + + + @Override + protected Serializable pkVal() { + return this.handle; + } + + @Override + public String toString() { + return "ResourceRepairTask{" + + "handle = " + handle + + ", site = " + site + + ", repairNo = " + repairNo + + ", status = " + status + + ", resourceBo = " + resourceBo + + ", userNo = " + userNo + + ", ncCodeBo = " + ncCodeBo + + ", repairType = " + repairType + + ", stopMachine = " + stopMachine + + ", ncDescription = " + ncDescription + + ", findLink = " + findLink + + ", reportSource = " + reportSource + + ", objectBo = " + objectBo + + ", planStartDate = " + planStartDate + + ", planCompleteDate = " + planCompleteDate + + ", actualStartDate = " + actualStartDate + + ", actualCompleteDate = " + actualCompleteDate + + ", remark = " + remark + + ", other = " + other + + ", another = " + another + + ", createUser = " + createUser + + ", createdDateTime = " + createdDateTime + + ", modifyUser = " + modifyUser + + ", modifiedDateTime = " + modifiedDateTime + + "}"; + } +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java index a563e93b..b3eb08ac 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceInspectPlanService.java @@ -3,6 +3,7 @@ package com.foreverwin.mesnac.equip.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.foreverwin.mesnac.equip.model.ResourceInspectPlan; import com.baomidou.mybatisplus.extension.service.IService; +import com.foreverwin.mesnac.equip.model.ResourceInspectTask; import com.foreverwin.modular.core.util.FrontPage; import java.util.List; @@ -34,4 +35,10 @@ public interface ResourceInspectPlanService extends IService + * 设备报修任务表 服务类 + *

+ * + * @author pavel.Liu + * @since 2021-07-06 + */ +public interface ResourceRepairTaskService extends IService { + + /** + * 分页查询 + * @param frontPage + * @return + */ + IPage selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask); + + List selectList(ResourceRepairTask resourceRepairTask); + + String saveRepairTask(ResourceRepairTask resourceRepairTask); + +} \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java index fc9c5830..50c35e95 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectPlanServiceImpl.java @@ -7,7 +7,7 @@ import com.foreverwin.mesnac.common.model.InspectionItem; import com.foreverwin.mesnac.common.model.InspectionItemDetail; import com.foreverwin.mesnac.common.service.InspectionItemDetailService; import com.foreverwin.mesnac.common.service.InspectionItemService; -import com.foreverwin.mesnac.common.service.NextNumberService; +import com.foreverwin.mesnac.equip.mapper.ResourceInspectTaskMapper; import com.foreverwin.mesnac.equip.model.*; import com.foreverwin.mesnac.equip.service.*; import com.foreverwin.mesnac.meapi.model.UserGroup; @@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -59,6 +58,8 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceInspectPlan resourceInspectPlan) { @@ -350,6 +351,47 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_INSPECT_TASK, 1); + inspectTask.setTaskNo(nextNumber.get(0)); + inspectTask.setHandle(HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site,nextNumber.get(0))); + resourceInspectTaskService.save(inspectTask); + } + /** * 删除设备清单 */ @@ -402,7 +444,7 @@ public class ResourceInspectPlanServiceImpl extends ServiceImpl taskParamList = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); + task.setTaskItemDetailList(taskParamList); + // 获取备品清单 + ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); + resourceInspectTaskSpare.setResourceInspectTaskBo(handle); + List taskSpareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare); + task.setTaskSpareList(taskSpareList); + return task; + } + @Override public void saveOrUpdateTaskInfo(ResourceInspectTaskDto resourceInspectTaskDto) { - // 站点、任务编号——任务handle + // 站点、任务编号——任务handle、执行人、状态 String site = CommonMethods.getSite(); String taskNo = resourceInspectTaskDto.getTaskNo(); String taskHandle = HandleEnum.RESOURCE_INSPECT_TASK.getHandle(site, taskNo); String executor = resourceInspectTaskDto.getExecutor(); + String status = resourceInspectTaskDto.getStatus(); // 检验项、备品清单 List taskItemDetailList = resourceInspectTaskDto.getTaskItemDetailList(); List taskSpareList = resourceInspectTaskDto.getTaskSpareList(); @@ -144,15 +188,23 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl taskParams = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); - if ( taskParams.size() > 0 ){ - - }*/ resourceInspectTaskParamService.removeAll(resourceInspectTaskParam); + for (ResourceInspectTaskParam taskParam:taskItemDetailList) { taskParam.setCreatedDateTime(LocalDateTime.now()); taskParam.setCreateUser(executor); @@ -163,9 +215,6 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl + * 设备报修任务表 服务实现类 + *

+ * + * @author pavel.Liu + * @since 2021-07-06 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class ResourceRepairTaskServiceImpl extends ServiceImpl implements ResourceRepairTaskService { + + @Autowired + private NextNumberHelper nextNumberHelper; + @Autowired + private ResourceRepairTaskMapper resourceRepairTaskMapper; + @Autowired + private EquipService equipService; + @Autowired + private ResourceRepairTaskService resourceRepairTaskService; + + @Override + public IPage selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceRepairTask); + return super.page(frontPage.getPagePlus(), queryWrapper); + } + + @Override + public List selectList(ResourceRepairTask resourceRepairTask) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceRepairTask); + return super.list(queryWrapper); + } + + @Override + public String saveRepairTask(ResourceRepairTask resourceRepairTask) { + String site = resourceRepairTask.getSite(); + String resourceNo = resourceRepairTask.getResourceBo(); + String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo); + if ( equipService.getById(resourceBo) == null ){ + throw BusinessException.build("设备编号错误！！！"); + } + resourceRepairTask.setResourceBo(resourceBo); + List nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1); + resourceRepairTask.setRepairNo(nextNumber.get(0)); + resourceRepairTask.setHandle(HandleEnum.RESOURCE_REPAIR_TASK.getHandle(site,nextNumber.get(0))); + resourceRepairTaskService.save(resourceRepairTask); + return nextNumber.get(0); + } + + +} \ No newline at end of file diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index f777da27..dc108243 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -592,8 +592,10 @@ + + + + + + + diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml new file mode 100644 index 00000000..6162c252 --- /dev/null +++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml @@ -0,0 +1,626 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HANDLE, SITE, REPAIR_NO, STATUS, RESOURCE_BO, USER_NO, NC_CODE_BO, REPAIR_TYPE, STOP_MACHINE, NC_DESCRIPTION, FIND_LINK, REPORT_SOURCE, OBJECT_BO, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, REMARK, OTHER, ANOTHER, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME + + + + + + + + + + + + + + + + + + + + + + + + + INSERT INTO Z_RESOURCE_REPAIR_TASK + + HANDLE, + SITE, + REPAIR_NO, + STATUS, + RESOURCE_BO, + USER_NO, + NC_CODE_BO, + REPAIR_TYPE, + STOP_MACHINE, + NC_DESCRIPTION, + FIND_LINK, + REPORT_SOURCE, + OBJECT_BO, + PLAN_START_DATE, + PLAN_COMPLETE_DATE, + ACTUAL_START_DATE, + ACTUAL_COMPLETE_DATE, + REMARK, + OTHER, + ANOTHER, + CREATE_USER, + CREATED_DATE_TIME, + MODIFY_USER, + MODIFIED_DATE_TIME, + VALUES + + #{handle}, + #{site}, + #{repairNo}, + #{status}, + #{resourceBo}, + #{userNo}, + #{ncCodeBo}, + #{repairType}, + #{stopMachine}, + #{ncDescription}, + #{findLink}, + #{reportSource}, + #{objectBo}, + #{planStartDate}, + #{planCompleteDate}, + #{actualStartDate}, + #{actualCompleteDate}, + #{remark}, + #{other}, + #{another}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + INSERT INTO Z_RESOURCE_REPAIR_TASK + + + VALUES + + #{handle}, + #{site}, + #{repairNo}, + #{status}, + #{resourceBo}, + #{userNo}, + #{ncCodeBo}, + #{repairType}, + #{stopMachine}, + #{ncDescription}, + #{findLink}, + #{reportSource}, + #{objectBo}, + #{planStartDate}, + #{planCompleteDate}, + #{actualStartDate}, + #{actualCompleteDate}, + #{remark}, + #{other}, + #{another}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + + + + UPDATE Z_RESOURCE_REPAIR_TASK + SITE=#{et.site}, + REPAIR_NO=#{et.repairNo}, + STATUS=#{et.status}, + RESOURCE_BO=#{et.resourceBo}, + USER_NO=#{et.userNo}, + NC_CODE_BO=#{et.ncCodeBo}, + REPAIR_TYPE=#{et.repairType}, + STOP_MACHINE=#{et.stopMachine}, + NC_DESCRIPTION=#{et.ncDescription}, + FIND_LINK=#{et.findLink}, + REPORT_SOURCE=#{et.reportSource}, + OBJECT_BO=#{et.objectBo}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REMARK=#{et.remark}, + OTHER=#{et.other}, + ANOTHER=#{et.another}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_REPAIR_TASK + SITE=#{et.site}, + REPAIR_NO=#{et.repairNo}, + STATUS=#{et.status}, + RESOURCE_BO=#{et.resourceBo}, + USER_NO=#{et.userNo}, + NC_CODE_BO=#{et.ncCodeBo}, + REPAIR_TYPE=#{et.repairType}, + STOP_MACHINE=#{et.stopMachine}, + NC_DESCRIPTION=#{et.ncDescription}, + FIND_LINK=#{et.findLink}, + REPORT_SOURCE=#{et.reportSource}, + OBJECT_BO=#{et.objectBo}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REMARK=#{et.remark}, + OTHER=#{et.other}, + ANOTHER=#{et.another}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + WHERE HANDLE=#{et.handle} and ${et.MP_OPTLOCK_VERSION_COLUMN}=#{et.MP_OPTLOCK_VERSION_ORIGINAL} + + + + + UPDATE Z_RESOURCE_REPAIR_TASK + SITE=#{et.site}, + REPAIR_NO=#{et.repairNo}, + STATUS=#{et.status}, + RESOURCE_BO=#{et.resourceBo}, + USER_NO=#{et.userNo}, + NC_CODE_BO=#{et.ncCodeBo}, + REPAIR_TYPE=#{et.repairType}, + STOP_MACHINE=#{et.stopMachine}, + NC_DESCRIPTION=#{et.ncDescription}, + FIND_LINK=#{et.findLink}, + REPORT_SOURCE=#{et.reportSource}, + OBJECT_BO=#{et.objectBo}, + PLAN_START_DATE=#{et.planStartDate}, + PLAN_COMPLETE_DATE=#{et.planCompleteDate}, + ACTUAL_START_DATE=#{et.actualStartDate}, + ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REMARK=#{et.remark}, + OTHER=#{et.other}, + ANOTHER=#{et.another}, + CREATE_USER=#{et.createUser}, + CREATED_DATE_TIME=#{et.createdDateTime}, + MODIFY_USER=#{et.modifyUser}, + MODIFIED_DATE_TIME=#{et.modifiedDateTime}, + + + + + HANDLE=#{ew.entity.handle} + AND SITE=#{ew.entity.site} + AND REPAIR_NO=#{ew.entity.repairNo} + AND STATUS=#{ew.entity.status} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND USER_NO=#{ew.entity.userNo} + AND NC_CODE_BO=#{ew.entity.ncCodeBo} + AND REPAIR_TYPE=#{ew.entity.repairType} + AND STOP_MACHINE=#{ew.entity.stopMachine} + AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND FIND_LINK=#{ew.entity.findLink} + AND REPORT_SOURCE=#{ew.entity.reportSource} + AND OBJECT_BO=#{ew.entity.objectBo} + AND PLAN_START_DATE=#{ew.entity.planStartDate} + AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} + AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} + AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REMARK=#{ew.entity.remark} + AND OTHER=#{ew.entity.other} + AND ANOTHER=#{ew.entity.another} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_REPAIR_TASK WHERE HANDLE=#{handle} + + + + DELETE FROM Z_RESOURCE_REPAIR_TASK + + + + + ${k} = #{cm[${k}]} + + + + + + + + DELETE FROM Z_RESOURCE_REPAIR_TASK + + + + + HANDLE=#{ew.entity.handle} + + AND SITE=#{ew.entity.site} + AND REPAIR_NO=#{ew.entity.repairNo} + AND STATUS=#{ew.entity.status} + AND RESOURCE_BO=#{ew.entity.resourceBo} + AND USER_NO=#{ew.entity.userNo} + AND NC_CODE_BO=#{ew.entity.ncCodeBo} + AND REPAIR_TYPE=#{ew.entity.repairType} + AND STOP_MACHINE=#{ew.entity.stopMachine} + AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND FIND_LINK=#{ew.entity.findLink} + AND REPORT_SOURCE=#{ew.entity.reportSource} + AND OBJECT_BO=#{ew.entity.objectBo} + AND PLAN_START_DATE=#{ew.entity.planStartDate} + AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} + AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} + AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REMARK=#{ew.entity.remark} + AND OTHER=#{ew.entity.other} + AND ANOTHER=#{ew.entity.another} + AND CREATE_USER=#{ew.entity.createUser} + AND CREATED_DATE_TIME=#{ew.entity.createdDateTime} + AND MODIFY_USER=#{ew.entity.modifyUser} + AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime} + + + ${ew.sqlSegment} + + + + + ${ew.sqlSegment} + + + + + DELETE FROM Z_RESOURCE_REPAIR_TASK WHERE HANDLE IN ( + #{item} + ) + + + +