From 7100fb58013f9b6fc7c3bae3b3880ac48cd1cbad Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Fri, 16 Jul 2021 08:57:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 meapi/src/main/resources/mapper/OperationMapper.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/meapi/src/main/resources/mapper/OperationMapper.xml b/meapi/src/main/resources/mapper/OperationMapper.xml
index 5b8c146d..8d1b299e 100644
--- a/meapi/src/main/resources/mapper/OperationMapper.xml
+++ b/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">

From 92516d081cdf08673dc369981b99ebcee517e2be Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Fri, 16 Jul 2021 09:13:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreverwin/mesnac/equip/consumer/ResourceMQConsume.java   | 4 ++--
 .../equip/service/impl/ResourceRepairTaskServiceImpl.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java b/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
index 1f23cb1a..33444777 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/consumer/ResourceMQConsume.java
+++ b/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")
diff --git a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java b/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
index db82dade..95d6afa3 100644
--- a/equip/src/main/java/com/foreverwin/mesnac/equip/service/impl/ResourceRepairTaskServiceImpl.java
+++ b/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));

From 37b269543320db484b7103fa09c1358185cb6a70 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Fri, 16 Jul 2021 09:23:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E9=AA=8C=E5=8F=AF=E4=B8=8D=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/common/service/impl/InspectionItemServiceImpl.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
index 0174f0f4..52f842de 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
+++ b/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));