保存设备日志

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);

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())))