From 6016bd93dc91503d8385d71f0aee50a09ff861bb Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 8 Jul 2021 21:19:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E5=9D=97=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResourceRepairTaskController.java | 127 ++++- .../mapper/ResourceRepairTaskMapper.java | 18 + .../equip/model/ResourceRepairTask.java | 502 ++++++++++++++++-- .../service/ResourceRepairTaskService.java | 42 +- .../impl/ResourceRepairTaskServiceImpl.java | 246 ++++++++- .../mapper/ResourceRepairTaskMapper.xml | 447 +++++++++++++--- .../mesnac/meapi/service/ResrceService.java | 6 + .../meapi/service/impl/ResrceServiceImpl.java | 7 + 8 files changed, 1268 insertions(+), 127 deletions(-) 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 index 69d34aee..0f3186a8 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceRepairTaskController.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.equip.controller; +import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; import com.foreverwin.modular.core.util.CommonMethods; @@ -16,7 +17,7 @@ import java.util.List; /** * * @author pavel.Liu - * @since 2021-07-06 + * @since 2021-07-07 */ @RestController @RequestMapping("/Z-RESOURCE-REPAIR-TASK") @@ -45,7 +46,11 @@ public class ResourceRepairTaskController { @ResponseBody @GetMapping("") public R getResourceRepairTaskList(ResourceRepairTask resourceRepairTask){ - return R.ok(resourceRepairTaskService.selectList(resourceRepairTask)); + List result; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceRepairTask); + result = resourceRepairTaskService.list(queryWrapper); + return R.ok(result); } /** @@ -66,16 +71,28 @@ public class ResourceRepairTaskController { .like(ResourceRepairTask::getHandle, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getSite, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getRepairNo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getDescription, 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::getResourceNo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getReportUser, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getNcCodeNo, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getRepairType, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getStopMachine, frontPage.getGlobalQuery()) - .or().like(ResourceRepairTask::getNcDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getBreakDownDescription, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getFindLink, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getReportSource, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getObjectBo, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getRepairUsers, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getCancelCode, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getCancelDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getCancelUser, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getDealWay, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getPreliminaryReason, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getDealWayDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getWaitDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getPrimaryReason, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getPrimaryReasonDescription, frontPage.getGlobalQuery()) + .or().like(ResourceRepairTask::getPrecautionMeasureDescription, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getRemark, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getOther, frontPage.getGlobalQuery()) .or().like(ResourceRepairTask::getAnother, frontPage.getGlobalQuery()) @@ -137,7 +154,42 @@ public class ResourceRepairTaskController { @ResponseBody @GetMapping("/saveRepairTask") public R saveRepairTask(ResourceRepairTask resourceRepairTask){ - return R.ok(resourceRepairTaskService.saveRepairTask(resourceRepairTask)); + try{ + resourceRepairTaskService.saveRepairTask(resourceRepairTask); + }catch (Exception e){ + R.failed("提报失败，"+e.getMessage()); + } + return R.ok(); + } + + /** + * 条件查询，查询维修任务 + * + * @return + */ + @ResponseBody + @GetMapping("/findResourceRepairTaskList") + public R findResourceRepairTaskList(ResourceRepairTask resourceRepairTask){ + try { + return R.ok(resourceRepairTaskService.findResourceRepairTaskList(resourceRepairTask)); + }catch (Exception e){ + return R.failed(""+e.getMessage()); + } + } + + /** + * 条件查询，查询维修任务 + * + * @return + */ + @ResponseBody + @GetMapping("/selOrStartRepairTask") + public R selOrStartRepairTask(ResourceRepairTask resourceRepairTask){ + try { + return R.ok(resourceRepairTaskService.selOrStartRepairTask(resourceRepairTask)); + }catch (Exception e){ + return R.failed(""+e.getMessage()); + } } /** @@ -145,11 +197,66 @@ public class ResourceRepairTaskController { * * @return */ + @PostMapping("/saveOrUpdateTaskInfo") + public R saveOrUpdateTaskInfo(@RequestBody ResourceRepairTask resourceRepairTask){ + try { + return R.ok(resourceRepairTaskService.saveOrUpdateTaskInfo(resourceRepairTask)); + }catch (Exception e){ + return R.failed(""+e.getMessage()); + } + } + + /** + * 自定义sql，根据维修任务HANDLE，返回详细维修任务数据： + * 1、维修任务纠正预防； + * 2、维修任务数据修改。 + * @return + */ @ResponseBody - @GetMapping("/getRepairTaskList") - public R getRepairTaskList(ResourceRepairTask resourceRepairTask){ - return R.ok(resourceRepairTaskService.selectList(resourceRepairTask)); + @GetMapping("/findResourceRepairTaskByHandleAndSite") + public R findResourceRepairTaskByHandleAndSite(String repairNo){ + String site = CommonMethods.getSite(); + String handle = HandleEnum.RESOURCE_REPAIR_TASK.getHandle(site, repairNo); + try { + return R.ok(resourceRepairTaskService.findResourceRepairTaskByHandleAndSite(site,handle)); + }catch (Exception e){ + return R.failed(""+e.getMessage()); + } } + /** + * 维修任务纠正预防，自定义sql，根据维修任务HANDLE， + * 返回详细维修任务数据 + * @return + */ + @PostMapping("/updateResourceRepairTaskByHandle") + public R updateResourceRepairTaskByHandle(@RequestBody ResourceRepairTask resourceRepairTask){ + String handle = resourceRepairTask.getHandle(); + ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle); + repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason()); + repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription()); + repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription()); + try { + return R.ok(resourceRepairTaskService.updateById(repairTask)); + }catch (Exception e){ + return R.failed("纠正预防更新失败："+e.getMessage()); + } + } + + /** + * 维修任务纠正预防，自定义sql，根据维修任务HANDLE， + * 返回详细维修任务数据 + * @return + */ + @PostMapping("/updateResourceRepairTaskInfoByHandle") + public R updateResourceRepairTaskInfoByHandle(@RequestBody ResourceRepairTask resourceRepairTask){ + try { + return R.ok(resourceRepairTaskService.updateResourceRepairTaskInfoByHandle(resourceRepairTask)); + }catch (Exception e){ + return R.failed("维修任务数据更改失败："+e.getMessage()); + } + } + + } \ 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 index 423da878..3b8b4644 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/mapper/ResourceRepairTaskMapper.java @@ -2,8 +2,11 @@ package com.foreverwin.mesnac.equip.mapper; import com.foreverwin.mesnac.equip.model.ResourceRepairTask; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + /** *

* 设备报修任务表 Mapper 接口 @@ -15,4 +18,19 @@ import org.springframework.stereotype.Repository; @Repository public interface ResourceRepairTaskMapper extends BaseMapper { + /** + * 自定义sql：多条件查询，获取维修任务 + * @param resourceRepairTask + * @return + */ + List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask); + + /** + * 自定义sql：根据维修任务HANDLE查询维修任务详细数据 + * @param site + * @param handle + * @return + */ + ResourceRepairTask findResourceRepairTaskByHandleAndSite(@Param("site") String site,@Param("handle") String handle); + } \ 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 index 7235db53..07721003 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/model/ResourceRepairTask.java @@ -6,17 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; +import java.util.List; + import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; /** *

- * 设备报修任务表 + * 设备报修/维修表 *

* * @author pavel.Liu - * @since 2021-07-06 + * @since 2021-07-07 */ @TableName("Z_RESOURCE_REPAIR_TASK") @@ -40,26 +41,31 @@ public class ResourceRepairTask extends Model { */ @TableField("REPAIR_NO") private String repairNo; + /** + * 描述 + */ + @TableField("DESCRIPTION") + private String description; /** * 状态 */ @TableField("STATUS") private String status; /** - * 设备HANDLE + * 设备编号 */ - @TableField("RESOURCE_BO") - private String resourceBo; + @TableField("RESOURCE_NO") + private String resourceNo; /** - * 用户HANDLE + * 提报人 */ - @TableField("USER_NO") - private String userNo; + @TableField("REPORT_USER") + private String reportUser; /** * 不良代码HANDLE */ - @TableField("NC_CODE_BO") - private String ncCodeBo; + @TableField("NC_CODE_NO") + private String ncCodeNo; /** * 维修类型 */ @@ -73,8 +79,8 @@ public class ResourceRepairTask extends Model { /** * 故障描述补充 */ - @TableField("NC_DESCRIPTION") - private String ncDescription; + @TableField("BREAK_DOWN_DESCRIPTION") + private String breakDownDescription; /** * 发现环节 */ @@ -111,7 +117,82 @@ public class ResourceRepairTask extends Model { @TableField("ACTUAL_COMPLETE_DATE") private LocalDateTime actualCompleteDate; /** - * 备注-预留字段 + * 维修用户 + */ + @TableField("REPAIR_USERS") + private String repairUsers; + /** + * 取消代码 + */ + @TableField("CANCEL_CODE") + private String cancelCode; + /** + * 取消时间 + */ + @TableField("CANCEL_DATE") + private LocalDateTime cancelDate; + /** + * 取消描述 + */ + @TableField("CANCEL_DESCRIPTION") + private String cancelDescription; + /** + * 取消用户 + */ + @TableField("CANCEL_USER") + private String cancelUser; + /** + * 处理方式 + */ + @TableField("DEAL_WAY") + private String dealWay; + /** + * 初步原因 + */ + @TableField("PRELIMINARY_REASON") + private String preliminaryReason; + /** + * 处理方式描述 + */ + @TableField("DEAL_WAY_DESCRIPTION") + private String dealWayDescription; + /** + * 等待时间 + */ + @TableField("WAIT_TIME") + private Double waitTime; + /** + * 等待开始时间 + */ + @TableField("WAIT_START_DATE") + private LocalDateTime waitStartDate; + /** + * 等待结束时间 + */ + @TableField("WAIT_END_DATE") + private LocalDateTime waitEndDate; + /** + * 等待描述 + */ + @TableField("WAIT_DESCRIPTION") + private String waitDescription; + /** + * 根本原因 + */ + @TableField("PRIMARY_REASON") + private String primaryReason; + /** + * 根本原因描述 + */ + @TableField("PRIMARY_REASON_DESCRIPTION") + private String primaryReasonDescription; + /** + * 预防措施描述 + */ + @TableField("PRECAUTION_MEASURE_DESCRIPTION") + private String precautionMeasureDescription; + /** + * 备注 */ @TableField("REMARK") private String remark; @@ -147,25 +228,70 @@ public class ResourceRepairTask extends Model { private LocalDateTime modifiedDateTime; /** - * 设备编号 + * 设备HANDLE */ @TableField(exist = false) - private String resourceNo; + private String resourceBo; + /** + * 设备描述 + */ + @TableField(exist = false) + private String resourceDescription; /** * 设备类型 */ @TableField(exist = false) - private String resourceType; + private String resourceTypeNo; + /** + * 设备类型HANDLE + */ + @TableField(exist = false) + private String resourceTypeBo; + /** + * 设备类型 + */ + @TableField(exist = false) + private String resourceTypeDescription; + /** + * 不良代码HANDLE + */ + @TableField(exist = false) + private String ncCodeBo; + /** + * 不良名称 + */ + @TableField(exist = false) + private String ncCodeDescription; /** - * 故障名称 + * 车间 */ @TableField(exist = false) - private String ncName; + private String workCenterNo; + /** + * 车间HANDLE + */ + @TableField(exist = false) + private String workCenterBo; /** * 车间 */ @TableField(exist = false) - private String workCenter; + private String workCenterDescription; + /** + * 比较时间，起 + */ + @TableField(exist = false) + private LocalDateTime compareStartTime; + /** + * 比较时间，终 + */ + @TableField(exist = false) + private LocalDateTime compareEndTime; + /** + * 备品清单 + */ + @TableField(exist = false) + private List spareList; /** * 序号 */ @@ -173,7 +299,119 @@ public class ResourceRepairTask extends Model { private Integer seq; + public List getSpareList() { + return spareList; + } + + public void setSpareList(List spareList) { + this.spareList = spareList; + } + + public String getWorkCenterBo() { + return workCenterBo; + } + + public void setWorkCenterBo(String workCenterBo) { + this.workCenterBo = workCenterBo; + } + + public String getNcCodeBo() { + return ncCodeBo; + } + + public void setNcCodeBo(String ncCodeBo) { + this.ncCodeBo = ncCodeBo; + } + + public String getResourceBo() { + return resourceBo; + } + + public void setResourceBo(String resourceBo) { + this.resourceBo = resourceBo; + } + + public String getResourceDescription() { + return resourceDescription; + } + + public void setResourceDescription(String resourceDescription) { + this.resourceDescription = resourceDescription; + } + + public String getResourceTypeNo() { + return resourceTypeNo; + } + + public void setResourceTypeNo(String resourceTypeNo) { + this.resourceTypeNo = resourceTypeNo; + } + + public String getResourceTypeBo() { + return resourceTypeBo; + } + + public void setResourceTypeBo(String resourceTypeBo) { + this.resourceTypeBo = resourceTypeBo; + } + + public String getResourceTypeDescription() { + return resourceTypeDescription; + } + + public void setResourceTypeDescription(String resourceTypeDescription) { + this.resourceTypeDescription = resourceTypeDescription; + } + + public String getNcCodeDescription() { + return ncCodeDescription; + } + + public void setNcCodeDescription(String ncCodeDescription) { + this.ncCodeDescription = ncCodeDescription; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public String getWorkCenterDescription() { + return workCenterDescription; + } + + public void setWorkCenterDescription(String workCenterDescription) { + this.workCenterDescription = workCenterDescription; + } + + 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 Integer getSeq() { + return seq; + } + + public void setSeq(Integer seq) { + this.seq = seq; + } + /** ------------------------------------------------------------------------------------------------------ **/ public String getHandle() { return handle; } @@ -198,6 +436,14 @@ public class ResourceRepairTask extends Model { this.repairNo = repairNo; } + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + public String getStatus() { return status; } @@ -206,28 +452,28 @@ public class ResourceRepairTask extends Model { this.status = status; } - public String getResourceBo() { - return resourceBo; + public String getResourceNo() { + return resourceNo; } - public void setResourceBo(String resourceBo) { - this.resourceBo = resourceBo; + public void setResourceNo(String resourceNo) { + this.resourceNo = resourceNo; } - public String getUserNo() { - return userNo; + public String getReportUser() { + return reportUser; } - public void setUserNo(String userNo) { - this.userNo = userNo; + public void setReportUser(String reportUser) { + this.reportUser = reportUser; } - public String getNcCodeBo() { - return ncCodeBo; + public String getNcCodeNo() { + return ncCodeNo; } - public void setNcCodeBo(String ncCodeBo) { - this.ncCodeBo = ncCodeBo; + public void setNcCodeNo(String ncCodeNo) { + this.ncCodeNo = ncCodeNo; } public String getRepairType() { @@ -246,12 +492,12 @@ public class ResourceRepairTask extends Model { this.stopMachine = stopMachine; } - public String getNcDescription() { - return ncDescription; + public String getBreakDownDescription() { + return breakDownDescription; } - public void setNcDescription(String ncDescription) { - this.ncDescription = ncDescription; + public void setBreakDownDescription(String breakDownDescription) { + this.breakDownDescription = breakDownDescription; } public String getFindLink() { @@ -310,6 +556,126 @@ public class ResourceRepairTask extends Model { this.actualCompleteDate = actualCompleteDate; } + public String getRepairUsers() { + return repairUsers; + } + + public void setRepairUsers(String repairUsers) { + this.repairUsers = repairUsers; + } + + public String getCancelCode() { + return cancelCode; + } + + public void setCancelCode(String cancelCode) { + this.cancelCode = cancelCode; + } + + public LocalDateTime getCancelDate() { + return cancelDate; + } + + public void setCancelDate(LocalDateTime cancelDate) { + this.cancelDate = cancelDate; + } + + public String getCancelDescription() { + return cancelDescription; + } + + public void setCancelDescription(String cancelDescription) { + this.cancelDescription = cancelDescription; + } + + public String getCancelUser() { + return cancelUser; + } + + public void setCancelUser(String cancelUser) { + this.cancelUser = cancelUser; + } + + public String getDealWay() { + return dealWay; + } + + public void setDealWay(String dealWay) { + this.dealWay = dealWay; + } + + public String getPreliminaryReason() { + return preliminaryReason; + } + + public void setPreliminaryReason(String preliminaryReason) { + this.preliminaryReason = preliminaryReason; + } + + public String getDealWayDescription() { + return dealWayDescription; + } + + public void setDealWayDescription(String dealWayDescription) { + this.dealWayDescription = dealWayDescription; + } + + public Double getWaitTime() { + return waitTime; + } + + public void setWaitTime(Double waitTime) { + this.waitTime = waitTime; + } + + public LocalDateTime getWaitStartDate() { + return waitStartDate; + } + + public void setWaitStartDate(LocalDateTime waitStartDate) { + this.waitStartDate = waitStartDate; + } + + public LocalDateTime getWaitEndDate() { + return waitEndDate; + } + + public void setWaitEndDate(LocalDateTime waitEndDate) { + this.waitEndDate = waitEndDate; + } + + public String getWaitDescription() { + return waitDescription; + } + + public void setWaitDescription(String waitDescription) { + this.waitDescription = waitDescription; + } + + public String getPrimaryReason() { + return primaryReason; + } + + public void setPrimaryReason(String primaryReason) { + this.primaryReason = primaryReason; + } + + public String getPrimaryReasonDescription() { + return primaryReasonDescription; + } + + public void setPrimaryReasonDescription(String primaryReasonDescription) { + this.primaryReasonDescription = primaryReasonDescription; + } + + public String getPrecautionMeasureDescription() { + return precautionMeasureDescription; + } + + public void setPrecautionMeasureDescription(String precautionMeasureDescription) { + this.precautionMeasureDescription = precautionMeasureDescription; + } + public String getRemark() { return remark; } @@ -372,19 +738,21 @@ public static final String SITE = "SITE"; public static final String REPAIR_NO = "REPAIR_NO"; +public static final String DESCRIPTION = "DESCRIPTION"; + public static final String STATUS = "STATUS"; -public static final String RESOURCE_BO = "RESOURCE_BO"; +public static final String RESOURCE_NO = "RESOURCE_NO"; -public static final String USER_NO = "USER_NO"; +public static final String REPORT_USER = "REPORT_USER"; -public static final String NC_CODE_BO = "NC_CODE_BO"; +public static final String NC_CODE_NO = "NC_CODE_NO"; 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 BREAK_DOWN_DESCRIPTION = "BREAK_DOWN_DESCRIPTION"; public static final String FIND_LINK = "FIND_LINK"; @@ -400,6 +768,36 @@ public static final String ACTUAL_START_DATE = "ACTUAL_START_DATE"; public static final String ACTUAL_COMPLETE_DATE = "ACTUAL_COMPLETE_DATE"; +public static final String REPAIR_USERS = "REPAIR_USERS"; + +public static final String CANCEL_CODE = "CANCEL_CODE"; + +public static final String CANCEL_DATE = "CANCEL_DATE"; + +public static final String CANCEL_DESCRIPTION = "CANCEL_DESCRIPTION"; + +public static final String CANCEL_USER = "CANCEL_USER"; + +public static final String DEAL_WAY = "DEAL_WAY"; + +public static final String PRELIMINARY_REASON = "PRELIMINARY_REASON"; + +public static final String DEAL_WAY_DESCRIPTION = "DEAL_WAY_DESCRIPTION"; + +public static final String WAIT_TIME = "WAIT_TIME"; + +public static final String WAIT_START_DATE = "WAIT_START_DATE"; + +public static final String WAIT_END_DATE = "WAIT_END_DATE"; + +public static final String WAIT_DESCRIPTION = "WAIT_DESCRIPTION"; + +public static final String PRIMARY_REASON = "PRIMARY_REASON"; + +public static final String PRIMARY_REASON_DESCRIPTION = "PRIMARY_REASON_DESCRIPTION"; + +public static final String PRECAUTION_MEASURE_DESCRIPTION = "PRECAUTION_MEASURE_DESCRIPTION"; + public static final String REMARK = "REMARK"; public static final String OTHER = "OTHER"; @@ -426,13 +824,14 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; "handle = " + handle + ", site = " + site + ", repairNo = " + repairNo + + ", description = " + description + ", status = " + status + - ", resourceBo = " + resourceBo + - ", userNo = " + userNo + - ", ncCodeBo = " + ncCodeBo + + ", resourceNo = " + resourceNo + + ", reportUser = " + reportUser + + ", ncCodeNo = " + ncCodeNo + ", repairType = " + repairType + ", stopMachine = " + stopMachine + - ", ncDescription = " + ncDescription + + ", breakDownDescription = " + breakDownDescription + ", findLink = " + findLink + ", reportSource = " + reportSource + ", objectBo = " + objectBo + @@ -440,6 +839,21 @@ public static final String MODIFIED_DATE_TIME = "MODIFIED_DATE_TIME"; ", planCompleteDate = " + planCompleteDate + ", actualStartDate = " + actualStartDate + ", actualCompleteDate = " + actualCompleteDate + + ", repairUsers = " + repairUsers + + ", cancelCode = " + cancelCode + + ", cancelDate = " + cancelDate + + ", cancelDescription = " + cancelDescription + + ", cancelUser = " + cancelUser + + ", dealWay = " + dealWay + + ", preliminaryReason = " + preliminaryReason + + ", dealWayDescription = " + dealWayDescription + + ", waitTime = " + waitTime + + ", waitStartDate = " + waitStartDate + + ", waitEndDate = " + waitEndDate + + ", waitDescription = " + waitDescription + + ", primaryReason = " + primaryReason + + ", primaryReasonDescription = " + primaryReasonDescription + + ", precautionMeasureDescription = " + precautionMeasureDescription + ", remark = " + remark + ", other = " + other + ", another = " + another + diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceRepairTaskService.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceRepairTaskService.java index 63dc2431..2c311ad4 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceRepairTaskService.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/ResourceRepairTaskService.java @@ -26,6 +26,46 @@ public interface ResourceRepairTaskService extends IService List selectList(ResourceRepairTask resourceRepairTask); - String saveRepairTask(ResourceRepairTask resourceRepairTask); + void deleteRepairTaskList(ResourceRepairTask resourceRepairTask); + + /** + * 维修提报，保存提报信息 + * @param resourceRepairTask + */ + void saveRepairTask(ResourceRepairTask resourceRepairTask); + + /** + * 条件查询，查询维修任务 + * @param resourceRepairTask + * @return + */ + List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask); + + /** + * 根据HANDLE查询维修任务； + * 1、从总览界面，点击查询并返回维修任务； + * 2、点击开始维修，仅修改状态、维修人员 + * @param resourceRepairTask + * @return + */ + ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask); + + /** + * 取消、等待、完成，均使用当前方法 + * 1、状态码为301——维修中->维修完成 + * 2、状态码为302——维修中->维修取消 + * 3、状态码为502——维修中->维修等待 + * 4、状态码为501——维修等待->维修中 + * @param resourceRepairTask + * @return + */ + ResourceRepairTask saveOrUpdateTaskInfo(ResourceRepairTask resourceRepairTask); + + /** + * 自定义sql：根据维修任务HANDLE查询维修任务详细数据 + **/ + ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site,String handle); + + Boolean updateResourceRepairTaskInfoByHandle(ResourceRepairTask resourceRepairTask); } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java index 7361fc41..fe4a1b12 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java @@ -3,9 +3,13 @@ package com.foreverwin.mesnac.equip.service.impl; import com.foreverwin.mesnac.common.constant.Constants; import com.foreverwin.mesnac.common.enums.HandleEnum; import com.foreverwin.mesnac.common.helper.NextNumberHelper; -import com.foreverwin.mesnac.equip.model.Equip; +import com.foreverwin.mesnac.equip.model.ResourceInspectTaskSpare; import com.foreverwin.mesnac.equip.service.EquipService; +import com.foreverwin.mesnac.equip.service.ResourceInspectTaskSpareService; +import com.foreverwin.mesnac.meapi.service.NcCodeService; +import com.foreverwin.mesnac.meapi.service.ResrceService; import com.foreverwin.modular.core.exception.BusinessException; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,7 +21,11 @@ import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; +import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; +import java.util.UUID; + /** *

* 设备报修任务表 服务实现类 @@ -38,6 +46,12 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask) { @@ -54,20 +68,238 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.setEntity(resourceRepairTask); + super.remove(queryWrapper); + } + + @Override + public void saveRepairTask(ResourceRepairTask resourceRepairTask) { String site = resourceRepairTask.getSite(); - String resourceNo = resourceRepairTask.getResourceBo(); - String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo); - if ( equipService.getById(resourceBo) == null ){ + // 设备编号 + String resourceNo = resourceRepairTask.getResourceNo(); + String resourceHandle = HandleEnum.RESOURCE.getHandle(site, resourceNo); + if ( equipService.getById(resourceHandle) == null ){ throw BusinessException.build("设备编号错误！！！"); } - resourceRepairTask.setResourceBo(resourceBo); + // 不良代码 + String ncCOdeNo = resourceRepairTask.getNcCodeNo(); + String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo); + if ( ncCodeService.getById(ncCodeHandle) == null ){ + throw BusinessException.build("不良代码错误！！！"); + } + // 维修单号、维修HANDLE 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))); + // 默认新建状态 + resourceRepairTask.setStatus("401"); + // 创建人、创建时间 + String reportUser = resourceRepairTask.getReportUser(); + if (reportUser == null){ + throw BusinessException.build("提报人不能为空！！！"); + } + resourceRepairTask.setCreateUser(reportUser); + resourceRepairTask.setCreatedDateTime(LocalDateTime.now()); resourceRepairTaskService.save(resourceRepairTask); - return nextNumber.get(0); } + @Override + public List findResourceRepairTaskList(ResourceRepairTask resourceRepairTask) { + return resourceRepairTaskMapper.findResourceRepairTaskList(resourceRepairTask); + } + + @Override + public ResourceRepairTask selOrStartRepairTask(ResourceRepairTask resourceRepairTask) { + // 根据HANDLE查询维修任务 + String handle = resourceRepairTask.getHandle(); + String stopMachine = resourceRepairTask.getStopMachine(); + ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle); + String site = repairTask.getSite(); + String statusBo = repairTask.getStatus(); + if (repairTask == null){ + throw BusinessException.build("维修任务查询失败！！！"); + } + String status = resourceRepairTask.getStatus(); + if (statusBo.equals("301")){ + // 根据维修任务HANDEL查询备品清单 + ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); + resourceInspectTaskSpare.setResourceInspectTaskBo(handle); + List spareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare); + repairTask.setSpareList(spareList); + } + // 判断是否点击开始维修 + if (stopMachine != null && status.equals("501")){ + repairTask.setStatus("501"); + repairTask.setActualStartDate(LocalDateTime.now()); + repairTask.setRepairUsers(CommonMethods.getUser()); + resourceRepairTaskService.updateById(repairTask); + // 修改设备状态---若stopMachie=Y，则状态改为非预定停机 + if (stopMachine.equals("Y")){ + String resourceNo = repairTask.getResourceNo(); + String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo); + resrceService.updateResourceStatusByHandle(resourceBo,"5"); + } + } + return repairTask; + } + + @Override + public ResourceRepairTask saveOrUpdateTaskInfo(ResourceRepairTask resourceRepairTask) { + // 状态、HANDLE + String status = resourceRepairTask.getStatus(); + String handle = resourceRepairTask.getHandle(); + String user = CommonMethods.getUser(); + ResourceRepairTask repairTask = resourceRepairTaskService.getById(handle); + String site = repairTask.getSite(); + switch (status){ + case "301": + List spareList = resourceRepairTask.getSpareList(); + for (ResourceInspectTaskSpare spare:spareList) { + spare.setCreateUser(user); + spare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString())); + spare.setResourceInspectTaskBo(handle); + spare.setCreatedDateTime(LocalDateTime.now()); + } + resourceInspectTaskSpareService.saveBatch(spareList); + repairTask.setSpareList(spareList); + // 完成时间、维修人员 + repairTask.setActualCompleteDate(LocalDateTime.now()); + repairTask.setRepairUsers(resourceRepairTask.getRepairUsers()); + // 处理方式、处理方式描述、初步原因 + repairTask.setDealWay(resourceRepairTask.getDealWay()); + repairTask.setDealWayDescription(resourceRepairTask.getDealWayDescription()); + repairTask.setPreliminaryReason(resourceRepairTask.getPreliminaryReason()); + // 根本原因、根本原因描述、预防措施描述 + repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason()); + repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription()); + repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription()); + // 修改设备状态：判断维修前和维修结束的stopMachie字段是否修改 + String stopMachine = resourceRepairTask.getStopMachine(); + String stopMachineT = repairTask.getStopMachine(); + if (!stopMachine.equals(stopMachineT)){ + String resourceNo = repairTask.getResourceNo(); + String resourceBo = HandleEnum.RESOURCE.getHandle(site, resourceNo); + resrceService.updateResourceStatusByHandle(resourceBo,stopMachineT.equals("N")?"301":"5"); + } + break; + case "302": + // 取消代码、取消描述、取消时间、取消人员 + repairTask.setCancelCode(resourceRepairTask.getCancelCode()); + repairTask.setCancelDescription(resourceRepairTask.getCancelDescription()); + repairTask.setCancelDate(LocalDateTime.now()); + repairTask.setCancelUser(CommonMethods.getUser()); + break; + case "502": + if (repairTask.getWaitStartDate() != null){ + throw BusinessException.build("已有等待记录，不能再次进入等待状态！！！"); + }else { + repairTask.setWaitStartDate(LocalDateTime.now()); + repairTask.setWaitDescription(resourceRepairTask.getWaitDescription()); + } + break; + case "501": + // 结束时间、等待时长 + repairTask.setWaitEndDate(LocalDateTime.now()); + Duration betweenTime = Duration.between(repairTask.getWaitStartDate(), repairTask.getWaitEndDate()); + Long waitTime = betweenTime.toHours(); + double v = waitTime.doubleValue(); + repairTask.setWaitTime(v); + break; + } + /*// 维修完成 + if (status.equals("301")){ + // 耗用备品清单 + List spareList = resourceRepairTask.getSpareList(); + for (ResourceInspectTaskSpare spare:spareList) { + spare.setResourceInspectTaskBo(handle); + } + repairTask.setSpareList(spareList); + // 完成时间、维修人员 + repairTask.setActualCompleteDate(LocalDateTime.now()); + repairTask.setRepairUsers(resourceRepairTask.getRepairUsers()); + // 处理方式、处理方式描述、初步原因 + repairTask.setDealWay(resourceRepairTask.getDealWay()); + repairTask.setDealWayDescription(resourceRepairTask.getDealWayDescription()); + repairTask.setPreliminaryReason(resourceRepairTask.getPreliminaryReason()); + // 根本原因、根本原因描述、预防措施描述 + repairTask.setPrimaryReason(resourceRepairTask.getPrimaryReason()); + repairTask.setPrimaryReasonDescription(resourceRepairTask.getPrimaryReasonDescription()); + repairTask.setPrecautionMeasureDescription(resourceRepairTask.getPrecautionMeasureDescription()); + } + // 取消任务 + if (status.equals("302")){ + // 取消代码、取消描述、取消时间、取消人员 + repairTask.setCancelCode(resourceRepairTask.getCancelCode()); + repairTask.setCancelDescription(resourceRepairTask.getCancelDescription()); + repairTask.setCancelDate(LocalDateTime.now()); + repairTask.setCancelUser(CommonMethods.getUser()); + } + // 开始等待 + if (status.equals("502")){ + if (repairTask.getWaitStartDate() != null){ + throw BusinessException.build("已有等待记录，不能再次进入等待状态！！！"); + }else { + repairTask.setWaitStartDate(LocalDateTime.now()); + } + } + // 结束等待 + if (status.equals("501")){ + // 结束时间、等待时长 + repairTask.setWaitEndDate(LocalDateTime.now()); + Duration betweenTime = Duration.between(repairTask.getWaitStartDate(), repairTask.getWaitEndDate()); + Long waitTime = betweenTime.toHours(); + double v = waitTime.doubleValue(); + repairTask.setWaitTime(v); + }*/ + // 状态、修改人、修改时间 + repairTask.setStatus(status); + repairTask.setModifyUser(user); + repairTask.setModifiedDateTime(LocalDateTime.now()); + resourceRepairTaskService.saveOrUpdate(repairTask); + return repairTask; + } + + @Override + public ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site, String handle) { + ResourceInspectTaskSpare taskSpare = new ResourceInspectTaskSpare(); + taskSpare.setResourceInspectTaskBo(handle); + List spareList = resourceInspectTaskSpareService.selectList(taskSpare); + ResourceRepairTask repairTask = resourceRepairTaskMapper.findResourceRepairTaskByHandleAndSite(site, handle); + repairTask.setSpareList(spareList); + return repairTask; + } + + @Override + public Boolean updateResourceRepairTaskInfoByHandle(ResourceRepairTask resourceRepairTask) { + String user = CommonMethods.getUser(); + String site = CommonMethods.getSite(); + String handle = resourceRepairTask.getHandle(); + // 备品信息，全删全增 + ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); + resourceInspectTaskSpare.setResourceInspectTaskBo(handle); + resourceInspectTaskSpareService.removeAll(resourceInspectTaskSpare); + List spareList = resourceRepairTask.getSpareList(); + for (ResourceInspectTaskSpare spare:spareList) { + if (spare.getCreateUser() != null){ + spare.setModifyUser(user); + spare.setModifiedDateTime(LocalDateTime.now()); + }else { + spare.setCreateUser(user); + spare.setCreatedDateTime(LocalDateTime.now()); + } + spare.setResourceInspectTaskBo(handle); + spare.setHandle(HandleEnum.RESOURCE_INSPECT_TASK_SPARE.getHandle(site,UUID.randomUUID().toString())); + } + resourceInspectTaskSpareService.saveBatch(spareList); + return resourceRepairTaskService.updateById(resourceRepairTask); + } + + private Double minus(LocalDateTime startDate,LocalDateTime endDate){ + return null; + } + + } \ No newline at end of file diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml index 6162c252..0a063244 100644 --- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml @@ -7,13 +7,14 @@ + - - - + + + - + @@ -21,6 +22,21 @@ + + + + + + + + + + + + + + + @@ -32,7 +48,7 @@ - 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 + HANDLE, SITE, REPAIR_NO, DESCRIPTION, STATUS, RESOURCE_NO, REPORT_USER, NC_CODE_NO, REPAIR_TYPE, STOP_MACHINE, BREAK_DOWN_DESCRIPTION, FIND_LINK, REPORT_SOURCE, OBJECT_BO, PLAN_START_DATE, PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, REPAIR_USERS, CANCEL_CODE, CANCEL_DATE, CANCEL_DESCRIPTION, CANCEL_USER, DEAL_WAY, PRELIMINARY_REASON, DEAL_WAY_DESCRIPTION, WAIT_TIME, WAIT_START_DATE, WAIT_END_DATE, WAIT_DESCRIPTION, PRIMARY_REASON, PRIMARY_REASON_DESCRIPTION, PRECAUTION_MEASURE_DESCRIPTION, REMARK, OTHER, ANOTHER, CREATE_USER, CREATED_DATE_TIME, MODIFY_USER, MODIFIED_DATE_TIME @@ -69,13 +85,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -83,6 +100,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -103,13 +135,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -117,6 +150,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -145,13 +193,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -159,6 +208,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -187,13 +251,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -201,6 +266,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -229,13 +309,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -243,6 +324,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -271,13 +367,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -285,6 +382,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -313,13 +425,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -327,6 +440,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -351,13 +479,14 @@ HANDLE, SITE, REPAIR_NO, + DESCRIPTION, STATUS, - RESOURCE_BO, - USER_NO, - NC_CODE_BO, + RESOURCE_NO, + REPORT_USER, + NC_CODE_NO, REPAIR_TYPE, STOP_MACHINE, - NC_DESCRIPTION, + BREAK_DOWN_DESCRIPTION, FIND_LINK, REPORT_SOURCE, OBJECT_BO, @@ -365,6 +494,21 @@ PLAN_COMPLETE_DATE, ACTUAL_START_DATE, ACTUAL_COMPLETE_DATE, + REPAIR_USERS, + CANCEL_CODE, + CANCEL_DATE, + CANCEL_DESCRIPTION, + CANCEL_USER, + DEAL_WAY, + PRELIMINARY_REASON, + DEAL_WAY_DESCRIPTION, + WAIT_TIME, + WAIT_START_DATE, + WAIT_END_DATE, + WAIT_DESCRIPTION, + PRIMARY_REASON, + PRIMARY_REASON_DESCRIPTION, + PRECAUTION_MEASURE_DESCRIPTION, REMARK, OTHER, ANOTHER, @@ -377,13 +521,14 @@ #{handle}, #{site}, #{repairNo}, + #{description}, #{status}, - #{resourceBo}, - #{userNo}, - #{ncCodeBo}, + #{resourceNo}, + #{reportUser}, + #{ncCodeNo}, #{repairType}, #{stopMachine}, - #{ncDescription}, + #{breakDownDescription}, #{findLink}, #{reportSource}, #{objectBo}, @@ -391,6 +536,21 @@ #{planCompleteDate}, #{actualStartDate}, #{actualCompleteDate}, + #{repairUsers}, + #{cancelCode}, + #{cancelDate}, + #{cancelDescription}, + #{cancelUser}, + #{dealWay}, + #{preliminaryReason}, + #{dealWayDescription}, + #{waitTime}, + #{waitStartDate}, + #{waitEndDate}, + #{waitDescription}, + #{primaryReason}, + #{primaryReasonDescription}, + #{precautionMeasureDescription}, #{remark}, #{other}, #{another}, @@ -410,13 +570,14 @@ #{handle}, #{site}, #{repairNo}, + #{description}, #{status}, - #{resourceBo}, - #{userNo}, - #{ncCodeBo}, + #{resourceNo}, + #{reportUser}, + #{ncCodeNo}, #{repairType}, #{stopMachine}, - #{ncDescription}, + #{breakDownDescription}, #{findLink}, #{reportSource}, #{objectBo}, @@ -424,6 +585,21 @@ #{planCompleteDate}, #{actualStartDate}, #{actualCompleteDate}, + #{repairUsers}, + #{cancelCode}, + #{cancelDate}, + #{cancelDescription}, + #{cancelUser}, + #{dealWay}, + #{preliminaryReason}, + #{dealWayDescription}, + #{waitTime}, + #{waitStartDate}, + #{waitEndDate}, + #{waitDescription}, + #{primaryReason}, + #{primaryReasonDescription}, + #{precautionMeasureDescription}, #{remark}, #{other}, #{another}, @@ -439,13 +615,14 @@ UPDATE Z_RESOURCE_REPAIR_TASK SITE=#{et.site}, REPAIR_NO=#{et.repairNo}, + DESCRIPTION=#{et.description}, STATUS=#{et.status}, - RESOURCE_BO=#{et.resourceBo}, - USER_NO=#{et.userNo}, - NC_CODE_BO=#{et.ncCodeBo}, + RESOURCE_NO=#{et.resourceNo}, + REPORT_USER=#{et.reportUser}, + NC_CODE_NO=#{et.ncCodeNo}, REPAIR_TYPE=#{et.repairType}, STOP_MACHINE=#{et.stopMachine}, - NC_DESCRIPTION=#{et.ncDescription}, + BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription}, FIND_LINK=#{et.findLink}, REPORT_SOURCE=#{et.reportSource}, OBJECT_BO=#{et.objectBo}, @@ -453,6 +630,21 @@ PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REPAIR_USERS=#{et.repairUsers}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_DATE=#{et.cancelDate}, + CANCEL_DESCRIPTION=#{et.cancelDescription}, + CANCEL_USER=#{et.cancelUser}, + DEAL_WAY=#{et.dealWay}, + PRELIMINARY_REASON=#{et.preliminaryReason}, + DEAL_WAY_DESCRIPTION=#{et.dealWayDescription}, + WAIT_TIME=#{et.waitTime}, + WAIT_START_DATE=#{et.waitStartDate}, + WAIT_END_DATE=#{et.waitEndDate}, + WAIT_DESCRIPTION=#{et.waitDescription}, + PRIMARY_REASON=#{et.primaryReason}, + PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription}, + PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription}, REMARK=#{et.remark}, OTHER=#{et.other}, ANOTHER=#{et.another}, @@ -468,13 +660,14 @@ UPDATE Z_RESOURCE_REPAIR_TASK SITE=#{et.site}, REPAIR_NO=#{et.repairNo}, + DESCRIPTION=#{et.description}, STATUS=#{et.status}, - RESOURCE_BO=#{et.resourceBo}, - USER_NO=#{et.userNo}, - NC_CODE_BO=#{et.ncCodeBo}, + RESOURCE_NO=#{et.resourceNo}, + REPORT_USER=#{et.reportUser}, + NC_CODE_NO=#{et.ncCodeNo}, REPAIR_TYPE=#{et.repairType}, STOP_MACHINE=#{et.stopMachine}, - NC_DESCRIPTION=#{et.ncDescription}, + BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription}, FIND_LINK=#{et.findLink}, REPORT_SOURCE=#{et.reportSource}, OBJECT_BO=#{et.objectBo}, @@ -482,6 +675,21 @@ PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REPAIR_USERS=#{et.repairUsers}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_DATE=#{et.cancelDate}, + CANCEL_DESCRIPTION=#{et.cancelDescription}, + CANCEL_USER=#{et.cancelUser}, + DEAL_WAY=#{et.dealWay}, + PRELIMINARY_REASON=#{et.preliminaryReason}, + DEAL_WAY_DESCRIPTION=#{et.dealWayDescription}, + WAIT_TIME=#{et.waitTime}, + WAIT_START_DATE=#{et.waitStartDate}, + WAIT_END_DATE=#{et.waitEndDate}, + WAIT_DESCRIPTION=#{et.waitDescription}, + PRIMARY_REASON=#{et.primaryReason}, + PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription}, + PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription}, REMARK=#{et.remark}, OTHER=#{et.other}, ANOTHER=#{et.another}, @@ -497,13 +705,14 @@ UPDATE Z_RESOURCE_REPAIR_TASK SITE=#{et.site}, REPAIR_NO=#{et.repairNo}, + DESCRIPTION=#{et.description}, STATUS=#{et.status}, - RESOURCE_BO=#{et.resourceBo}, - USER_NO=#{et.userNo}, - NC_CODE_BO=#{et.ncCodeBo}, + RESOURCE_NO=#{et.resourceNo}, + REPORT_USER=#{et.reportUser}, + NC_CODE_NO=#{et.ncCodeNo}, REPAIR_TYPE=#{et.repairType}, STOP_MACHINE=#{et.stopMachine}, - NC_DESCRIPTION=#{et.ncDescription}, + BREAK_DOWN_DESCRIPTION=#{et.breakDownDescription}, FIND_LINK=#{et.findLink}, REPORT_SOURCE=#{et.reportSource}, OBJECT_BO=#{et.objectBo}, @@ -511,6 +720,21 @@ PLAN_COMPLETE_DATE=#{et.planCompleteDate}, ACTUAL_START_DATE=#{et.actualStartDate}, ACTUAL_COMPLETE_DATE=#{et.actualCompleteDate}, + REPAIR_USERS=#{et.repairUsers}, + CANCEL_CODE=#{et.cancelCode}, + CANCEL_DATE=#{et.cancelDate}, + CANCEL_DESCRIPTION=#{et.cancelDescription}, + CANCEL_USER=#{et.cancelUser}, + DEAL_WAY=#{et.dealWay}, + PRELIMINARY_REASON=#{et.preliminaryReason}, + DEAL_WAY_DESCRIPTION=#{et.dealWayDescription}, + WAIT_TIME=#{et.waitTime}, + WAIT_START_DATE=#{et.waitStartDate}, + WAIT_END_DATE=#{et.waitEndDate}, + WAIT_DESCRIPTION=#{et.waitDescription}, + PRIMARY_REASON=#{et.primaryReason}, + PRIMARY_REASON_DESCRIPTION=#{et.primaryReasonDescription}, + PRECAUTION_MEASURE_DESCRIPTION=#{et.precautionMeasureDescription}, REMARK=#{et.remark}, OTHER=#{et.other}, ANOTHER=#{et.another}, @@ -525,13 +749,14 @@ HANDLE=#{ew.entity.handle} AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -539,6 +764,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -584,13 +824,14 @@ AND SITE=#{ew.entity.site} AND REPAIR_NO=#{ew.entity.repairNo} + AND DESCRIPTION=#{ew.entity.description} 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 RESOURCE_NO=#{ew.entity.resourceNo} + AND REPORT_USER=#{ew.entity.reportUser} + AND NC_CODE_NO=#{ew.entity.ncCodeNo} AND REPAIR_TYPE=#{ew.entity.repairType} AND STOP_MACHINE=#{ew.entity.stopMachine} - AND NC_DESCRIPTION=#{ew.entity.ncDescription} + AND BREAK_DOWN_DESCRIPTION=#{ew.entity.breakDownDescription} AND FIND_LINK=#{ew.entity.findLink} AND REPORT_SOURCE=#{ew.entity.reportSource} AND OBJECT_BO=#{ew.entity.objectBo} @@ -598,6 +839,21 @@ AND PLAN_COMPLETE_DATE=#{ew.entity.planCompleteDate} AND ACTUAL_START_DATE=#{ew.entity.actualStartDate} AND ACTUAL_COMPLETE_DATE=#{ew.entity.actualCompleteDate} + AND REPAIR_USERS=#{ew.entity.repairUsers} + AND CANCEL_CODE=#{ew.entity.cancelCode} + AND CANCEL_DATE=#{ew.entity.cancelDate} + AND CANCEL_DESCRIPTION=#{ew.entity.cancelDescription} + AND CANCEL_USER=#{ew.entity.cancelUser} + AND DEAL_WAY=#{ew.entity.dealWay} + AND PRELIMINARY_REASON=#{ew.entity.preliminaryReason} + AND DEAL_WAY_DESCRIPTION=#{ew.entity.dealWayDescription} + AND WAIT_TIME=#{ew.entity.waitTime} + AND WAIT_START_DATE=#{ew.entity.waitStartDate} + AND WAIT_END_DATE=#{ew.entity.waitEndDate} + AND WAIT_DESCRIPTION=#{ew.entity.waitDescription} + AND PRIMARY_REASON=#{ew.entity.primaryReason} + AND PRIMARY_REASON_DESCRIPTION=#{ew.entity.primaryReasonDescription} + AND PRECAUTION_MEASURE_DESCRIPTION=#{ew.entity.precautionMeasureDescription} AND REMARK=#{ew.entity.remark} AND OTHER=#{ew.entity.other} AND ANOTHER=#{ew.entity.another} @@ -623,4 +879,65 @@ + + + + + + + + + diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java index 279c3786..abfae239 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ResrceService.java @@ -47,4 +47,10 @@ public interface ResrceService extends IService { Resrce findByResrce(String resrce); List findAllResrce(); + + /** + * 仅修改设备状态 + */ + void updateResourceStatusByHandle(String handle,String status); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java index 6c9f72c6..7ce2ad29 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ResrceServiceImpl.java @@ -68,5 +68,12 @@ public class ResrceServiceImpl extends ServiceImpl impleme return resrceMapper.findAllResrce(site); } + @Override + public void updateResourceStatusByHandle(String handle,String status) { + Resrce resrce = resrceMapper.selectById(handle); + resrce.setStatusBo("StatusBo:1000,"+status); + resrceMapper.updateById(resrce); + } + } \ No newline at end of file