Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/equiplog/MesWorkCellScanMonitorLogExt2Service.java

@@ -61,6 +61,7 @@ public class MesWorkCellScanMonitorLogExt2Service implements ISwsWriteDbLogServi
         workCellScanMonitorLog.setOrgWorkCode(new StringJoiner(MesPcnExtConstWords.E_UNDERLINE).add(workCellScanMonitorLog.getOrganizeCode()).add(workCellScanMonitorLog.getWorkCenterCode()).toString());
 
         ConvertBean.serviceModelInitialize(workCellScanMonitorLog, resultBean.getUserInfo());
+        workCellScanMonitorLog.setCreateDatetime(resultBean.getCreateDatetime());
 
         //存在开模ID的记录延迟同步
         if (!StringUtils.isEmpty(workCellScanMonitorLog.getMouldRecordId())) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionChooseCavityOrderService.java

@@ -74,9 +74,8 @@ public class MesFunctionChooseCavityOrderService extends BaseSwsService implemen
         reqBean.setClientInfo(shippingDispatchService.getActorClientInfo(reqBean));
         reqBean.setInterfaceType(MesPcnConstWords.SHIPPING);
         reqBean.setBusiType(MesPcnEnumUtil.ACTOR_RECEIVE_STRATEGY.WS_CMD_DO_SCAN.getCode());
-        reqBean.setTriggerAutoFsm(true);
-
-        shippingDispatchService.doSendScanQueueIfNoQueue(reqBean);
+        reqBean.setForceJumpProcess(true);
+        shippingDispatchService.doSendScanQueueNextExec(reqBean);
 
         return true;
 

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

@@ -137,6 +137,9 @@ public class MesAssemblyScanStepService extends BaseStepService {
 
     //处理装配件的装配爆炸图和音频文件
     private void doHandleAssemblyFile(StationRequestBean reqBean, MesWorkCenter workCenter, List<MesProdRuleContext> prodRuleContextList) {
+
+        if (CollectionUtils.isEmpty(prodRuleContextList)) return;
+
         Boolean isSendFile = false;
         Boolean isBreakLoop = false;
         LOOP:

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

@@ -29,10 +29,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**

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

@@ -65,7 +65,7 @@ public class MesProductionProcessMonitorService extends BaseProcessMonitorServic
         return true;
     }
 
-    //客户端下线
+    //客户端上线
     @Override
     public Boolean doOnLine(StationRequestBean requestBean) {
         //删除当前工步集

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

@@ -177,6 +177,7 @@ public class MesPcnExtConstWords {
     public static final String COLOR = "color";
 
     // 时间格式
+    public static final String DATE_FORMAT_SSS = "yyyy-MM-dd HH:mm:ss.SSS";
     public static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
     public static final String DATE_FORMAT_SEPARATOR = "yyyy-MM-dd";
     public static final String DATE_FORMAT_SHORT = "yyMMdd";