From 1a101affa223ae0fc9be7d0a0d36375ac4d42863 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 1 Jul 2024 13:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AE=BE=E5=A4=87=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java | 2 +- .../step/context/MesProductionProcessContextStepService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java index 22bd15a..057026d 100644 --- a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesProductionProcessContextStepService.java @@ -113,7 +113,7 @@ public interface IMesProductionProcessContextStepService { void deleteFunctionChooseCavityOrderContext(StationRequestBean reqBean); @ApiOperation(value = "获取上下文工位扫描监控信息") - MesScanMonitorContext doHandleScanMonitorContext(StationRequestBean reqBean, Boolean isSetMouldRecordId); + MesScanMonitorContext doHandleScanMonitorContext(StationRequestBean reqBean, Boolean isSave); @ApiOperation(value = "保存上下文工位扫描监控信息", notes = "工序开始时记录雪花ID,工序开始时间等基础信息, 处理基础上下文时赋值设备信息") Boolean saveScanMonitorContext(StationRequestBean reqBean); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java index 6f77271..a74f2fb 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/context/MesProductionProcessContextStepService.java @@ -200,7 +200,8 @@ public class MesProductionProcessContextStepService extends BaseStepService impl MesCellEquipContext cellEquipmentContext = productionProcessContext.filterCurCellEquip(equipmentCode); //保存上下文工位扫描监控信息【设备信息】 - if (null != cellEquipmentContext) saveScanMonitorContext(reqBean, doHandleScanMonitorContext(reqBean, true).equipment(cellEquipmentContext.getEquipmentCode(), cellEquipmentContext.getEquipmentName()), false); + if (null != cellEquipmentContext) saveScanMonitorContext(reqBean, + doHandleScanMonitorContext(reqBean, true).equipment(cellEquipmentContext.getEquipId(), cellEquipmentContext.getEquipmentCode(), cellEquipmentContext.getEquipmentName()), false); //生产过程上下文对象赋值当前设备代码 if (null != cellEquipmentContext) return productionProcessContext.curCellEquipJson(cellEquipmentContext.kepwareFlagJson(equipmentExtService.getEquipmentChannelList(reqBean.getOrganizeCode(), cellEquipmentContext.getEquipmentCode())))