From fa5e01ac66da50a68a2e36257fe3a98e73b6d106 Mon Sep 17 00:00:00 2001 From: yinq Date: Tue, 17 Jun 2025 10:09:32 +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 --- .../mes/base/service/impl/BaseDeviceLedgerServiceImpl.java | 2 +- .../mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 a2cd6ff..00b7c40 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 @@ -135,7 +135,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService List productLineList = baseProductLineMapper.selectBaseProductLineList(productLine); if (!productLineList.isEmpty()){ BaseProductLine baseProductLine = productLineList.get(0); - baseDeviceLedger.setProductLineCode(baseProductLine.getPlantCode()); + baseDeviceLedger.setProductLineCode(baseProductLine.getProductLineCode());//工位 baseDeviceLedger.setProcessCode(baseProductLine.getWorkCenterName()); } } 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 6c14f81..f070563 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 @@ -131,13 +131,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService { ProdPlanInfo planInfo = planInfoList.get(0); planInfo.setPlanCode(seqNo); planInfo.setOrderCode(planErpInfo.getTaskCode()); - planInfo.setPlanAmount(planErpInfo.getCustomerRequestConveyorLength()); + planInfo.setPlanAmount(planErpInfo.getWorkload()); planInfo.setPlanBeginTime(planErpInfo.getPlanStartTime()); planInfo.setPlanEndTime(planErpInfo.getPlanEndTime()); planInfo.setDeviceCode(equipmentNo); planInfo.setProcessCode(planErpInfo.getProcessCode()); planInfo.setStationCode(planErpInfo.getStationCode()); planInfo.setTeamCode(planErpInfo.getTeamNo()); + planInfo.setMaterialName(planErpInfo.getConveyorLengthSpecification()); prodPlanInfoService.updateProdPlanInfo(planInfo); ProdPlanErpInfo prodPlanErpInfo = infoList.get(0); planErpInfo.setObjId(prodPlanErpInfo.getObjId()); @@ -146,13 +147,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService { ProdPlanInfo planInfo = new ProdPlanInfo(); planInfo.setPlanCode(planErpInfo.getSeqNo()); planInfo.setOrderCode(planErpInfo.getTaskCode()); - planInfo.setPlanAmount(planErpInfo.getCustomerRequestConveyorLength()); + planInfo.setPlanAmount(planErpInfo.getWorkload()); planInfo.setDeviceCode(equipmentNo); planInfo.setProcessCode(planErpInfo.getProcessCode()); planInfo.setStationCode(planErpInfo.getStationCode()); planInfo.setPlanBeginTime(planErpInfo.getPlanStartTime()); planInfo.setPlanEndTime(planErpInfo.getPlanEndTime()); planInfo.setTeamCode(planErpInfo.getTeamNo()); + planInfo.setMaterialName(planErpInfo.getConveyorLengthSpecification()); planInfo.setPlanStatus("0"); planInfo.setImportFlag("1"); prodPlanInfoService.insertProdPlanInfo(planInfo);