Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesSortShippingCheckService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesSortShippingCheckModel;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@@ -150,11 +151,17 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                     //根据是否启动记忆判断 若启用记忆，则根据保存数据库
                     if (orderManagement.getIsEnableMemory() == MesCommonConstant.TRUE_INTEGER) {
 
-                        orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+                        //若发运单状态为创建或发布 则写入开始扫描时间
+                        if (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() ||
+                                orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+                            orderManagement.setStartScanTime(TimeTool.getNowTime(true));
+                        }
+
+                        orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getValue());
                         ConvertBean.serviceModelUpdate(orderManagement, AuthUtil.getSessionUser().getUserName());
                         shippingOrderManagementRepository.save(orderManagement);
 
-                        detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
+                        detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.PUBLISHED.getValue());
                         ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
                         shippingOrderManagementDetailRepository.save(detail);
 
@@ -277,9 +284,15 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
     public void saveDate(MesShippingOrderManagement orderManagement, MesSortShippingCheckModel model, String org) {
 
+        //若发运单状态为创建或发布 则写入开始扫描时间
+        if (orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.CREATE.getValue() ||
+                orderManagement.getStatus() == MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getValue()) {
+            orderManagement.setStartScanTime(TimeTool.getNowTime(true));
+        }
 
         //发运单状态修改为校验完成
         orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
+        orderManagement.setEndScanTime(TimeTool.getNowTime(true));
 
         //发运单明细状态修改为校验完成
         DdlPackBean orderManagementDetailPackBean = DdlPackBean.getDdlPackBean(org);
@@ -288,6 +301,8 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
 
         List<MesProduceSn> produceSnList = new ArrayList<>();
         for (MesShippingOrderManagementDetail detail : orderManagementDetailList) {
+
+            detail.setActualQty(1);
             detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
             ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
 
@@ -298,8 +313,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
 
             produceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.SHIPPED.getValue());
-            detail.setActualQty(1);
+            ConvertBean.serviceModelUpdate(produceSn, AuthUtil.getSessionUser().getUserName());
-            ConvertBean.serviceModelUpdate(detail, AuthUtil.getSessionUser().getUserName());
             produceSnList.add(produceSn);
 
         }

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

@@ -47,7 +47,7 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
         DdlPreparedPack.getNumEqualPack(equipId, MesPcnExtConstWords.EQUIP_ID, packBean);
         if (!CollectionUtils.isEmpty(clientHandleList) && clientHandleList.size() == 1) DdlPreparedPack.getNumEqualPack(clientHandleList.get(0), MesPcnExtConstWords.ID, packBean);
         else DdlPreparedPack.getInPackList(clientHandleList, MesPcnExtConstWords.ID, packBean);
-        if (!StringUtils.isEmpty(needNewValue) && MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getValue() == needNewValue) DdlPreparedPack.getNumEqualPack(MesPcnExtConstWords.ZERO, MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, packBean);
+        if (!StringUtils.isEmpty(needNewValue) && MesExtEnumUtil.EQUIP_VARIABLE_NEED_NEW_VALUE.TRUE.getValue() == needNewValue) DdlPreparedPack.getNegativeNumEqualPack(MesPcnExtConstWords.ZERO, MesPcnExtConstWords.EQUIP_VARIABLE_STATUS, packBean);
         return equipmentLogRepository.findByHqlWhere(packBean);
     }
 
@@ -139,7 +139,7 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
             if (CollectionUtils.isEmpty(clientHandleList)) clientHandleList = new ArrayList<>();
             clientHandleList.addAll(equipVariableCfgCollectContext.getClientHandleList());
         }
-        return CollectionUtils.isEmpty(clientHandleList) ? null : clientHandleList.stream().filter(o -> StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
+        return CollectionUtils.isEmpty(clientHandleList) ? null : clientHandleList.stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
     }
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/rulematch/MesEvcRuleMatchCompareValueService.java

@@ -15,7 +15,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
- * 取一组全部匹配的结构
+ * 取一组全部匹配的结果
  */
 @Slf4j
 @Service

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

@@ -178,7 +178,7 @@ public class MesFirstMouldNoReadStepService extends BaseStepService {
         //零件信息缺失 抛出异常
         List<String> filterList = CollectionUtils.isEmpty(finalPartDataMap) ? null : partNoList.stream().filter(o -> (null != o && !finalPartDataMap.containsKey(o))).collect(Collectors.toList());
 
-        if (CollectionUtils.isEmpty(partDataMap) || !CollectionUtils.isEmpty(filterList)) execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("请检查零件信息,零件编码%s信息不存在!", CollectionUtils.isEmpty(finalPartDataMap) ? partNoList.toString() : filterList.toString()));
+        if (CollectionUtils.isEmpty(finalPartDataMap) || !CollectionUtils.isEmpty(filterList)) execExpSendMsgAndThrowEx(reqBean, resultBean, String.format("请检查零件信息,零件编码%s信息不存在!", CollectionUtils.isEmpty(finalPartDataMap) ? partNoList.toString() : filterList.toString()));
 
         return finalPartDataMap;
 

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

@@ -213,7 +213,7 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
     @Override
     public List<String> collectCategoryLevelTwoList(List<MesEquipmentVariableCfg> equipmentVariableCfgList) {
         return CollectionUtils.isEmpty(equipmentVariableCfgList) ? null :
-                (equipmentVariableCfgList.stream().filter(o -> null != o).map(MesEquipmentVariableCfg::getCategoryLevelTwo).collect(Collectors.toList())).stream().filter(o -> StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
+                (equipmentVariableCfgList.stream().filter(o -> null != o).map(MesEquipmentVariableCfg::getCategoryLevelTwo).collect(Collectors.toList())).stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
     }
 
     @Override
@@ -315,7 +315,7 @@ public class MesProductionProcessContextStepService extends BaseStepService impl
 
         List<StationKvBean> lastScanContext = getCachedLastScanContext(reqBean);
 
-        StationKvBeanUtil.addStationKvBeanLimix100ThenHalf(lastScanContext, new StationKvBean().name(source.getDescription()).value(scanInfo));
+        lastScanContext = StationKvBeanUtil.addStationKvBeanLimix100ThenHalf(lastScanContext, new StationKvBean().name(source.getDescription()).value(scanInfo));
 
         doCacheLastScanContext(reqBean, lastScanContext);
 

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionProcessContext.java

@@ -271,13 +271,13 @@ public class MesProductionProcessContext {
 
     //上下文赋值加工结果
     public MesProductionProcessContext productResult(String productResult) {
-        this.equipVariableJson = productResult;
+        this.productResult = productResult;
         return this;
     }
 
     //上下文清除加工结果
     public MesProductionProcessContext productResultClear() {
-        this.equipVariableJson = null;
+        this.productResult = null;
         return this;
     }