From 593183e75b80343892128e9d85265d32853ce001 Mon Sep 17 00:00:00 2001 From: yinq Date: Mon, 16 Jun 2025 17:28:13 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20add=E7=94=9F=E4=BA=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E4=BF=A1=E6=81=AF=E5=8A=A0=E5=B7=A5=E4=BD=9C=E9=87=8F?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../os/mes/base/domain/BaseProductLine.java | 4 +-- .../service/IBaseDeviceLedgerService.java | 9 ++++++ .../impl/BaseDeviceLedgerServiceImpl.java | 28 +++++++++++++++++++ .../os/mes/prod/domain/ProdPlanErpInfo.java | 11 ++++++++ .../impl/ProdPlanErpInfoServiceImpl.java | 13 +++++---- .../mapper/mes/prod/ProdPlanErpInfoMapper.xml | 5 ++++ 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/os-mes/src/main/java/com/os/mes/base/domain/BaseProductLine.java b/os-mes/src/main/java/com/os/mes/base/domain/BaseProductLine.java index d52d3fe..9d6bb19 100644 --- a/os-mes/src/main/java/com/os/mes/base/domain/BaseProductLine.java +++ b/os-mes/src/main/java/com/os/mes/base/domain/BaseProductLine.java @@ -79,11 +79,11 @@ public class BaseProductLine extends BaseEntity @Excel(name = "工位类型", readConverterExp = "1=生产工位,2=质检工位") private String stationType; - /** SAP工作中心编号 */ + /** SAP工作中心编号、压延总工位 */ @Excel(name = "SAP工作中心编号") private String workCenterCode; - /** SAP工作中心描述 */ + /** SAP工作中心描述、工序编号 */ @Excel(name = "SAP工作中心描述") private String workCenterName; diff --git a/os-mes/src/main/java/com/os/mes/base/service/IBaseDeviceLedgerService.java b/os-mes/src/main/java/com/os/mes/base/service/IBaseDeviceLedgerService.java index e351564..5d420da 100644 --- a/os-mes/src/main/java/com/os/mes/base/service/IBaseDeviceLedgerService.java +++ b/os-mes/src/main/java/com/os/mes/base/service/IBaseDeviceLedgerService.java @@ -64,4 +64,13 @@ public interface IBaseDeviceLedgerService * @return */ public String getDeviceCode(); + + /** + *通过设备编号查询设备台账 + * @param equipmentNo 设备台账 + * @param processStage 工艺阶段 + * @return + */ + BaseDeviceLedger selectBaseDeviceLedgerByDeviceCode(String equipmentNo, String processStage); + } diff --git a/os-mes/src/main/java/com/os/mes/base/service/impl/BaseDeviceLedgerServiceImpl.java b/os-mes/src/main/java/com/os/mes/base/service/impl/BaseDeviceLedgerServiceImpl.java index 81465e1..a2cd6ff 100644 --- a/os-mes/src/main/java/com/os/mes/base/service/impl/BaseDeviceLedgerServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/base/service/impl/BaseDeviceLedgerServiceImpl.java @@ -3,6 +3,8 @@ package com.os.mes.base.service.impl; import java.util.List; import com.os.common.utils.DateUtils; import com.os.common.utils.StringUtils; +import com.os.mes.base.domain.BaseProductLine; +import com.os.mes.base.mapper.BaseProductLineMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.os.mes.base.mapper.BaseDeviceLedgerMapper; @@ -21,6 +23,9 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService @Autowired private BaseDeviceLedgerMapper baseDeviceLedgerMapper; + @Autowired + private BaseProductLineMapper baseProductLineMapper; + /** * 查询设备台账 * @@ -114,4 +119,27 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService return "E" + formattedNumber; } + /** + *通过设备编号查询设备台账 + * @param equipmentNo 设备台账 + * @param processStage 工艺阶段 + * @return + */ + @Override + public BaseDeviceLedger selectBaseDeviceLedgerByDeviceCode(String equipmentNo, String processStage) { + BaseDeviceLedger baseDeviceLedger = baseDeviceLedgerMapper.selectBaseDeviceLedgerByDeviceCode(equipmentNo); + if (processStage.equals("出布") || processStage.equals("成型") || processStage.equals("包胶")) { + BaseProductLine productLine = new BaseProductLine(); + productLine.setProductLineName(processStage); + productLine.setWorkCenterCode(baseDeviceLedger.getProductLineCode()); + List productLineList = baseProductLineMapper.selectBaseProductLineList(productLine); + if (!productLineList.isEmpty()){ + BaseProductLine baseProductLine = productLineList.get(0); + baseDeviceLedger.setProductLineCode(baseProductLine.getPlantCode()); + baseDeviceLedger.setProcessCode(baseProductLine.getWorkCenterName()); + } + } + return baseDeviceLedger; + } + } diff --git a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanErpInfo.java b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanErpInfo.java index 3e1aaba..7aab324 100644 --- a/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanErpInfo.java +++ b/os-mes/src/main/java/com/os/mes/prod/domain/ProdPlanErpInfo.java @@ -24,6 +24,9 @@ public class ProdPlanErpInfo extends BaseEntity /** 主键标识 */ private Long objId; + @Excel(name = "工作量") + private BigDecimal workload; + /** 硬件 */ @Excel(name = "硬件") private String hardware; @@ -301,6 +304,14 @@ public class ProdPlanErpInfo extends BaseEntity private String processCode; private String stationCode; + public BigDecimal getWorkload() { + return workload; + } + + public void setWorkload(BigDecimal workload) { + this.workload = workload; + } + public String getTeamNo() { return teamNo; } diff --git a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java index 613e234..6c14f81 100644 --- a/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java +++ b/os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java @@ -5,7 +5,7 @@ import java.util.List; import com.os.common.utils.DateUtils; import com.os.common.utils.StringUtils; import com.os.mes.base.domain.BaseDeviceLedger; -import com.os.mes.base.mapper.BaseDeviceLedgerMapper; +import com.os.mes.base.service.IBaseDeviceLedgerService; import com.os.mes.prod.domain.ProdPlanInfo; import com.os.mes.prod.service.IProdPlanInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +30,7 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService { private IProdPlanInfoService prodPlanInfoService; @Autowired - private BaseDeviceLedgerMapper deviceLedgerMapper; + private IBaseDeviceLedgerService deviceLedgerService; /** * 查询生产计划信息 @@ -111,19 +111,20 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService { public void insertOrUpdateProdPlanErpInfoList(List dataList) { for (ProdPlanErpInfo planErpInfo : dataList) { String equipmentNo = planErpInfo.getEquipmentNo(); + String processStage = planErpInfo.getProcessStage(); if (StringUtils.isNotEmpty(equipmentNo)) { - BaseDeviceLedger deviceLedger = deviceLedgerMapper.selectBaseDeviceLedgerByDeviceCode(equipmentNo); - if (StringUtils.isNotNull(deviceLedger)){ + BaseDeviceLedger deviceLedger = deviceLedgerService.selectBaseDeviceLedgerByDeviceCode(equipmentNo, processStage); + if (StringUtils.isNotNull(deviceLedger)) { // 出布、成型、包胶、硫化 - planErpInfo.setStationCode(deviceLedger.getProductLineCode()); planErpInfo.setProcessCode(deviceLedger.getProcessCode()); + planErpInfo.setStationCode(deviceLedger.getProductLineCode()); } } String seqNo = planErpInfo.getSeqNo(); ProdPlanErpInfo selectErpInfo = new ProdPlanErpInfo(); selectErpInfo.setSeqNo(seqNo); List infoList = prodPlanErpInfoMapper.selectProdPlanErpInfoList(selectErpInfo); - if (infoList.size() > 0){ + if (!infoList.isEmpty()) { ProdPlanInfo prodPlanInfo = new ProdPlanInfo(); prodPlanInfo.setPlanCode(seqNo); List planInfoList = prodPlanInfoService.selectProdPlanInfoList(prodPlanInfo); diff --git a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanErpInfoMapper.xml b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanErpInfoMapper.xml index de48b72..66b8a95 100644 --- a/os-mes/src/main/resources/mapper/mes/prod/ProdPlanErpInfoMapper.xml +++ b/os-mes/src/main/resources/mapper/mes/prod/ProdPlanErpInfoMapper.xml @@ -76,6 +76,7 @@ + @@ -146,6 +147,7 @@ taskForce, teamName, groupLeader, + workload, create_by, create_time, update_by, @@ -327,6 +329,7 @@ create_time, update_by, update_time, + workload, #{hardware}, @@ -399,6 +402,7 @@ #{createTime}, #{updateBy}, #{updateTime}, + #{workload}, @@ -482,6 +486,7 @@ create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, + workload = #{workload}, where obj_id = #{objId}