读设备工步 禁用扫描框、

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyReadStepService.java

@@ -52,6 +52,11 @@ public class MesAssemblyReadStepService extends BaseStepService {
     private IMesMouldMultiCavityService mouldMultiCavityService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容
@@ -66,11 +71,11 @@ public class MesAssemblyReadStepService extends BaseStepService {
 
         StationResultBean resultBean = new StationResultBean();
 
-        StepResult stepResult = StepResult.getSuccessComplete();
-
         //获取工步参数
         Optional<Map<String, MesProdRouteOptParam>> stepParamMap = getStepParams(reqBean);
 
+        StepResult stepResult = StepResult.getSuccessComplete().stepParamMap(stepParamMap);
+
         //获取上下文信息
         MesProductionProcessContext productionProcessContext = productionProcessContextStepService.doHandleCurCellEquipment(reqBean, stepParamMap);
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesFirstMouldNoReadStepService.java

@@ -61,6 +61,11 @@ public class MesFirstMouldNoReadStepService extends BaseStepService {
     private IPartService partService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesMouldNoReadStepService.java

@@ -54,6 +54,11 @@ public class MesMouldNoReadStepService extends BaseStepService {
     private MesFirstMouldNoReadStepService firstMouldNoReadStepService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductResultReadStepService.java

@@ -50,6 +50,11 @@ public class MesProductResultReadStepService extends BaseStepService {
     private IMesEquipVariableCfgRuleMatchDispatchService equipVariableCfgRuleMatchService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductSnReadStepService.java

@@ -53,6 +53,11 @@ public class MesProductSnReadStepService extends BaseStepService {
     private IMesMouldMultiCavityService mouldMultiCavityService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesProductionPartNoReadStepService.java

@@ -57,6 +57,11 @@ public class MesProductionPartNoReadStepService extends BaseStepService {
     private IPartService partService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容
@@ -113,12 +118,12 @@ public class MesProductionPartNoReadStepService extends BaseStepService {
 
         //获取设备LOG采集数据
         MesEquipLogDispatchContext equipLogDispatchContext = equipmentLogExtService.doHandleEquipmentLogList(cellEquipContext, equipmentVariableList, equipmentVariableCfgList, false);
-        this.sendMessage(reqBean, resultBean, JSONObject.toJSONString(equipLogDispatchContext), MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
 
         //验证设备通信质量
         productionCustomContextStepService.sendEquipQualityMessage(reqBean, cellEquipContext);
         if (!equipmentLogExtService.checkEquipQuality(cellEquipContext.getQuality()))
-            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean.writeDbLog(), stepResult.isCompleted(false).msg(String.format("请检查设备的质量状态,读取到设备[%s]的数据变量质量值为[%s],持续监听中...", cellEquipContext.getEquipmentName(), cellEquipContext.getQuality())),
+            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean.writeDbLog().checkRepeatType(),
+                    stepResult.isCompleted(false).msg(String.format("请检查设备的质量状态,读取到设备[%s]的数据变量质量值为[%s],持续监听中...", cellEquipContext.getEquipmentName(), cellEquipContext.getQuality())),
                     MesPcnEnumUtil.STATION_BUSI_TYPE.GUIDE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT, stepParamMap, MesPcnExtConstWords.READ_FAILURE_SLEEP, MesPcnExtConstWords.READ_FAILURE_SLEEP_DEFAULT_TIME);
 
         //验证产出零件号的有效性
@@ -131,7 +136,7 @@ public class MesProductionPartNoReadStepService extends BaseStepService {
 
         //未采集到数据
         if (!equipLogDispatchContext.getIsCollectValue())
-            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean, stepResult.isCompleted(false).msg(String.format("当前未读取到设备[%s]产出零件号,持续监听中...", cellEquipContext.getEquipmentName())),
+            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean.writeDbLog().checkRepeatType(), stepResult.isCompleted(false).msg(String.format("当前未读取到设备[%s]产出零件号,持续监听中...", cellEquipContext.getEquipmentName())),
                     MesPcnEnumUtil.STATION_BUSI_TYPE.GUIDE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT, stepParamMap, MesPcnExtConstWords.READ_FAILURE_SLEEP, MesPcnExtConstWords.READ_FAILURE_SLEEP_DEFAULT_TIME);
 
         //读取的产出零件号进行规则匹配
@@ -139,12 +144,15 @@ public class MesProductionPartNoReadStepService extends BaseStepService {
 
         //没有有效的数据
         if (CollectionUtils.isEmpty(equipVariableCollectContextList))
-            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean.writeDbLog(), stepResult.isCompleted(false).msg(String.format("当前未读取到设备[%s]有效的头道模具号,持续监听中...", cellEquipContext.getEquipmentName())),
+            execThreadSleepAndSendTaskCompleteAndThrowEx(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.READ.getValue()).checkRepeatType(),
+                    stepResult.isCompleted(false).msg(String.format("当前未读取到设备[%s]有效的产出零件号,持续监听中...", cellEquipContext.getEquipmentName())),
                     MesPcnEnumUtil.STATION_BUSI_TYPE.GUIDE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT, stepParamMap, MesPcnExtConstWords.READ_FAILURE_SLEEP, MesPcnExtConstWords.READ_FAILURE_SLEEP_DEFAULT_TIME);
 
         //根据设备ID,设备数据变量ID集合 修改设备ID分表采集数据的状态
         equipmentLogExtService.updateEquipmentLogList(reqBean.getOrganizeCode(), cellEquipContext.getEquipId(), equipLogDispatchContext.getResetEquipVariableIdList());
 
+        this.sendMessage(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.READ.getValue()), JSONObject.toJSONString(equipLogDispatchContext), MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT);
+
         //发送工步内容
         String scanInfo = equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON));
         productionCustomContextStepService.doSendStepContextMessage(reqBean, scanInfo, MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReadySignalReadStepService.java

@@ -48,6 +48,11 @@ public class MesReadySignalReadStepService extends BaseStepService {
     private IMesEquipVariableCfgRuleMatchDispatchService equipVariableCfgRuleMatchService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderReadStepService.java

@@ -50,6 +50,11 @@ public class MesWorkOrderReadStepService extends BaseStepService {
     private IMesEquipVariableCfgRuleMatchDispatchService equipVariableCfgRuleMatchService;
 
     @Override
+    public void title(StationRequestBean reqBean) {
+        this.sendMessage(reqBean, new StationResultBean().resultObj(MesPcnExtConstWords.STEP_DISABLE_SCAN), String.format("工步: %s", reqBean.getStepName()), MesPcnEnumUtil.STATION_BUSI_TYPE.STEP_TITLE, MesPcnEnumUtil.STATION_DATA_TYPE.TITLE);
+    }
+
+    @Override
     public StepResult init(StationRequestBean reqBean) {
 
         //发送工步内容

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -167,11 +167,8 @@ public class MesPcnExtConstWords {
     //读写API
     public static final String RW_API_CFG = "RW_API_CFG";
 
-    //写设备日志KEY
+    //工步禁用扫描框标志
-    public static final String WRITE_DB_LOG = "WRITE_DB_LOG";
+    public static final String STEP_DISABLE_SCAN = "STEP_DISABLE_SCAN";
-
-    //写设备日志KEY
-    public static final String WRITE_DB_LOG_EXT_ACTOR = "writeDbLogExtActor";
 
     // 生产过程控制全局密码
     public static final String PRODUCTION_PWD_CFG = "PRODUCTION_PWD_CFG";