From f889f839aa7801195390cb9a06a06dcba7c68273 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 19 Apr 2024 14:22:07 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=B4=A8=E9=87=8F=E8=BF=94?=
 =?UTF-8?q?=E4=BF=AE=E6=9F=A5=E8=AF=A2=EF=BC=9A=E8=B4=A8=E6=A3=80=E7=8F=AD?=
 =?UTF-8?q?=E9=95=BF=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E8=BF=94=E4=BF=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/PdaApiController.java      |  2 +-
 .../aucma/api/mapper/PdaBindingMapper.java    |  7 ++++++
 .../api/service/impl/PdaServiceImpl.java      | 22 +++++++++++++++++++
 .../resources/mapper/PdaBindingMapper.xml     | 19 +++++++++++++---
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java
index 74fba0c..a8ced02 100644
--- a/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java
+++ b/aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java
@@ -169,7 +169,7 @@ public class PdaApiController {
     public AjaxResult findCheckInfoByCode(String code) {
         List<ReportQualityInspection> list = service.findCheckInfoByCode(code);
         if (list == null || list.isEmpty()) {
-            return error("扫描条码不正确");
+            return error("扫描条码不正确或无返修信息");
         }
         return success(list);
     }
diff --git a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
index ec75169..db30a43 100644
--- a/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
+++ b/aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java
@@ -54,4 +54,11 @@ public interface PdaBindingMapper {
      */
     @DataSource(value = DataSourceType.SLAVE)
     int printSupplementBarcode(HashMap<String, String> hashMap);
+
+    /**
+     * 质量返修查询：质检班长获取所有返修信息
+     * @param code
+     * @return
+     */
+    List<ReportQualityInspection> findCheckInfoByCodeUserId(String code);
 }
diff --git a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
index fea5f0b..49d1bbc 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java
@@ -3,8 +3,10 @@ package com.aucma.api.service.impl;
 import com.aucma.api.domain.dto.RepairSubmitInfoDto;
 import com.aucma.api.mapper.PdaBindingMapper;
 import com.aucma.api.service.IPdaBindingService;
+import com.aucma.common.utils.SecurityUtils;
 import com.aucma.common.utils.StringUtils;
 import com.aucma.report.domain.ReportQualityInspection;
+import com.aucma.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +22,9 @@ public class PdaServiceImpl implements IPdaBindingService {
     @Autowired
     private PdaBindingMapper mapper;
 
+    @Autowired
+    private ISysPostService postService;
+
     @Override
     public String selectBoxNameByCode(String boxCode) {
 
@@ -41,6 +46,11 @@ public class PdaServiceImpl implements IPdaBindingService {
         return mapper.updateCodeBinding(boxCode,innerCode);
     }
 
+    /**
+     * 质量返修 提交
+     * @param info
+     * @return
+     */
     @Override
     public int submitRepair(RepairSubmitInfoDto info) {
         return mapper.submitRepair(info);
@@ -48,6 +58,18 @@ public class PdaServiceImpl implements IPdaBindingService {
 
     @Override
     public List<ReportQualityInspection> findCheckInfoByCode(String code) {
+        try {
+            Long userId = SecurityUtils.getUserId();
+            if (StringUtils.isNotNull(userId)){
+                List<Long> postList = postService.selectPostListByUserId(userId);
+                if (postList.contains(9L)){
+                    //质量返修查询：巡检班长获取所有返修信息
+                    return mapper.findCheckInfoByCodeUserId(code);
+                }
+            }
+        } catch (Exception e) {
+            System.out.println("findCheckInfoByCode异常：" + e);
+        }
         return mapper.findCheckInfoByCode(code);
     }
 
diff --git a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
index d57884b..cb72597 100644
--- a/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
+++ b/aucma-api/src/main/resources/mapper/PdaBindingMapper.xml
@@ -32,10 +32,11 @@
             IS_FLAG        = #{info.isFlag},
             UPDATED_BY     = #{info.loginName},
             UPDATED_TIME   = sysdate
-        WHERE OBJ_ID in
+        WHERE PROCESS_RESULT IS NULL AND OBJ_ID IN
         <foreach item="objId" collection="info.list" open="(" separator="," close=")">
             #{objId}
         </foreach>
+
     </update>
 
     <select id="findCheckInfoByCode" resultMap="com.aucma.report.mapper.ReportQualityInspectionMapper.ReportQualityInspectionResult">
@@ -45,8 +46,10 @@
                QUALITY_DEFECT_NAME
         from REPORT_QUALITY_INSPECTION
         where BAR_CODE = #{code}
-          and IS_FLAG is null
+          AND TREATMENT_MEASURE = '1'
+          AND PROCESS_RESULT IS NULL
     </select>
+
     <select id="checkSelectRepairInfo" resultMap="com.aucma.report.mapper.ReportQualityInspectionMapper.ReportQualityInspectionResult">
         select rqi.OBJ_ID,
                MATERIAL_NAME,
@@ -58,7 +61,7 @@
         from REPORT_QUALITY_INSPECTION rqi
                  left join BASE_PRODUCTLINE br on rqi.STATION_CODE=br.PRODUCT_LINE_CODE
         where BAR_CODE =#{code}
-          and   TREATMENT_MEASURE=1
+          and TREATMENT_MEASURE=1
     </select>
 
     <select id="selectPrintBarcode" resultType="java.util.HashMap">
@@ -77,6 +80,16 @@
                  OI.PRINT_NAME
     </select>
 
+    <select id="findCheckInfoByCodeUserId" resultType="com.aucma.report.domain.ReportQualityInspection">
+        select OBJ_ID,
+               MATERIAL_NAME,
+               QUALITY_DEFECT_CODE,
+               QUALITY_DEFECT_NAME
+        from REPORT_QUALITY_INSPECTION
+        where BAR_CODE = #{code}
+          AND TREATMENT_MEASURE = '1'
+    </select>
+
     <update id="unbindBarCode">
         UPDATE CODE_BINDING
         SET PRODUCT_CODE = NULL, RECORD_TIME2 = NULL