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

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java

@@ -79,8 +79,8 @@ public class PcnRepositoryAspect {
                 Method method = ((MethodSignature)joinPoint.getSignature()).getMethod();
                 if (args.length == 4) {
                     if (args[2].getClass().isArray()) {
-                        method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{"modifyDatetime", "systemSyncStatus"},
+                        method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{ "systemSyncStatus"},
-                                new Object[]{TimeTool.getNowTime(true), CommonEnumUtil.FALSE});
+                                new Object[]{CommonEnumUtil.FALSE});
                     } else {
                         method.invoke(joinPoint.getTarget(), args[0], args[1], "systemSyncStatus", CommonEnumUtil.FALSE);
                     }
@@ -104,7 +104,7 @@ public class PcnRepositoryAspect {
                         method.invoke(joinPoint.getTarget(), args[0], new String[]{"systemSyncStatus"},
                                 new Object[]{ CommonEnumUtil.FALSE});
                     } else {
-                        method.invoke(joinPoint.getTarget(), TimeTool.getNowTime(true), args[2]);
+                       // method.invoke(joinPoint.getTarget(), TimeTool.getNowTime(true), args[2]);
                         method.invoke(joinPoint.getTarget(), "systemSyncStatus", CommonEnumUtil.FALSE, args[2]);
                     }
                 }
@@ -116,6 +116,6 @@ public class PcnRepositoryAspect {
 
     private void updateBeanSync(BaseBean bean) {
         bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
-        bean.setModifyDatetime(TimeTool.getNowTime(true));
+        //bean.setModifyDatetime(TimeTool.getNowTime(true));
     }
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -239,6 +239,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
             ConvertBean.serviceModelUpdate(oldMesWorkOrder,userName);
+            oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
             workOrderExtService.update(oldMesWorkOrder);
             //保存数据
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();
@@ -343,6 +344,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         //修改工单，需要重新同步
         mesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         ConvertBean.serviceModelUpdate(mesWorkOrder, userName);
+        mesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
         workOrderExtService.update(mesWorkOrder);
         //保存记录
         saveMesWorkOrderLog(mesWorkOrder);
@@ -600,6 +602,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         LOGGER.info("工单报工后数量【{}】",  oldMesWorkOrder.getReportedQty());
         ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName);
+        oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
         workOrderExtService.update(oldMesWorkOrder);
 
         //保存数据
@@ -715,10 +718,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         }
         // 如果找不到则再根据计划开始时间找
         if (CollectionUtils.isEmpty(list)) {
-            String beginTime =productionRecord.getLotNo() + " " + currentShift.getStartTime();
-            Date beginDate = transfer(beginTime);
             list = oldMesWorkOrders.stream().filter(workOrder ->!StringUtils.isEmpty(workOrder.getPlanStartTime()) && !StringUtils.isEmpty(workOrder.getPlanEndTime()) &&
-                    beginDate.getTime() >= transfer(workOrder.getPlanStartTime()).getTime()   &&  beginDate.getTime() <= transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
+                    transfer(productionRecord.getCompleteDateTime()).getTime() >= transfer(workOrder.getPlanStartTime()).getTime()   &&  transfer(productionRecord.getCompleteDateTime()).getTime() <= transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
 
         }
         workOrders = list;
@@ -742,7 +743,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 String startTime = date + " " +currentShift.getEndTime();
 
                 workOrders = oldMesWorkOrders.stream().filter(workOrder -> !StringUtils.isEmpty(workOrder.getPlanStartTime()) && !StringUtils.isEmpty(workOrder.getPlanEndTime()) &&
-                        transfer(startTime).getTime() > transfer(workOrder.getPlanStartTime()).getTime() && transfer(endTime).getTime() < transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
+                        transfer(startTime).getTime() >= transfer(workOrder.getPlanStartTime()).getTime() && transfer(endTime).getTime() <= transfer(workOrder.getPlanEndTime()).getTime()).collect(Collectors.toList());
 
             } else {
                 // 早班或者中班 则找当天非当前班次的最早单号

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);
+        reqBean.setForceJumpProcess(true);
-
+        shippingDispatchService.doSendScanQueueNextExec(reqBean);
-        shippingDispatchService.doSendScanQueueIfNoQueue(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/MesAssemblyShowNosortStepService.java

@@ -215,8 +215,8 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
             List<MesProductionPartContext> productionPartContexts = entry.getValue();
             MesWorkOrder mesWorkOrder = orderListMap.get(workOrder).get(0);
 
-            double complateQty = mesWorkOrder.getCompleteQty() + productionPartContexts.size();
+            Double complateQty = mesWorkOrder.getCompleteQty() + productionPartContexts.size();
-            double qty = mesWorkOrder.getQty();
+            Double qty = mesWorkOrder.getQty();
             log.info("验证超工单,工单号【{}】,qty=【{}】,complateQty =【{}】begin ->", mesWorkOrder.getWorkOrderNo(), qty, complateQty);
             // 如果预完成数量 小于等于工单数量，则直接过
             if (complateQty <= qty) continue;
@@ -226,14 +226,14 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
             if (!Objects.equals(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), workCenter.getIsCheckOrderQty())) {
                 productionPartContextList.forEach(o -> o.busiCheckToDelete());
                 if (!CollectionUtils.isEmpty(productionPsInContextList)) productionPsInContextList.forEach(o -> o.busiCheckToDelete());
-                return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult.obj(false), String.format("请检查工单数量,工单号[%s],工单数量[%s]预完成数量[%s],且未配置超工单!", workOrder, mesWorkOrder.getQty(), complateQty));
+                return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult.obj(false), String.format("请检查工单数量,工单号[%s],工单数量[%s]预完成数量[%s],且未配置超工单!", workOrder, mesWorkOrder.getQty().intValue(), complateQty.intValue()));
             }
             // 如果配置了超工单，且比例已经超过了配置的超工单比例，也需要阻断
-            double rate = (complateQty - qty)/qty;
+            Double rate = (complateQty - qty)/qty;
             if (rate > workCenter.getOrderRate()/100) {
                 productionPartContextList.forEach(o -> o.busiCheckToDelete());
                 if (!CollectionUtils.isEmpty(productionPsInContextList)) productionPsInContextList.forEach(o -> o.busiCheckToDelete());
-                return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult.obj(false), String.format("请检查工单数量,工单号[%s],工单数量[%s]预完成数量[%s],配置了超工单,但超过了比例[%s]!", workOrder, mesWorkOrder.getQty(), complateQty, workCenter.getOrderRate()));
+                return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult.obj(false), String.format("请检查工单数量,工单号[%s],工单数量[%s]预完成数量[%s],配置了超工单,但超过了比例[%s]!", workOrder, mesWorkOrder.getQty().intValue(), complateQty.intValue(), workCenter.getOrderRate()));
             }
             log.info("验证超工单,工单号【{}】,qty=【{}】,complateQty =【{}】,isCheckOrderQty=【{}】, rate = 【{}】end ->", mesWorkOrder.getWorkOrderNo(), qty, complateQty,workCenter.getIsCheckOrderQty(),rate);
         }
@@ -268,7 +268,7 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
                 else productionPsInContextList.forEach(o -> o.busiCheckToDelete());
                 return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, String.format("设备[%s]与进料零件条码%s加工规则配置信息! 进料零件条码[%s]%s",
                         cellEquipContext.getEquipmentName(), CollectionUtils.isEmpty(filterList) ? "未匹配到" : String.format("匹配到[%s]条", filterList.size()), productionPsInContext.getProductSn(),
-                        StringUtils.isEmpty(productionPsInContext.getPartNo()) ? "为外协件" : String.format("上道工序[%s]工艺[%s]对应零件:%s", productionPsInContext.getProcessCode(), productionPsInContext.getCraftCode(), productionPsInContext.getPartNo())));
+                        StringUtils.isEmpty(productionPsInContext.getPartNo()) ? "为外协件" : String.format("当前零件号[%s]", productionPsInContext.getPartNo())));
             }
 
             //时效性验证
@@ -403,7 +403,7 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
             if (optional.get().getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue()) == 0) optional.get().busiCheckToDelete();
             else productionPsInContextList.forEach(o -> o.busiCheckToDelete());
             String productSnStr = productionPsInContextList.stream().filter(o -> (null != o && StringUtils.isEmpty(o.getForeignKey()) && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0))
-                    .map(o -> String.format(" 进料零件条码[%s]%s", o.getProductSn(), StringUtils.isEmpty(o.getPartNo()) ? "为外协件" : String.format("上道工序[%s]工艺[%s]对应零件:%s", o.getProcessCode(), o.getCraftCode(), o.getPartNo()))).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON));
+                    .map(o -> String.format(" 进料零件条码[%s]%s", o.getProductSn(), StringUtils.isEmpty(o.getPartNo()) ? "为外协件" : String.format("当前零件号[%s]", o.getPartNo()))).collect(Collectors.joining(MesPcnExtConstWords.SEMICOLON));
             return execNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(productSnStr), stepResult, String.format("设备[%s]产出零件%s与进料零件条码未匹配到唯一的加工规则配置信息!%s", cellEquipContext.getEquipmentName(),
                     productionPartContextList.stream().filter(o -> (null != o && StringUtils.isEmpty(o.getForeignKey()) && o.getIsFinishCode().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0)).map(MesProductionPartContext::getPartNo).collect(Collectors.toList()).toString(),
                     productSnStr));

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesCellEquipContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesEquipLogDispatchContext;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.context.MesProductionProcessContext;
 import cn.estsh.i3plus.mes.pcn.serviceimpl.fsm.BaseStepService;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariable;
 import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentVariableCfg;
@@ -58,7 +59,7 @@ public class MesEquipByPassReadStepService extends BaseStepService {
         //当前工位使用的设备
         MesCellEquipContext cellEquipContext = productionProcessContext.getCurCellEquip();
 
-        if (null == cellEquipContext || StringUtils.isEmpty(cellEquipContext.getCtrlByPass())) return stepResult.isCompleted(false);
+        if (null == cellEquipContext || StringUtils.isEmpty(cellEquipContext.getCtrlByPass()) || cellEquipContext.getCtrlByPass().compareTo(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) == 0) return stepResult.isCompleted(false);
 
         //获取生产过程上下文对象有异常信息
         if (!productionProcessContextStepService.getEquipmentVariableCfgList(productionProcessContext).getSuccess()) return stepResult.isCompleted(false).msg(productionProcessContext.getMessage());

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.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**

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

@@ -20,6 +20,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -155,6 +156,7 @@ public class MesReportNoSortStepService extends BaseStepService {
                 oldMesWorkOrder.setWorkOrderStatus(MesExtEnumUtil.ORDER_STATUS.PROCESS.getValue());
             }
             ConvertBean.serviceModelUpdate(oldMesWorkOrder,userName);
+            oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
             workOrderRepository.update(oldMesWorkOrder);
             //保存数据
             List<MesProductOffLine> mesProductOffLineList = new ArrayList<>();

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

@@ -27,10 +27,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import javax.persistence.EntityManager;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
-import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -193,6 +191,7 @@ public class MesWorkOrderSaveStepService extends BaseStepService {
             //如果数量都没有修改,不操作数据库
             if (!propertyNameList.isEmpty()) {
                 ConvertBean.serviceModelUpdate(workOrder, reqBean.getUserInfo());
+                workOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
                 workOrderExtService.update(workOrder);
                /* propertyNameList.add("modifyUser");
                 propertyValueList.add(reqBean.getUserInfo());

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