Merge branch 'master' of https://gitee.com/forever_win/mesnac.biz

common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java

@@ -102,6 +102,9 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
     public void saveAll(InspectionItem inspectionItem) {
         String site = CommonMethods.getSite();
         boolean b = false;
+        if(StringUtil.isEmpty(inspectionItem.getInspectionItemNo())&&inspectionItem.getInspectionItemAdditionList()==null){
+            throw new BaseException("检验项目编号不能为空");
+        }
         if (StringUtil.isEmpty(inspectionItem.getInspectionItemNo())) {
             b = true;
             inspectionItem.setInspectionItemNo(inspectItemNoGenerationRules(inspectionItem));

equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java

@@ -39,14 +39,14 @@ public class ResourceMQConsume {
 
         String resultString = resourceMQProcess.resourceStatusProcess(text);
         //返回设备处理结果
-        template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
+//        template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
     }
 
     @JmsListener(destination = "resource.alarm.process", containerFactory = "defaultFactory")
     public void resourceAlarmProcess(String text, MessageHeaders headers) {
         logger.info("接收设备报警数据：" + text);
         String resultString = resourceMQProcess.resourceFaultProcess(text);
-        template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
+//        template.convertAndSend((Queue) headers.get("jms_replyTo"), resultString);
     }
 
     @JmsListener(destination = "resource.edc.process", containerFactory = "defaultFactory", concurrency = "5")

equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java

@@ -81,11 +81,11 @@ public class ResourceRepairTaskServiceImpl extends ServiceImpl<ResourceRepairTas
             throw BusinessException.build("设备编号错误！！！");
         }
         // 不良代码
-        String ncCOdeNo = resourceRepairTask.getNcCodeNo();
+        /*String ncCOdeNo = resourceRepairTask.getNcCodeNo();
         String ncCodeHandle = HandleEnum.NC_CODE.getHandle(site, ncCOdeNo);
         if ( ncCodeService.getById(ncCodeHandle) == null ){
             throw BusinessException.build("不良代码错误！！！");
-        }
+        }*/
         // 维修单号、维修HANDLE
         List<String> nextNumber = nextNumberHelper.getNextNumber(site, Constants.RESOURCE_REPAIR_TASK, 1);
         resourceRepairTask.setRepairNo(nextNumber.get(0));

meapi/src/main/resources/mapper/OperationMapper.xml

@@ -608,12 +608,13 @@
 
     <select id="getCurrentRevisionRef" resultMap="BaseResultMap">
         SELECT
-            HANDLE,OPERATION,
-            REVISION
-        FROM OPERATION
-        WHERE SITE = #{site}
-              AND OPERATION = #{operation}
-              AND CURRENT_REVISION = 'true'
+            O.HANDLE,O.OPERATION,
+            O.REVISION,OT.DESCRIPTION
+        FROM OPERATION O
+        LEFT JOIN OPERATION_T OT ON O.HANDLE = OT.OPERATION_BO AND OT.LOCALE = 'zh'
+        WHERE O.SITE = #{site}
+              AND O.OPERATION = #{operation}
+              AND O.CURRENT_REVISION = 'true'
     </select>
 
     <select id="queryOperationByErpWorkCenter" resultMap="BaseResultMap">