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

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesEquipmentLogExtService.java

@@ -29,6 +29,6 @@ public interface IMesEquipmentLogExtService {
     Boolean checkEquipQuality(Integer quality);
 
     @ApiOperation(value = "根据设备ID 查询设备ID分表所有采集数据")
-    MesEquipmentLog queryMesEquipmentLog( Integer equipId, Long equipVariableId);
+    MesEquipmentLog queryMesEquipmentLog(String organizeCode, Integer equipId, Long equipVariableId);
 
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesEquipmentLogService.java

@@ -157,11 +157,13 @@ public class MesEquipmentLogService implements IMesEquipmentLogService {
     public void updateValue(EquipLogMqttMsg equipLogMqttMsg) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(equipLogMqttMsg.getTagAddress(), "tagAddress", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(Integer.valueOf(equipLogMqttMsg.getPTCode()), "equipId", ddlPackBean);
+
         MesEquipmentVariable mesEquipmentVariable = equipmentVariableRepository.getByProperty(ddlPackBean);
         if (mesEquipmentVariable == null) {
             LOGGER.info("tagAddress 不存在【{}】", equipLogMqttMsg.getTagAddress());
         }
-        MesEquipmentLog equipmentLog = mesEquipmentLogExtService.queryMesEquipmentLog(Integer.valueOf(equipLogMqttMsg.getPTCode()), mesEquipmentVariable.getId());
+        MesEquipmentLog equipmentLog = mesEquipmentLogExtService.queryMesEquipmentLog(mesEquipmentVariable.getOrganizeCode(), Integer.valueOf(equipLogMqttMsg.getPTCode()), mesEquipmentVariable.getId());
         ConvertBean.serviceModelUpdate(equipmentLog, "mqtt");
         mesEquipmentLogRepository.update(equipmentLog);
 

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

@@ -171,9 +171,11 @@ public class MesEquipmentLogExtService implements IMesEquipmentLogExtService {
     }
 
     @Override
-    public MesEquipmentLog queryMesEquipmentLog(Integer equipId, Long equipVariableId) {
+    public MesEquipmentLog queryMesEquipmentLog(String organizeCode, Integer equipId, Long equipVariableId) {
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(equipId, "equipId", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(equipVariableId, "equipVariableId", ddlPackBean);
 

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

@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
- * @Description : 加工异常处理工步  注释调整
+ * @Description : 加工异常处理工步
  * @Author : zxw
  **/
 @Slf4j
@@ -61,8 +61,6 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
     @Autowired
     private IMesProductionDispatchContextStepService mesProductionDispatchContextStepService;
 
-    public static final String ORDER_NO_JIS_SORT = "ORDER_NO_JIS_SORT";
-
     private static final Map<String, ActorRef> refMap = new ConcurrentHashMap<>(200);
 
     @Override
@@ -73,10 +71,17 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
 
         // 获取加工结果
         String result = mesProductionDispatchContextStepService.getProductResultContext(reqBean);
+
         // 如果是报废或者可疑，需要编辑条码状态为不合格、并且nc判定需要新增一条记录
-        if (StringUtils.isEmpty(result) || Objects.equal(MesExtEnumUtil.EQUIP_VARIABLE_CFG_CATEGORY.PRODUCT_OK.getCode() + "", result)) {
+        Integer resultInt;
-            return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(), stepResult, "加工结果合格,无需记录异常");
+        try {
+            resultInt = StringUtils.isEmpty(result) ? MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue() : Integer.valueOf(result);
+        } catch (Exception e) {
+            resultInt = MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue();
         }
+
+        if (resultInt.compareTo(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue()) == 0) return stepResult;
+
         // 获取条码列表
         List<MesProductionPsOutContext> mesProduceSns = mesProductionDispatchContextStepService.getProductionPsOutContext(reqBean);
 
@@ -85,10 +90,7 @@ public class MesProductResultErrorHandleStepService extends BaseStepService {
         // 保存加工异常记录(NC判断记录)
         saveProductResultException(reqBean, mesProduceSns,productionPartContexts, result);
 
-
+        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()), stepResult, String.format("加工[%s] NC信息保存成功!", MesExtEnumUtil.PRODUCE_QC_STATUS.valueOfDescription(resultInt)));
-        return execSuccessCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog(MesPcnEnumUtil.WORK_CELL_SCAN_MONITOR_LOG_TYPE.PROCESS.getValue()), stepResult, "加工异常处理成功");
-
-
    }
 
     /**