From e97bc774e108e76fc38c9d69aba80751a066bba9 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 9 May 2024 15:34:05 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20PDA=E9=99=8D=E7=BA=A7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/PdaApiController.java      | 14 ++++++++++++
 .../aucma/api/service/IPdaBindingService.java |  9 ++++++++
 .../api/service/impl/PdaServiceImpl.java      | 22 +++++++++++++++++++
 .../report/domain/RecordExceptionProcess.java |  4 ++--
 4 files changed, 47 insertions(+), 2 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 b2069af..2826327 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
@@ -8,6 +8,7 @@ import com.aucma.base.service.IBaseProcessStationService;
 import com.aucma.common.core.domain.AjaxResult;
 import com.aucma.common.utils.SecurityUtils;
 import com.aucma.common.utils.StringUtils;
+import com.aucma.report.domain.RecordExceptionProcess;
 import com.aucma.report.domain.ReportQualityInspection;
 import com.aucma.report.service.IMaterialCompletionService;
 import com.aucma.report.service.IReportQualityInspectionService;
@@ -264,4 +265,17 @@ public class PdaApiController {
         return success(result);
     }
 
+    /**
+     * PDA降级信息查询
+     * @param inspectionUserFlag 巡检班长降级标识(1=已降级，2=未降级)
+     * @return
+     */
+    @PostMapping("/downgradeQuery")
+    public AjaxResult downgradeQuery(String inspectionUserFlag) {
+        if (StringUtils.isEmpty(inspectionUserFlag)){
+            return error();
+        }
+        List<RecordExceptionProcess> list = service.selectExceptionProcessList(inspectionUserFlag);
+        return success(list);
+    }
 }
diff --git a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java
index 7452044..c2d40a7 100644
--- a/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java
+++ b/aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java
@@ -1,6 +1,7 @@
 package com.aucma.api.service;
 
 import com.aucma.api.domain.dto.RepairSubmitInfoDto;
+import com.aucma.report.domain.RecordExceptionProcess;
 import com.aucma.report.domain.ReportQualityInspection;
 
 import java.util.List;
@@ -54,4 +55,12 @@ public interface IPdaBindingService {
      * @return
      */
     String switchOrders(String barCode, String stationCode);
+
+    /**
+     * PDA降级信息查询
+     * @param inspectionUserFlag 巡检班长降级标识(1=已降级，2=未降级)
+     * @return
+     */
+    List<RecordExceptionProcess> selectExceptionProcessList(String inspectionUserFlag);
+
 }
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 a587782..61f1a41 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
@@ -69,6 +69,15 @@ public class PdaServiceImpl implements IPdaBindingService {
             if (hashMaps.size() == 0){
                 return 999;
             }
+            RecordExceptionProcess select = new RecordExceptionProcess();
+            select.setBoxBarcode(hashMaps.get(0).get("BOX_BARCODE"));
+            List<RecordExceptionProcess> processList = recordExceptionProcessService.selectRecordExceptionProcessList(select);
+            for (RecordExceptionProcess exceptionProcess : processList) {
+                RecordExceptionProcess recordExceptionProcess = new RecordExceptionProcess();
+                recordExceptionProcess.setObjId(exceptionProcess.getObjId());
+                recordExceptionProcess.setInspectionUserFlag("1");
+                recordExceptionProcessService.updateRecordExceptionProcess(recordExceptionProcess);
+            }
         }
         return mapper.submitRepair(info);
     }
@@ -189,4 +198,17 @@ public class PdaServiceImpl implements IPdaBindingService {
         return "提交成功！";
     }
 
+    /**
+     * PDA降级信息查询
+     * @param inspectionUserFlag 巡检班长降级标识(1=已降级，2=未降级)
+     * @return
+     */
+    @Override
+    public List<RecordExceptionProcess> selectExceptionProcessList(String inspectionUserFlag) {
+        RecordExceptionProcess process = new RecordExceptionProcess();
+        process.setProductionUserFlag("9");
+        process.setInspectionUserFlag(inspectionUserFlag);
+        return recordExceptionProcessService.selectRecordExceptionProcessList(process);
+    }
+
 }
diff --git a/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java b/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java
index eb1811e..15eb18b 100644
--- a/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java
+++ b/aucma-report/src/main/java/com/aucma/report/domain/RecordExceptionProcess.java
@@ -139,9 +139,9 @@ public class RecordExceptionProcess extends BaseEntity {
     private String inspectionUserCode;
 
     /**
-     * 巡检班长消息标识(1=已收到通知)
+     * 巡检班长降级标识(1=已降级，2=未降级)
      */
-    @Excel(name = "巡检班长消息标识")
+    @Excel(name = "巡检班长降级标识")
     private String inspectionUserFlag;
 
     /**