From e31986dd44b6687829a1cb2cfc77039a91acb541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=83=E6=B0=94=E6=BB=A1=E6=BB=A1=28jgy=29?= Date: Fri, 8 Nov 2024 12:04:03 +0800 Subject: [PATCH] =?UTF-8?q?2024-11-8=20=E8=AE=BE=E5=A4=87-=E5=88=87?= =?UTF-8?q?=E7=BA=BF=E8=B0=83=E6=8B=A8=E3=80=81=E5=B7=A5=E5=8D=95=E5=88=87?= =?UTF-8?q?=E7=BA=BF=20-=20=E5=BE=AE=E4=BF=A1=E6=8F=90=E9=86=92=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/system/api/RemoteDeviceService.java | 4 +- .../system/api/domain/device/EquPlanDTO.java | 633 ------------------ .../domain/device/WorkOrderTangentDTO.java | 97 +++ .../factory/RemoteDeviceFallbackFactory.java | 2 +- .../controller/DeviceTaskController.java | 6 +- .../op/device/service/IDeviceTaskService.java | 4 +- .../service/impl/DeviceTaskServiceImpl.java | 36 +- .../impl/ProOrderWorkorderServiceImpl.java | 16 +- 8 files changed, 133 insertions(+), 665 deletions(-) delete mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquPlanDTO.java create mode 100644 op-api/op-api-system/src/main/java/com/op/system/api/domain/device/WorkOrderTangentDTO.java diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java index 2a7f15b1..11d8c2f4 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/RemoteDeviceService.java @@ -3,7 +3,7 @@ package com.op.system.api; import com.op.common.core.constant.ServiceNameConstants; import com.op.common.core.domain.R; import com.op.system.api.domain.DataSourcePropertyDTO; -import com.op.system.api.domain.device.EquPlanDTO; +import com.op.system.api.domain.device.WorkOrderTangentDTO; import com.op.system.api.factory.RemoteDeviceFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -45,5 +45,5 @@ public interface RemoteDeviceService { //切线后创建当日新的点检工单 @PostMapping("/deviceTask/createSpotCheckWorkOrder") - public R createSpotCheckWorkOrder(@RequestBody EquPlanDTO equPlanDTO); + public R createSpotCheckWorkOrder(@RequestBody WorkOrderTangentDTO workOrderTangentDTO); } diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquPlanDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquPlanDTO.java deleted file mode 100644 index 4c0efaab..00000000 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/EquPlanDTO.java +++ /dev/null @@ -1,633 +0,0 @@ -package com.op.system.api.domain.device; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.op.common.core.annotation.Excel; -import com.op.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.util.Date; -import java.util.List; - -/** - * 计划对象 equ_plan - * - * @author Open Platform - * @date 2023-10-16 - */ -public class EquPlanDTO extends BaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String planId; - - /** - * 计划编码 - */ - @Excel(name = "计划编码") - private String planCode; - - /** - * 计划名称 - */ - @Excel(name = "计划名称") - private String planName; - - /** - * 车间 - */ - @Excel(name = "车间编码") - private String planWorkshop; - - /** - * 产线 - */ - private String planProdLine; - - /** - * 设备名称 - */ - private String equipmentName; - - /** - * 设备编码 - */ - private String equipmentCode; - - /** - * 循环周期 - */ - @Excel(name = "循环周期") - private String planLoop; - - /** - * 循环周期类型 - */ - @Excel(name = "循环周期类型") - private String planLoopType; - - /** - * 循环执行时间开始 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "循环执行时间开始", width = 30, dateFormat = "yyyy-MM-dd") - private Date planLoopStart; - - /** - * 循环执行时间结束 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "循环执行时间结束", width = 30, dateFormat = "yyyy-MM-dd") - private Date planLoopEnd; - - /** - * 巡检人员 - */ - private String planPerson; - - /** - * 计划状态 - */ - @Excel(name = "计划状态") - private String planStatus; - - /** - * 是否可生产-限制 - */ - @Excel(name = "是否可生产-限制") - private String planRestrict; - - /** - * 维护类型 - */ - private String planType; - - /** - * 是否委外 - */ - private String planOutsource; - - /** - * 委外工单编码 - */ - @Excel(name = "委外工单编码") - private String workCode; - - /** - * 工厂 - */ - @Excel(name = "工厂") - private String factoryCode; - - /** - * 备用字段1 - */ - private String attr1; - - /** - * 备用字段2 - */ - private String attr2; - - /** - * 备用字段3 - */ - private String attr3; - - /** - * 删除标志 - */ - private String delFlag; - - // 创建日期范围list - private List createTimeArray; - - // 更新日期范围list - private List updateTimeArray; - - // 更新日期开始 - private String updateTimeStart; - - // 更新日期结束 - private String updateTimeEnd; - - // 创建日期开始 - private String createTimeStart; - - // 创建日期结束 - private String createTimeEnd; - - private List planTimeArray; - - private List personListVO; - - private String workCenterName; - - // 保养类型 - @Excel(name = "保养类型") - private String upkeep; - - // 计划保养时间计算规则 - private String calculationRule; - - // 是否停机保养 - @Excel(name = "是否停机保养") - private String shutDown; - private String planEquId; - - private List loopStartArray; - - private Date loopStart; - - private Date loopEnd; - - private List loopEndArray; - - private Date loopEndArrayStart; - - private Date getLoopEndArrayEnd; - - @Excel(name = "委外人员") - private String workPerson; - - @Excel(name = "委外单位") - private String workOutsourcingUnit; - - @Excel(name = "联系方式") - private String workConnection; - - @Excel(name = "委外原因") - private String workReason; - - //jgy 新增 生产线体编码 每天生成线体信息的时候只生成计划生产的 - private String lineCode; - private List lineCodes; - private String workOrderCode;//工单号 - private String changeLineType;//切线类型 - - public String getWorkOutsourcingUnit() { - return workOutsourcingUnit; - } - - public void setWorkOutsourcingUnit(String workOutsourcingUnit) { - this.workOutsourcingUnit = workOutsourcingUnit; - } - - public String getWorkConnection() { - return workConnection; - } - - public void setWorkConnection(String workConnection) { - this.workConnection = workConnection; - } - - public String getWorkReason() { - return workReason; - } - - public void setWorkReason(String workReason) { - this.workReason = workReason; - } - - public String getWorkPerson() { - return workPerson; - } - - public void setWorkPerson(String workPerson) { - this.workPerson = workPerson; - } - - public List getLoopEndArray() { - return loopEndArray; - } - - public void setLoopEndArray(List loopEndArray) { - this.loopEndArray = loopEndArray; - } - - public Date getLoopEndArrayStart() { - return loopEndArrayStart; - } - - public void setLoopEndArrayStart(Date loopEndArrayStart) { - this.loopEndArrayStart = loopEndArrayStart; - } - - public Date getGetLoopEndArrayEnd() { - return getLoopEndArrayEnd; - } - - public void setGetLoopEndArrayEnd(Date getLoopEndArrayEnd) { - this.getLoopEndArrayEnd = getLoopEndArrayEnd; - } - - public Date getLoopEnd() { - return loopEnd; - } - - public void setLoopEnd(Date loopEnd) { - this.loopEnd = loopEnd; - } - - public Date getLoopStart() { - return loopStart; - } - - public void setLoopStart(Date loopStart) { - this.loopStart = loopStart; - } - - public List getLoopStartArray() { - return loopStartArray; - } - - public void setLoopStartArray(List loopStartArray) { - this.loopStartArray = loopStartArray; - } - - public String getPlanEquId() { - return planEquId; - } - - public void setPlanEquId(String planEquId) { - this.planEquId = planEquId; - } - - public String getUpkeep() { - return upkeep; - } - - public void setUpkeep(String upkeep) { - this.upkeep = upkeep; - } - - public String getCalculationRule() { - return calculationRule; - } - - public void setCalculationRule(String calculationRule) { - this.calculationRule = calculationRule; - } - - public String getShutDown() { - return shutDown; - } - - public void setShutDown(String shutDown) { - this.shutDown = shutDown; - } - - public String getWorkCenterName() { - return workCenterName; - } - - public void setWorkCenterName(String workCenterName) { - this.workCenterName = workCenterName; - } - - public List getPersonListVO() { - return personListVO; - } - - public void setPersonListVO(List personListVO) { - this.personListVO = personListVO; - } - - public List getPlanTimeArray() { - return planTimeArray; - } - - public void setPlanTimeArray(List planTimeArray) { - this.planTimeArray = planTimeArray; - } - - public List getCreateTimeArray() { - return createTimeArray; - } - - public void setCreateTimeArray(List createTimeArray) { - this.createTimeArray = createTimeArray; - } - - public List getUpdateTimeArray() { - return updateTimeArray; - } - - public void setUpdateTimeArray(List updateTimeArray) { - this.updateTimeArray = updateTimeArray; - } - - public String getUpdateTimeStart() { - return updateTimeStart; - } - - public void setUpdateTimeStart(String updateTimeStart) { - this.updateTimeStart = updateTimeStart; - } - - public String getUpdateTimeEnd() { - return updateTimeEnd; - } - - public void setUpdateTimeEnd(String updateTimeEnd) { - this.updateTimeEnd = updateTimeEnd; - } - - public String getCreateTimeStart() { - return createTimeStart; - } - - public void setCreateTimeStart(String createTimeStart) { - this.createTimeStart = createTimeStart; - } - - public String getCreateTimeEnd() { - return createTimeEnd; - } - - public void setCreateTimeEnd(String createTimeEnd) { - this.createTimeEnd = createTimeEnd; - } - - public void setPlanId(String planId) { - this.planId = planId; - } - - public String getPlanId() { - return planId; - } - - public void setPlanCode(String planCode) { - this.planCode = planCode; - } - - public String getPlanCode() { - return planCode; - } - - public void setPlanName(String planName) { - this.planName = planName; - } - - public String getPlanName() { - return planName; - } - - public void setPlanWorkshop(String planWorkshop) { - this.planWorkshop = planWorkshop; - } - - public String getPlanWorkshop() { - return planWorkshop; - } - - public void setPlanProdLine(String planProdLine) { - this.planProdLine = planProdLine; - } - - public String getPlanProdLine() { - return planProdLine; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentCode(String equipmentCode) { - this.equipmentCode = equipmentCode; - } - - public String getEquipmentCode() { - return equipmentCode; - } - - public void setPlanLoop(String planLoop) { - this.planLoop = planLoop; - } - - public String getPlanLoop() { - return planLoop; - } - - public void setPlanLoopType(String planLoopType) { - this.planLoopType = planLoopType; - } - - public String getPlanLoopType() { - return planLoopType; - } - - public void setPlanLoopStart(Date planLoopStart) { - this.planLoopStart = planLoopStart; - } - - public Date getPlanLoopStart() { - return planLoopStart; - } - - public void setPlanLoopEnd(Date planLoopEnd) { - this.planLoopEnd = planLoopEnd; - } - - public Date getPlanLoopEnd() { - return planLoopEnd; - } - - public void setPlanPerson(String planPerson) { - this.planPerson = planPerson; - } - - public String getPlanPerson() { - return planPerson; - } - - public void setPlanStatus(String planStatus) { - this.planStatus = planStatus; - } - - public String getPlanStatus() { - return planStatus; - } - - public void setPlanRestrict(String planRestrict) { - this.planRestrict = planRestrict; - } - - public String getPlanRestrict() { - return planRestrict; - } - - public void setPlanType(String planType) { - this.planType = planType; - } - - public String getPlanType() { - return planType; - } - - public void setPlanOutsource(String planOutsource) { - this.planOutsource = planOutsource; - } - - public String getPlanOutsource() { - return planOutsource; - } - - public void setWorkCode(String workCode) { - this.workCode = workCode; - } - - public String getWorkCode() { - return workCode; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getFactoryCode() { - return factoryCode; - } - - public void setAttr1(String attr1) { - this.attr1 = attr1; - } - - public String getAttr1() { - return attr1; - } - - public void setAttr2(String attr2) { - this.attr2 = attr2; - } - - public String getAttr2() { - return attr2; - } - - public void setAttr3(String attr3) { - this.attr3 = attr3; - } - - public String getAttr3() { - return attr3; - } - - public void setDelFlag(String delFlag) { - this.delFlag = delFlag; - } - - public String getDelFlag() { - return delFlag; - } - - public void setLineCode(String lineCode) { - this.lineCode = lineCode; - } - - public String getLineCode() { - return lineCode; - } - - public void setLineCodes(List lineCodes) { - this.lineCodes = lineCodes; - } - - public List getLineCodes() { - return lineCodes; - } - - public void setWorkOrderCode(String workOrderCode) { - this.workOrderCode = workOrderCode; - } - - public String getWorkOrderCode() { - return workOrderCode; - } - - public void setChangeLineType(String changeLineType) { - this.changeLineType = changeLineType; - } - - public String getChangeLineType() { - return changeLineType; - } - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("planId", getPlanId()) - .append("planCode", getPlanCode()) - .append("planName", getPlanName()) - .append("planWorkshop", getPlanWorkshop()) - .append("planProdLine", getPlanProdLine()) - .append("equipmentName", getEquipmentName()) - .append("equipmentCode", getEquipmentCode()) - .append("planLoop", getPlanLoop()) - .append("planLoopType", getPlanLoopType()) - .append("planLoopStart", getPlanLoopStart()) - .append("planLoopEnd", getPlanLoopEnd()) - .append("planPerson", getPlanPerson()) - .append("planStatus", getPlanStatus()) - .append("planRestrict", getPlanRestrict()) - .append("planType", getPlanType()) - .append("planOutsource", getPlanOutsource()) - .append("workCode", getWorkCode()) - .append("factoryCode", getFactoryCode()) - .append("attr1", getAttr1()) - .append("attr2", getAttr2()) - .append("attr3", getAttr3()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/WorkOrderTangentDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/WorkOrderTangentDTO.java new file mode 100644 index 00000000..4f437509 --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/device/WorkOrderTangentDTO.java @@ -0,0 +1,97 @@ +package com.op.system.api.domain.device; + +import com.op.common.core.web.domain.BaseEntity; +import java.util.List; + +/** + * 工单切线传输对象 workOrderTangent + * + * @author jgy + * @date 2024-11-7 + */ +public class WorkOrderTangentDTO extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String planProdLine;//产线 + private String equipmentName;//设备名称 + private String equipmentCode;//设备编码 + private String factoryCode;//工厂 + + //jgy 新增 切线调拨 工单切线能用到的参数 + private String lineCode; + private List addLineCodes; + private String workOrderCode;//工单号 + private String changeLineType;//切线类型 + private List previousLineCodes;//之前的产线 + private List currentLineCodes;//现在的产线 + + public void setPlanProdLine(String planProdLine) { + this.planProdLine = planProdLine; + } + public String getPlanProdLine() { + return planProdLine; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentCode(String equipmentCode) { + this.equipmentCode = equipmentCode; + } + public String getEquipmentCode() { + return equipmentCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + public String getFactoryCode() { + return factoryCode; + } + + public void setLineCode(String lineCode) { + this.lineCode = lineCode; + } + public String getLineCode() { + return lineCode; + } + + public void setAddLineCodes(List addLineCodes) { + this.addLineCodes = addLineCodes; + } + public List getAddLineCodes() { + return addLineCodes; + } + + public void setWorkOrderCode(String workOrderCode) { + this.workOrderCode = workOrderCode; + } + public String getWorkOrderCode() { + return workOrderCode; + } + + public void setChangeLineType(String changeLineType) { + this.changeLineType = changeLineType; + } + public String getChangeLineType() { + return changeLineType; + } + + public void setPreviousLineCodes(List previousLineCodes) { + this.previousLineCodes = previousLineCodes; + } + public List getPreviousLineCodes() { + return previousLineCodes; + } + + public void setCurrentLineCodes(List currentLineCodes) { + this.currentLineCodes = currentLineCodes; + } + public List getCurrentLineCodes() { + return currentLineCodes; + } +} diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java index f7d224d5..b36bf7cf 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteDeviceFallbackFactory.java @@ -59,7 +59,7 @@ public class RemoteDeviceFallbackFactory implements FallbackFactory plans = deviceTaskMapper.getPlans(equPlan);//所有的 - List changeLineCodeList = equPlanDTO.getLineCodes();//切线后的实际传过来的要新增的产线信息 + List changeLineCodeList = workOrderTangentDTO.getAddLineCodes();//切线后的实际传过来的要新增的产线信息 List addProducePlans = new ArrayList<>();//切线后,真正能生成的生产线 下面的设备的点检计划 List addProduceLine = new ArrayList<>();//真正能生成的切线生产线 @@ -298,7 +298,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { if(!StringUtils.isBlank(plan.getLineCode())){ if(plan.getLineCode().equals(lineCode)){ addProducePlans.add(plan); - logger.info(equPlanDTO.getFactoryCode() + "工厂切线后新生成计划信息：" + JSONArray.toJSONString(plan)); + logger.info(workOrderTangentDTO.getFactoryCode() + "工厂切线后新生成计划信息：" + JSONArray.toJSONString(plan)); addProduceLine.add(lineCode); } } @@ -306,7 +306,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { } } addProduceLine = addProduceLine.stream().distinct().collect(Collectors.toList()); - logger.info(equPlanDTO.getFactoryCode() + "工厂切线后新生成产线：" + JSONArray.toJSONString(addProduceLine)); + logger.info(workOrderTangentDTO.getFactoryCode() + "工厂切线后新生成产线：" + JSONArray.toJSONString(addProduceLine)); addSpotCheckTask = new ArrayList<>(); for (EquPlan plan : addProducePlans) { @@ -323,14 +323,14 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { } } - logger.info("++++++++++++" + equPlanDTO.getFactoryCode() + "++++切线后创建微信提醒开始++++++++++"); - this.spotCheckSendWeChat(addProduceLine,equPlanDTO); - logger.info("++++++++++++" + equPlanDTO.getFactoryCode() + "++++切线后创建微信提醒结束++++++++++"); - logger.info("++++++++++++" + equPlanDTO.getFactoryCode() + "++++切线后创建点检工单流程结束++++++++++"); + logger.info("++++++++++++" + workOrderTangentDTO.getFactoryCode() + "++++切线后创建微信提醒开始++++++++++"); + this.spotCheckSendWeChat(addProduceLine,workOrderTangentDTO); + logger.info("++++++++++++" + workOrderTangentDTO.getFactoryCode() + "++++切线后创建微信提醒结束++++++++++"); + logger.info("++++++++++++" + workOrderTangentDTO.getFactoryCode() + "++++切线后创建点检工单流程结束++++++++++"); return success(); } - private void spotCheckSendWeChat(List addProduceLine, EquPlanDTO equPlanDTO) { + private void spotCheckSendWeChat(List addProduceLine, WorkOrderTangentDTO workOrderTangentDTO) { //发企业微信--------------------开始（跟班组有关） SimpleDateFormat myFmt=new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒"); //规范时间格式 SysNoticeGroup noticeQo = new SysNoticeGroup(); @@ -349,10 +349,12 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { //在前端填的时候，需要判空！！！！！！ contentInfo = contentInfo .replace("${n}", "\n") - .replace("${productLineCode}", addProduceLine + "")//产线 - .replace("${changeLineType}", equPlanDTO.getChangeLineType())//切线类型 + .replace("${previousLines}", workOrderTangentDTO.getPreviousLineCodes() + "\n")//切线前产线 + .replace("${currentLines}", workOrderTangentDTO.getCurrentLineCodes() + "\n")//切线后产线 + .replace("${addLines}", addProduceLine + "\n")//新增产线 + .replace("${changeLineType}", workOrderTangentDTO.getChangeLineType())//切线类型 .replace("${orderCode}", addSpotCheckTask + "")//点检工单号 - .replace("${workOrderCode}", equPlanDTO.getWorkOrderCode());//工单号 + .replace("${workOrderCode}", workOrderTangentDTO.getWorkOrderCode());//工单号 //替换标签 Pattern p= Pattern.compile("<[^>]+>"); @@ -362,7 +364,7 @@ public class DeviceTaskServiceImpl implements IDeviceTaskService { wechart0.setText(contentInfo); wecharts.add(wechart0); } - logger.info(equPlanDTO.getChangeLineType()+ "后，企业微信提醒维修请求：" + JSONObject.toJSONString(wecharts)); + logger.info(workOrderTangentDTO.getChangeLineType()+ "后，企业微信提醒维修请求：" + JSONObject.toJSONString(wecharts)); if (!CollectionUtils.isEmpty(wecharts)) { new Thread(() -> { AjaxResult wxResult = remoteOpenService.sendWeChartMessage(wecharts); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 0011ea35..284857d2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -23,7 +23,7 @@ import com.op.plan.mapper.*; import com.op.plan.service.IProOrderWorkorderService; import com.op.system.api.RemoteDeviceService; import com.op.system.api.RemoteSapService; -import com.op.system.api.domain.device.EquPlanDTO; +import com.op.system.api.domain.device.WorkOrderTangentDTO; import com.op.system.api.domain.dto.MesPrepareDTO; import com.op.system.api.domain.dto.MesPrepareDetailDTO; import com.op.system.api.domain.sap.*; @@ -1819,13 +1819,15 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { addLines = addLines.stream().distinct().collect(Collectors.toList()); if(!CollectionUtils.isEmpty(addLines)){//如果 现在的产线是空 以前可能是空的 也可能不是空的 证明没有进行切线 - EquPlanDTO equPlanDTO = new EquPlanDTO(); - equPlanDTO.setWorkOrderCode(splitOrderDTO.getProOrderWorkorder().getWorkorderCode()); - equPlanDTO.setFactoryCode(poolName); - equPlanDTO.setLineCodes(addLines); - equPlanDTO.setChangeLineType(changeLineType); + WorkOrderTangentDTO workOrderTangentDTO = new WorkOrderTangentDTO(); + workOrderTangentDTO.setWorkOrderCode(splitOrderDTO.getProOrderWorkorder().getWorkorderCode()); + workOrderTangentDTO.setFactoryCode(poolName); + workOrderTangentDTO.setAddLineCodes(addLines); + workOrderTangentDTO.setChangeLineType(changeLineType); + workOrderTangentDTO.setPreviousLineCodes(previousLines); + workOrderTangentDTO.setCurrentLineCodes(currentLines); logger.info(poolName + "工厂进行切线，生成产线" + addLines + "的新点检信息"); - remoteDeviceService.createSpotCheckWorkOrder(equPlanDTO); + remoteDeviceService.createSpotCheckWorkOrder(workOrderTangentDTO); }else{ logger.info(poolName + "工厂进行切线，没有新产线需要点检。"); }