From 2cad02ff7b2047f8e90b2d29d61f24fb00645e44 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Wed, 29 May 2024 09:32:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BA=BF=E4=BD=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/op/mes/domain/MesLine.java | 10 ++++++++++ .../com/op/mes/service/impl/MesLineServiceImpl.java | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java index 498fc898f..488dcb722 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java @@ -83,6 +83,8 @@ public class MesLine extends BaseEntity { private List processList; + private List qualityList; + public void setId(String id) { this.id = id; } @@ -179,6 +181,14 @@ public class MesLine extends BaseEntity { this.processList = processList; } + public List getQualityList() { + return qualityList; + } + + public void setQualityList(List qualityList) { + this.qualityList = qualityList; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java index 862e8220c..7cf125e8b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java @@ -1,5 +1,6 @@ package com.op.mes.service.impl; +import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; @@ -48,10 +49,12 @@ public class MesLineServiceImpl implements IMesLineService { //查询时回显线体工艺数据 List mesList = mesLineProcessService.selectMesLineProcessByBelongTo(id); List processList = mesList.stream().map(MesLineProcess::getProcessName).collect(Collectors.toList()); + List qualityList = mesList.stream().map(MesLineProcess::getQuality).collect(Collectors.toList()); MesLine mesLine = mesLineMapper.selectMesLineById(id); //设置线体数据 if (!CollectionUtils.isEmpty(processList)) { mesLine.setProcessList(processList); + mesLine.setQualityList(qualityList); } return mesLine; } @@ -101,6 +104,7 @@ public class MesLineServiceImpl implements IMesLineService { mesLine.setUpdateTime(DateUtils.getNowDate()); mesLine.setUpdateBy(SecurityUtils.getUsername()); List processList = mesLine.getProcessList(); + List qualityList = mesLine.getQualityList(); int flag = 0; if (!CollectionUtils.isEmpty(processList)) { //删除旧的工艺项 @@ -114,10 +118,11 @@ public class MesLineServiceImpl implements IMesLineService { String key = "#header.poolName"; String factoryCode = request.getHeader(key.substring(8)).replace("ds_", ""); - for (String processName : processList ) { + for (int i = 0; i < processList.size(); i++) { MesLineProcess mesLineProcess = new MesLineProcess(); mesLineProcess.setBelongTo(belongTo); - mesLineProcess.setProcessName(processName); + mesLineProcess.setProcessName(processList.get(i)); + mesLineProcess.setQuality(qualityList.get(i)); mesLineProcess.setLineCode(lineCode); mesLineProcess.setLineName(lineName); mesLineProcess.setFactoryCode(factoryCode); From 18434906dbc97d4c965e2048778341cb33bab69b Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 29 May 2024 09:40:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8Coa?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/service/impl/QcCheckTaskIncomeServiceImpl.java | 4 ++-- .../quality/service/impl/QcCheckUnqualifiedServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index bf423908f..a58b51fe1 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -857,11 +857,11 @@ public class QcCheckTaskIncomeServiceImpl implements wechart0.setText(contentInfo); wecharts.add(wechart0); } - logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); + logger.info("检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { new Thread(() -> { AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts); - logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); + logger.info("检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); }).start(); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java index dc05d8f76..df29b6448 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java @@ -229,7 +229,7 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService //发起来料检验OA流程 Map paramMap = new HashMap<>(); - paramMap.put("user",SecurityUtils.getUsername());//提交人工号qcCheckTaskIncome.getUpdateBy() + paramMap.put("user",task.getUser());//提交人工号qcCheckTaskIncome.getUpdateBy() paramMap.put("requestLevel",0);//流程紧急度 paramMap.put("requestName","ZL0020-成品检验控制流程");//流程名称 paramMap.put("workflowId",26234);//该流程对应的唯- workFlowld @@ -237,8 +237,8 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService StringBuffer mainObject = new StringBuffer(); mainObject.append("{"); mainObject.append("\"SSCJ\":"+"\""+detailInfo.getSupplierName()+"\"");//所属车间 - mainObject.append(",\"ZRPSN\":"+"\""+SecurityUtils.getUsername()+"\"");//报检人 - mainObject.append(",\"OEM\":"+"\""+detailInfo.getFactoryCode()+"\"");//OEM厂名 + mainObject.append(",\"ZRPSN\":"+"\""+task.getSqr()+"\"");//报检人 + mainObject.append(",\"OEM\":"+"\""+task.getOaFactory()+"\"");//OEM厂名 mainObject.append(",\"DH\":"+"\""+detailInfo.getOrderNo()+"\"");//单号 mainObject.append(",\"MEMO01\":"+"\""+task.getRemark()+"\"");//不合格情况描述 mainObject.append("}"); From bec9763ca4a7084589c1bc88c4f539db1b56adcc Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Wed, 29 May 2024 10:18:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/QcCheckTaskIncomeServiceImpl.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index a58b51fe1..2eeb607a9 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -839,7 +839,18 @@ public class QcCheckTaskIncomeServiceImpl implements //发企业微信--------------------开始（跟班组有关） SysNoticeGroup noticeQo = new SysNoticeGroup(); - noticeQo.setNoticeId(9L); + if(qcCheckTaskIncome.getCheckType().equals("checkTypeLL")){ + noticeQo.setNoticeId(9L); + }else if(qcCheckTaskIncome.getCheckType().equals("checkTypeSC")){ + noticeQo.setNoticeId(13L); + }else if(qcCheckTaskIncome.getCheckType().equals("checkTypeSCXJ")){ + noticeQo.setNoticeId(14L); + }else if(qcCheckTaskIncome.getCheckType().equals("checkTypeCP")){ + noticeQo.setNoticeId(15L); + }else if(qcCheckTaskIncome.getCheckType().equals("checkTypeCPPC")){ + noticeQo.setNoticeId(16L); + } + List notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo); if(!CollectionUtils.isEmpty(notices)) { List wecharts = new ArrayList<>(); @@ -852,6 +863,12 @@ public class QcCheckTaskIncomeServiceImpl implements .replace("${checkNo}", qcCheckTaskIncome.getCheckNo()+"\n") .replace("${supplierName}", qcCheckTaskIncome.getSupplierName()+"\n") .replace("${quality}", qcCheckTaskIncome.getQuality()+"\n"); + if(StringUtils.isNotBlank(qcCheckTaskIncome.getIncomeBatchNo())){ + contentInfo = contentInfo.replace("${incomeBatchNo}", qcCheckTaskIncome.getIncomeBatchNo()+"\n"); + } + if(StringUtils.isNotBlank(qcCheckTaskIncome.getOrderNo())){ + contentInfo = contentInfo.replace("${orderNo}", qcCheckTaskIncome.getOrderNo()+"\n"); + } Matcher m = p2.matcher(contentInfo); contentInfo = m.replaceAll(""); wechart0.setText(contentInfo); From 8ecedca10d188de63618a5f839752c8bd172a1e6 Mon Sep 17 00:00:00 2001 From: shaoyong Date: Thu, 30 May 2024 09:06:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BA=BF=E4=BD=93=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/mes/controller/MesLineController.java | 10 +++++++++- .../java/com/op/mes/mapper/MesLineMapper.java | 2 ++ .../com/op/mes/service/IMesLineService.java | 2 ++ .../mes/service/impl/MesLineServiceImpl.java | 19 ++++++++++--------- .../resources/mapper/mes/MesLineMapper.xml | 7 ++++++- .../mapper/mes/MesLineProcessMapper.xml | 2 +- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java index 55951d6f0..449c8790b 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesLineController.java @@ -1,10 +1,12 @@ package com.op.mes.controller; import java.util.List; +import java.util.Optional; import javax.servlet.http.HttpServletResponse; import com.alibaba.nacos.shaded.com.google.protobuf.Internal; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -74,7 +76,13 @@ public class MesLineController extends BaseController { @Log(title = "线体管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody MesLine mesLine) { - return toAjax(mesLineService.insertMesLine(mesLine)); + MesLine vali = mesLineService.validate(mesLine.getLineCode()); + if (ObjectUtils.isEmpty(vali)){ + return toAjax(mesLineService.insertMesLine(mesLine)); + }else { + return error("线体已存在不能重复添加！"); + } + } /** diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java index 97da40962..06da95770 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesLineMapper.java @@ -64,4 +64,6 @@ public interface MesLineMapper { * 选择线体 */ public List selectLineBody(MesLine mesLine); + + public MesLine validate(String lineCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java index 7c8cd0fe7..78a085ea2 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesLineService.java @@ -63,4 +63,6 @@ public interface IMesLineService { * 选择线体 */ public List selectLineBody(MesLine mesLine); + + public MesLine validate(String lineCode); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java index 7cf125e8b..0c4c04cbe 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java @@ -105,7 +105,6 @@ public class MesLineServiceImpl implements IMesLineService { mesLine.setUpdateBy(SecurityUtils.getUsername()); List processList = mesLine.getProcessList(); List qualityList = mesLine.getQualityList(); - int flag = 0; if (!CollectionUtils.isEmpty(processList)) { //删除旧的工艺项 mesLineProcessService.deleteMesLineProcessByBelongTo(mesLine.getId()); @@ -126,16 +125,12 @@ public class MesLineServiceImpl implements IMesLineService { mesLineProcess.setLineCode(lineCode); mesLineProcess.setLineName(lineName); mesLineProcess.setFactoryCode(factoryCode); - flag += mesLineProcessService.insertMesLineProcess(mesLineProcess); + mesLineProcessService.insertMesLineProcess(mesLineProcess); } - }else { - return 0; - } - if (flag > 0){ - return mesLineMapper.updateMesLine(mesLine); - }else { - return 0; } + + return mesLineMapper.updateMesLine(mesLine); + } /** @@ -166,4 +161,10 @@ public class MesLineServiceImpl implements IMesLineService { public List selectLineBody(MesLine mesLine) { return mesLineMapper.selectLineBody(mesLine); } + + @Override + @DS("#header.poolName") + public MesLine validate(String lineCode) { + return mesLineMapper.validate(lineCode); + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml index 8d38de3be..2738b225b 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineMapper.xml @@ -57,7 +57,7 @@ and factory_code = #{factoryCode} - and del_flag = '0' + and del_flag = '0' order by create_time @@ -148,4 +148,9 @@ and equipment_name like concat('%', #{lineName}, '%') + diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml index ebda3ea32..81e67e1f3 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesLineProcessMapper.xml @@ -75,7 +75,7 @@ From 23d59474b78c6975ebf0b821c8fe5f1a81e23cca Mon Sep 17 00:00:00 2001 From: A0010407 Date: Thu, 30 May 2024 14:23:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?2024-5-30=20=E8=AE=BE=E5=A4=87-=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE-=E7=BB=B4=E4=BF=AE=E7=BB=93=E6=9E=9C=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E5=AE=A1=E6=A0=B8=E5=8F=91=E9=80=81=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=B6=88=E6=81=AF+=E4=BF=9D=E5=85=BB=E6=8D=A2id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquRepairWorkOrderController.java | 13 +++ .../op/device/domain/EquRepairWorkOrder.java | 76 ++++++++------- .../mapper/EquRepairWorkOrderMapper.java | 3 + .../service/IEquRepairWorkOrderService.java | 4 + .../impl/EquRepairWorkOrderServiceImpl.java | 96 +++++++++++++++++++ .../impl/EquUpkeepOrderServiceImpl.java | 2 +- .../device/EquRepairWorkOrderMapper.xml | 15 ++- 7 files changed, 172 insertions(+), 37 deletions(-) diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java index 706ab5e1e..a273dfde4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java +++ b/op-modules/op-device/src/main/java/com/op/device/controller/EquRepairWorkOrderController.java @@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquTeamUser; +import com.op.device.domain.dto.UpKeepOrderDTO; import com.op.device.service.IDevicePDAService; import com.op.device.service.IEquOutsourceWorkService; import org.springframework.beans.factory.annotation.Autowired; @@ -137,4 +138,16 @@ public class EquRepairWorkOrderController extends BaseController { public AjaxResult queryEquFaultTypeTree(EquRepairWorkOrder equRepairWorkOrder) { return devicePDAService.queryEquFaultTypeTree(equRepairWorkOrder); } + + /** + * 维修工单检验 传参数用保养的对象 + * + * @param upKeepOrderDTO + * @return + */ + @RequiresPermissions("device:repairOrder:inspect") + @PostMapping("/subInspect") + public AjaxResult subInspect(@RequestBody UpKeepOrderDTO upKeepOrderDTO) { + return equRepairWorkOrderService.subInspect(upKeepOrderDTO); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java index f5f077037..79add390a 100644 --- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java +++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java @@ -21,116 +21,119 @@ public class EquRepairWorkOrder extends BaseEntity { private static final long serialVersionUID = 1L; @Excel(name = "维修主键") - private String workId;//主键 + private String workId; @Excel(name = "报修主键") - private String orderId;//报修主键 + private String orderId; @Excel(name = "维修单号") - private String workCode;//维修单号 + private String workCode; @Excel(name = "报修单号") - private String orderCode;//报修单号 + private String orderCode; @Excel(name = "是否立即处理") - private String workHandle;//是否立即处理 + private String workHandle; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workPlanTime;//计划维修时间 + private Date workPlanTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workPlanDownTime;//计划停机时间 + private Date workPlanDownTime; @Excel(name = "关联计划") - private String orderRelevance;//关联计划 + private String orderRelevance; @Excel(name = "维修人员") - private String workPerson;//维修人员 + private String workPerson; @Excel(name = "维修组") - private String workTeam;//维修组 + private String workTeam; @Excel(name = "是否委外") - private String workOutsource;//是否委外 + private String workOutsource; @Excel(name = "是否停机维修") - private String workDownMachine;//是否停机维修 + private String workDownMachine; @Excel(name = "设备编码") - private String equipmentCode;//设备编码 + private String equipmentCode; @Excel(name = "原因分析") - private String workReason;//原因分析 + private String workReason; @Excel(name = "故障描述") - private String workFaultDesc;//故障描述 + private String workFaultDesc; @Excel(name = "维修用时") - private String workCostTime;//维修用时 + private String workCostTime; @Excel(name = "维修费用") - private String workCost;//维修费用 + private String workCost; @Excel(name = "委外工单id") - private String outWorkId;//委外工单id + private String outWorkId; @Excel(name = "委外工单编码") - private String outWorkCode;//委外工单编码 + private String outWorkCode; @Excel(name = "备用字段1") - private String attr1;//备用字段1 + private String attr1; @Excel(name = "备用字段2") - private String attr2;//备用字段2 + private String attr2; @Excel(name = "备用字段3") - private String attr3;//备用字段3 + private String attr3; @Excel(name = "删除标志") - private String delFlag;//删除标志 + private String delFlag; @Excel(name = "工厂编码") - private String factoryCode;//工厂编码 + private String factoryCode; @Excel(name = "维修状态") - private String workStatus;//维修状态 + private String workStatus; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workStartTime;//维修开始时间 + private Date workStartTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date workEndTime;//维修结束时间 + private Date workEndTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修实际开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date actualDownStartTime;//维修停机真正开始时间 + private Date actualDownStartTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "维修实际结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date actualDownEndTime;//维修停机真正开始时间 + private Date actualDownEndTime; @Excel(name = "联系方式") - private String workConnection;//联系方式 + private String workConnection; @Excel(name = "故障类型") - private String faultType;//故障类型 + private String faultType; @Excel(name = "设备状态描述") - private String equipmentStatusDescription;//设备状态描述 + private String equipmentStatusDescription; @Excel(name = "维修措施") - private String repairMeasures;//设备维修措施 + private String repairMeasures; @Excel(name = "故障停机时间") - private String faultDownTime;//故障停机时间 + private String faultDownTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date faultStartTime;//故障开始时间 + private Date faultStartTime; + + @Excel(name = "结果检验") + private String resultInspect; /////////////////////////////////////////////////////////设备表字段 @Excel(name = "设备名称") @@ -600,6 +603,9 @@ public class EquRepairWorkOrder extends BaseEntity { public Date getFaultStartTime() { return faultStartTime; } public void setFaultStartTime(Date faultStartTime) { this.faultStartTime = faultStartTime; } + public String getResultInspect() { return resultInspect; } + public void setResultInspect(String resultInspect) { this.resultInspect = resultInspect; } + //委外 public void setOutSourceReason(String outSourceReason) { this.outSourceReason = outSourceReason; diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java index 24f63c7bb..a912acfa7 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquRepairWorkOrderMapper.java @@ -115,4 +115,7 @@ public interface EquRepairWorkOrderMapper { * @return */ public int updateEquipmentStatus(EquEquipment equEquipment); + + //更新结果检验 + void updateResultInspect(EquRepairWorkOrder equRepairWorkOrder); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java index 72efe063f..2aa7998a4 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/IEquRepairWorkOrderService.java @@ -6,6 +6,7 @@ import com.op.common.core.web.domain.AjaxResult; import com.op.device.domain.EquEquipment; import com.op.device.domain.EquRepairWorkOrder; import com.op.device.domain.EquTeamUser; +import com.op.device.domain.dto.UpKeepOrderDTO; /** * 维修工单Service接口 @@ -68,4 +69,7 @@ public interface IEquRepairWorkOrderService { //委外申请 public int applyEquOutsourceWork(EquRepairWorkOrder equRepairWorkOrder); + + //维修故障检验 + AjaxResult subInspect(UpKeepOrderDTO upKeepOrderDTO); } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java index e485c1b95..1abbc193e 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquRepairWorkOrderServiceImpl.java @@ -20,6 +20,7 @@ import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.device.domain.*; +import com.op.device.domain.dto.UpKeepOrderDTO; import com.op.device.mapper.*; import com.op.system.api.RemoteOpenService; import com.op.system.api.domain.SysNoticeGroup; @@ -557,4 +558,99 @@ public class EquRepairWorkOrderServiceImpl implements IEquRepairWorkOrderService equOutsourceWork.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", "")); return equOutsourceWorkMapper.insertEquOutsourceWork(equOutsourceWork); } + + /** + * 维修工单检验 + * + * @param upKeepOrderDTO + * @return + */ + @Override + @DS("#header.poolName") + public AjaxResult subInspect(UpKeepOrderDTO upKeepOrderDTO) { + List ids = upKeepOrderDTO.getIds(); + for (String id : ids) { + EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder(); + equRepairWorkOrder.setWorkId(id); + String resultInspect = upKeepOrderDTO.getInspect(); + equRepairWorkOrder.setResultInspect(resultInspect); + equRepairWorkOrderMapper.updateResultInspect(equRepairWorkOrder); + } + + String workCodes = ""; + List list = upKeepOrderDTO.getOrderCodes(); + for (String workCode : list) { + workCodes = workCode + "、" + workCodes ; + } + + String inspect = ""; + if(upKeepOrderDTO.getInspect().equals("0")){ + inspect = "不通过" ; + }else if(upKeepOrderDTO.getInspect().equals("1")){ + inspect = "通过" ; + }else{ + inspect = "待检验" ; + } + + //发企业微信--------------------开始（跟班组有关） + SimpleDateFormat myFmt=new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); + //规范时间格式 + SysNoticeGroup noticeQo = new SysNoticeGroup(); + noticeQo.setNoticeId(17L); + EquTeamUser equTeamUser = new EquTeamUser(); + equTeamUser.setUserName(SecurityUtils.getUsername()); + EquTeamUser equTeamUser1 = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); + Integer number = ids.size(); //个数 + List notices = equRepairOrderMapper.getNoticesGroup(noticeQo); + if(!CollectionUtils.isEmpty(notices)) { + List wecharts = new ArrayList<>(); + List userCodes = notices.stream() + .map(SysNoticeGroup::getUserCode) + .collect(Collectors.toList()); + for (SysNoticeGroup noticeDto : notices) { + WechartDTO wechart0 = new WechartDTO(); + wechart0.setUserId(noticeDto.getWxId()); + String contentInfo = noticeDto.getNoticeContent(); + contentInfo = contentInfo + .replace("${n}", "\n") + .replace("${number}", number.toString()) + .replace("${result}", inspect + "\n") + .replace("${checkTime}", myFmt.format(DateUtils.getNowDate())+"\n") + ; + + //工单号 + if(StringUtils.isNotEmpty(workCodes)){ + contentInfo = contentInfo.replace("${workCodes}", workCodes +"\n"); + }else{ + contentInfo = contentInfo.replace("${workCodes}", "无"+"\n"); + } + + //检查人 + if(StringUtils.isNotEmpty(equTeamUser1.getNickName())){ + contentInfo = contentInfo.replace("${checkPeople}", equTeamUser1.getNickName()+"\n"); + }else{ + contentInfo = contentInfo.replace("${checkPeople}", "无"+"\n"); + } + + Pattern p= Pattern.compile("<[^>]+>"); + Matcher m = p.matcher(contentInfo); + contentInfo = m.replaceAll(""); + System.out.println(contentInfo); + + wechart0.setText(contentInfo); + wecharts.add(wechart0); + } + logger.info("维修结果检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts)); + if (!CollectionUtils.isEmpty(wecharts)) { + + new Thread(() -> { + AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts); + logger.info("维修结果检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult)); + + }).start(); + } + //发企业微信--------------------结束 + } + return success(); + } } diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java index 5c6c1069a..d11e88b13 100644 --- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepOrderServiceImpl.java @@ -289,7 +289,7 @@ public class EquUpkeepOrderServiceImpl implements IEquUpkeepOrderService { //发企业微信--------------------开始（跟班组有关） SimpleDateFormat myFmt=new SimpleDateFormat("yyyy.MM.dd HH:mm:ss"); //规范时间格式 SysNoticeGroup noticeQo = new SysNoticeGroup(); - noticeQo.setNoticeId(13L); + noticeQo.setNoticeId(18L); EquTeamUser equTeamUser = new EquTeamUser(); equTeamUser.setUserName(SecurityUtils.getUsername()); EquTeamUser equTeamUser1 = equRepairOrderMapper.getRepairPhoneNumber(equTeamUser); diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml index 2feac9739..c36427d8e 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml @@ -45,6 +45,7 @@ + @@ -90,7 +91,7 @@ - select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time from equ_repair_work_order + select work_id, order_id, order_code, work_code,work_handle, work_plan_time, work_plan_down_time, order_relevance, work_person, work_team, work_outsource, work_down_machine, equipment_code, work_reason, work_fault_desc, work_start_time,work_end_time,work_cost_time, work_cost, work_status,out_work_id, out_work_code, attr1, attr2, attr3, create_by, create_time, update_time, update_by, del_flag, factory_code , fault_type , equipment_status_description , repair_measures , fault_down_time , fault_start_time ,result_inspect from equ_repair_work_order