From 246e8f43f728622e554b57026d9d8391fe8acb91 Mon Sep 17 00:00:00 2001 From: zpl Date: Mon, 19 Jul 2021 17:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9D=97=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResourceInspectPlanController.java | 44 -- .../ResourceInspectTaskController.java | 2 +- .../equip/dto/ResourceInspectTaskDto.java | 10 + .../mapper/ResourceRepairTaskMapper.java | 13 + .../service/ResourceRepairTaskService.java | 5 + .../impl/ResourceInspectTaskServiceImpl.java | 25 +- .../impl/ResourceRepairTaskServiceImpl.java | 89 ++- equip/src/main/resourceDB.sql | 515 ++++++++++++++++++ .../mapper/ResourceInspectTaskMapper.xml | 2 +- .../mapper/ResourceRepairTaskMapper.xml | 98 +++- .../meapi/controller/BomController.java | 2 + .../meapi/controller/DcGroupController.java | 2 + .../meapi/controller/UserGroupController.java | 3 + 13 files changed, 701 insertions(+), 109 deletions(-) create mode 100644 equip/src/main/resourceDB.sql diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java index 06d2152d..e280561b 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/controller/ResourceInspectPlanController.java @@ -1,7 +1,5 @@ package com.foreverwin.mesnac.equip.controller; -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.modular.core.util.R; @@ -152,31 +150,6 @@ public class ResourceInspectPlanController { } } - /** - * 依据项目清单handle获取检验项 - * @param inspectionItem - * @return - */ - @ResponseBody - @RequestMapping("/getAddItemDetailList") - public R getInspectItem(InspectionItem inspectionItem){ - String handle = inspectionItem.getHandle(); -// String site = CommonMethods.getSite(); -// String inspectionItemHandle = HandleEnum.INSPECTION_ITEM.getHandle(site,inspectionType); - QueryWrapper itemQueryWrapper = new QueryWrapper<>(); - itemQueryWrapper.setEntity(inspectionItem); - List inspectionItems = inspectionItemService.list(itemQueryWrapper); - if (inspectionItems.size()<1 || inspectionItems.equals(null)){ - return null; //检验编号错误 - } - QueryWrapper inspectionItemDetail = new QueryWrapper<>(); - InspectionItemDetail inspectionItemDetail1 = new InspectionItemDetail(); - inspectionItemDetail1.setInspectionItemBo(handle); - inspectionItemDetail.setEntity(inspectionItemDetail1); - List inspectionItemDetailList = inspectionItemDetailService.list(inspectionItemDetail); - return R.ok(inspectionItemDetailList); - } - /** * 根据handle，查询检验计划 * @param resourceInspectPlan @@ -204,21 +177,4 @@ public class ResourceInspectPlanController { return R.ok(); } - /** - * 自动创建任务。 - * @param resourceInspectPlan - * @return - */ - /*@ResponseBody - @RequestMapping("/autoCreateTaskByResourceInspectPlan") - public R autoCreateTaskByResourceInspectPlan(ResourceInspectPlan resourceInspectPlan){ - try { - resourceInspectPlanService.deleteInspectionPlanByHandle(resourceInspectPlan); - } catch (Exception e) { - R.failed("计划删除失败：" + e.getMessage()); - } - return R.ok(); - }*/ - - } \ No newline at end of file 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 0702ed63..468ad33a 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 @@ -148,7 +148,7 @@ public class ResourceInspectTaskController { String resourceTypeNo = resourceInspectTaskDto.getResourceTypeNo(); String workCenter = resourceInspectTaskDto.getWorkCenter(); if (planNo != null){ - resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo,"_")); + resourceInspectTaskDto.setResourceInspectPlanBo(HandleEnum.RESOURCE_INSPECT_PLAN.getHandle(site,planNo,resourceInspectTaskDto.getPlanRevision())); } if (resourceNo != null){ resourceInspectTaskDto.setResourceBo(HandleEnum.RESOURCE.getHandle(site,resourceNo)); diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java index 0c584460..34790600 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/dto/ResourceInspectTaskDto.java @@ -70,6 +70,8 @@ public class ResourceInspectTaskDto implements Serializable { private String resourceTypeBo; /**计划编号NO**/ private String planNo; + /**点检计划版本**/ + private String planRevision; /**计划描述**/ private String planDescription; /**频率**/ @@ -146,6 +148,14 @@ public class ResourceInspectTaskDto implements Serializable { this.resourceDescription = resourceDescription; } + public String getPlanRevision() { + return planRevision; + } + + public void setPlanRevision(String planRevision) { + this.planRevision = planRevision; + } + public String getPlanNo() { return planNo; } 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 3b8b4644..f4e139a5 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 @@ -33,4 +33,17 @@ public interface ResourceRepairTaskMapper extends BaseMapper */ ResourceRepairTask findResourceRepairTaskByHandleAndSite(@Param("site") String site,@Param("handle") String handle); + /** + * 查询日志表是否已有记录 + * @param handle + * @return + */ + Integer selRepairTaskLogByHandle(@Param("handle")String handle); + + /** + * 插入日志信息 + * @param resourceRepairTask + */ + void insertRepairTaskLog(ResourceRepairTask resourceRepairTask); + } \ No newline at end of file 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 2c311ad4..a6890c93 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 @@ -66,6 +66,11 @@ public interface ResourceRepairTaskService extends IService **/ ResourceRepairTask findResourceRepairTaskByHandleAndSite(String site,String handle); + /** + * 修改维修信息 + * @param resourceRepairTask + * @return + */ Boolean updateResourceRepairTaskInfoByHandle(ResourceRepairTask resourceRepairTask); } \ No newline at end of file diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java index f180277b..bc40c8ce 100644 --- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java +++ b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceInspectTaskServiceImpl.java @@ -24,10 +24,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import java.util.*; /** *

@@ -122,7 +121,13 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl itemParamList = resourceInspectTaskParamService.selectList(resourceInspectTaskParam); + HashMap findCondition = new HashMap<>(2); + findCondition.put(ResourceInspectTaskParam.RESOURCE_INSPECT_TASK_BO,resourceInspectTaskParam.getResourceInspectTaskBo()); + Collection taskParams = resourceInspectTaskParamService.listByMap(findCondition); + List itemParamList = new ArrayList<>(); + for (ResourceInspectTaskParam param:taskParams) { + itemParamList.add(param); + } ResourceInspectTaskSpare resourceInspectTaskSpare = new ResourceInspectTaskSpare(); resourceInspectTaskSpare.setResourceInspectTaskBo(taskHandle); List taskSpareList = resourceInspectTaskSpareService.selectList(resourceInspectTaskSpare); @@ -272,10 +277,16 @@ public class ResourceInspectTaskServiceImpl extends ServiceImpl @@ -49,6 +51,8 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl selectPage(FrontPage frontPage, ResourceRepairTask resourceRepairTask) { @@ -81,11 +85,22 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl collection = new ArrayList<>(); + for (int i = 0; i < ncSplit.length; i++) { + collection.add(HandleEnum.NC_CODE.getHandle(site,ncSplit[i])); + } + Collection ncCodes = ncCodeService.listByIds(collection); + if ( ncCodes.size() != ncSplit.length ){ throw BusinessException.build("不良代码错误！！！"); }*/ + for (int i = 0; i < ncSplit.length; i++) { + String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncSplit[i]); + if ( ncCodeService.getById(ncCodeHandle) == null ){ + throw BusinessException.build("不良代码错误！！！"); + } + } // 维修单号、维修HANDLE List nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1); resourceRepairTask.setRepairNo(nextNumber.get(0)); @@ -162,7 +177,16 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl 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); @@ -269,6 +247,13 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl - SELECT ${ew.sqlSelect} FROM Z_RESOURCE_INSPECT_TASK diff --git a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml index cfc4630a..c3956576 100644 --- a/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceRepairTaskMapper.xml @@ -883,14 +883,11 @@ + + + + + INSERT INTO Z_RESOURCE_REPAIR_TASK_LOG + + 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, + VALUES + + #{handle}, + #{site}, + #{repairNo}, + #{description}, + #{status}, + #{resourceNo}, + #{reportUser}, + #{ncCodeNo}, + #{repairType}, + #{stopMachine}, + #{breakDownDescription}, + #{findLink}, + #{reportSource}, + #{objectBo}, + #{planStartDate}, + #{planCompleteDate}, + #{actualStartDate}, + #{actualCompleteDate}, + #{repairUsers}, + #{cancelCode}, + #{cancelDate}, + #{cancelDescription}, + #{cancelUser}, + #{dealWay}, + #{preliminaryReason}, + #{dealWayDescription}, + #{waitTime}, + #{waitStartDate}, + #{waitEndDate}, + #{waitDescription}, + #{primaryReason}, + #{primaryReasonDescription}, + #{precautionMeasureDescription}, + #{remark}, + #{other}, + #{another}, + #{createUser}, + #{createdDateTime}, + #{modifyUser}, + #{modifiedDateTime}, + + + diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/BomController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/BomController.java index 12c451e3..32f76539 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/BomController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/BomController.java @@ -45,6 +45,8 @@ public class BomController { @ResponseBody @GetMapping("") public R getBomList(Bom bom){ + String site = CommonMethods.getSite(); + bom.setSite(site); List result; QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(bom); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java index 654497b9..1c0f6351 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/DcGroupController.java @@ -45,6 +45,8 @@ public class DcGroupController { @ResponseBody @GetMapping("") public R getDcGroupList(DcGroup dcGroup){ + String site = CommonMethods.getSite(); + dcGroup.setSite(site); List result; QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(dcGroup); diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java index 1994accd..8383e2b1 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/UserGroupController.java @@ -1,5 +1,6 @@ package com.foreverwin.mesnac.meapi.controller; +import com.foreverwin.modular.core.util.CommonMethods; import com.foreverwin.modular.core.util.R; import com.foreverwin.modular.core.util.FrontPage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -45,6 +46,8 @@ public class UserGroupController { @ResponseBody @GetMapping("") public R getUserGroupList(UserGroup userGroup){ + String site = CommonMethods.getSite(); + userGroup.setSite(site); List result; QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(userGroup);