Merge branch 'uat-temp-wj-2412240000-44246' into dev

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

@@ -55,7 +55,7 @@ public class MesCountDownShowStepService extends BaseStepService {
         MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getProductionProcessContext(reqBean, false);
 
         //获取生产过程上下文对象有异常信息 抛出异常
-        if (!productionProcessContext.getSuccess()) return stepResult.msg(productionProcessContext.getMessage());
+        if (!productionProcessContext.getSuccess()) stepExpSendMsgAndThrowEx(reqBean, resultBean.writeDbLog(), productionProcessContext.getMessage());
 
         //获取工位信息
         MesWorkCell workCell = productionProcessContext.getWorkCell();
@@ -74,7 +74,8 @@ public class MesCountDownShowStepService extends BaseStepService {
         //解析工位参数
         String countDownTime = doCalcCountDownCfg(reqBean, isOpenTimeLock, productionProcessContext.getWorkCell());
 
-        return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()), stepResult, String.format("[%sS]倒计时启动!", countDownTime));
+        return stepDynamicsCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()),
+                stepResult, true, MesPcnEnumUtil.STATION_BUSI_TYPE.RUNNING_INFO, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT, String.format("[%sS]倒计时启动!", countDownTime));
 
     }
 

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

@@ -131,7 +131,7 @@ public class MesWorkOrderCheckNosortStepService extends MesWorkOrderCheckStepSer
         }
 
         //保存扫描的工单信息上下文
-        if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue() == equipVariableCollectContextList.get(0).getMessageSource()) {
+        if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue() != equipVariableCollectContextList.get(0).getMessageSource()) {
             productionProcessContextStepService.dispatchFunctionChooseCavityOrderContext(reqBean, StationKvBeanUtil.addStationKvBeanList(new ArrayList<>(),
                     new StationKvBean(MesPcnExtConstWords.CAVITY, "腔数", String.valueOf(productionPartContextList.size())),
                     new StationKvBean(MesPcnExtConstWords.CELL_MESSAGE_SOURCE, "工位信息来源", MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValueStr()),
@@ -139,6 +139,8 @@ public class MesWorkOrderCheckNosortStepService extends MesWorkOrderCheckStepSer
                     new StationKvBean(MesPcnExtConstWords.WORK_ORDER_NO, "加工单", productionPartContextList.stream().filter(o -> null != o).map(MesProductionPartContext::getWorkOrderNo).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON)))));
         }
 
+        if (MesExtEnumUtil.CELL_MESSAGE_SOURCE.READ.getValue() == equipVariableCollectContextList.get(0).getMessageSource()) resultBean.setSendBackgroundColor(MesExtEnumUtil.COLOR.UNRESET.getValue());
+
         String workOrderStr = equipVariableCollectContextList.stream().filter(o -> null != o).map(MesEquipVariableCollectContext::getEquipVariableValue).collect(Collectors.toList()).toString();
         return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(workOrderStr), stepResult, String.format("当前%s加工单%s验证工单状态成功%s!",
                 MesExtEnumUtil.CELL_MESSAGE_SOURCE.valueOfDescription(equipVariableCollectContextList.get(0).getMessageSource()), workOrderStr,

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

@@ -168,7 +168,7 @@ public class MesWorkOrderSaveNosortStepService extends BaseStepService {
 
             if (CollectionUtils.isEmpty(propertyMap)) continue;
 
-            propertyMap.put(MesPcnExtConstWords.MODIFY_DATE_TIME, (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
+            propertyMap.put(MesPcnExtConstWords.MODIFY_DATE_TIME, (new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SSS)).format(new Date()));
             propertyMap.put(MesPcnExtConstWords.MODIFY_USER, reqBean.getUserInfo());
 
             String[] propertyName = new String[propertyMap.size()];

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

@@ -86,6 +86,8 @@ public class MesWorkOrderScanStepService extends BaseStepService {
         //保存上下文扫/读信息:加工单
         productionDispatchContextStepService.dispatchScanWorkOrderNoContext(reqBean, equipVariableCollectContextList);
 
+        if (StringUtils.isEmpty(stepResult.getMsg())) return stepResult;
+
         return stepSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.SCAN.getValue()).scanInfo(scanInfo), stepResult, stepResult.getMsg());
 
     }
@@ -129,8 +131,6 @@ public class MesWorkOrderScanStepService extends BaseStepService {
         String scanInfo = chooseCavityOrder.stream().filter(o -> (null != o && !o.getKey().equals(MesPcnExtConstWords.CELL_MESSAGE_SOURCE))).map(o -> o.getName() + MesPcnExtConstWords.SQUARE_BRACKETS_L + o.getValue() + MesPcnExtConstWords.SQUARE_BRACKETS_R).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON));
         productionCustomContextStepService.sendStepContextMessage(reqBean, scanInfo, MesExtEnumUtil.CELL_MESSAGE_SOURCE.getByValue(Integer.valueOf(cellMessageSorce)));
 
-        stepResult.msg(String.format("当前%s%s!", MesExtEnumUtil.CELL_MESSAGE_SOURCE.valueOfDescription(Integer.valueOf(cellMessageSorce)), scanInfo));
-
         return equipVariableCollectContextList;
 
     }