From 064309418f482aa8058023f75c2c9106f0bc549e Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 9 Oct 2025 14:33:17 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-09=20=E6=8A=A5=E5=B7=A5=20=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=9A=84=E8=BF=87=E7=A8=8B?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C=20=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E5=8F=98=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  | 12 +++++
 .../gaotao/modules/pms/mapper/QcMapper.java   |  5 ++
 .../pms/service/Impl/QcServiceImpl.java       |  8 +++
 .../gaotao/modules/pms/service/QcService.java |  5 ++
 .../mapper/orderIssure/IssureNotifyMapper.xml |  4 +-
 src/main/resources/mapper/pms/QcMapper.xml    | 43 +++++++++------
 .../resources/mapper/pms/QcReportMapper.xml   | 54 +++++++++----------
 7 files changed, 85 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/pms/controller/QcController.java b/src/main/java/com/gaotao/modules/pms/controller/QcController.java
index 03860e1..28f4ba1 100644
--- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java
+++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java
@@ -1665,6 +1665,18 @@ public class QcController {
         return R.ok().put("rows", list);
     }
 
+    /**
+     * 查询过程检验待检验记录数量
+     **/
+    @PostMapping("/checkProcessInspectionPendingCount")
+    public R checkProcessInspectionPendingCount(@RequestBody Map<String, String> params){
+        String site = params.get("site");
+        //String buNo = params.get("buNo");
+        String orderNo = params.get("orderNo");
+        int count = qcService.checkProcessInspectionPendingCount(site, orderNo);
+        return R.ok().put("count", count);
+    }
+
 }
 
 
diff --git a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
index 630cc1b..279fbf7 100644
--- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
@@ -462,4 +462,9 @@ public interface QcMapper {
     IPage<RoutingListData> routingListSearch(Page<RoutingListData> page, @Param("query") RoutingListData data);
 
     void updateInboundNotificationStatus(@Param("site") String site, @Param("buNo") String buNo, @Param("documentNo") String documentNo, @Param("status") String status);
+
+    /**
+     * 查询过程检验待检验记录数量
+     */
+    int checkProcessInspectionPendingCount(@Param("site") String site, @Param("orderNo") String orderNo);
 }
diff --git a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
index 456a76e..9693d7c 100644
--- a/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/pms/service/Impl/QcServiceImpl.java
@@ -3515,6 +3515,14 @@ public class QcServiceImpl implements QcService {
         return new PageUtils(resultList);
     }
 
+    /**
+     * 查询过程检验待检验记录数量
+     */
+    @Override
+    public int checkProcessInspectionPendingCount(String site, String orderNo) {
+        return qcMapper.checkProcessInspectionPendingCount(site, orderNo);
+    }
+
 }
 
 
diff --git a/src/main/java/com/gaotao/modules/pms/service/QcService.java b/src/main/java/com/gaotao/modules/pms/service/QcService.java
index 2d2fe4f..aad95dd 100644
--- a/src/main/java/com/gaotao/modules/pms/service/QcService.java
+++ b/src/main/java/com/gaotao/modules/pms/service/QcService.java
@@ -260,4 +260,9 @@ public interface QcService {
      * Routing清单查询
      */
     PageUtils routingListSearch(RoutingListData data);
+
+    /**
+     * 查询过程检验待检验记录数量
+     */
+    int checkProcessInspectionPendingCount(String site, String orderNo);
 }
diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
index a264ebe..7820756 100644
--- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
+++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml
@@ -377,7 +377,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
          </where>
     </select>
         <select id="getNoControlPartList" resultType="PartEntity" >
-        select top 1000 part_no,part_desc,umid,spec,sku,cinv_source_code
+        select top 1000 part_no, PartDescription as part_desc, umid, spec, sku, cinv_source_code
         from part
          <where>
             and site = #{site} and sourceBu = #{sourceBu}    and control_mes='N'
@@ -385,7 +385,7 @@ RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu)
                 AND part_no LIKE '%'+ #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND part_desc LIKE  '%'+ #{partDesc}+ '%'
+                AND PartDescription LIKE  '%'+ #{partDesc}+ '%'
             </if>
             <if test = "spec != null and spec != ''">
                 AND spec  LIKE  '%'+ #{spec}+ '%'
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 270618f..06cda4a 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -11,7 +11,7 @@
             top 1
             a.orderno as orderNo,
             j.partNo,
-            j.part_desc,
+            j.PartDescription as part_desc,
             c.operationDesc,
             b.approve_qty as rollQty,
             a.s_resourceid as resourceId,
@@ -162,10 +162,10 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
-        d.invdefinetype as invdefinetype,
+        d.PartType as invdefinetype,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -211,7 +211,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -530,10 +530,10 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
-        d.invdefinetype as invdefinetype,
+        d.PartType as invdefinetype,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -579,7 +579,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -805,7 +805,7 @@
             a.orderno as orderNo,
             j.partNo,
             j.PartDescription as partDesc,
-            j.invdefinetype,
+            j.PartType as invdefinetype,
             j.sku,
             c.operationDesc as operationDesc,
             a.itemno as operationNo,
@@ -843,7 +843,7 @@
     <!-- 查询物料名称 -->
     <select id="selectPartDesc" parameterType="com.gaotao.modules.pms.data.QcFAIRecordData" resultType="com.gaotao.modules.pms.data.QcFAIRecordData">
         SELECT distinct
-            part_desc
+            PartDescription as part_desc
         FROM part
         WHERE site = #{site} and partNo = #{partNo}
     </select>
@@ -857,7 +857,7 @@
             qir.create_date as taskDate,
             qir.roll_no,
             qir.part_no,
-            p.part_desc,
+            p.PartDescription as part_desc,
             p.cinv_source_code,
             p.sku as sku,
             qir.roll_qty,
@@ -913,7 +913,7 @@
         d.cinv_source_code as cinvSourceCode,
         d.sku,
         d.umid as umId,
-        d.invdefinetype as invdefinetype,
+        d.PartType as invdefinetype,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1014,7 +1014,7 @@
                 AND a.submission_type = #{query.submissionType}
             </if>
             <if test = "query.invdefinetype != null and query.invdefinetype != ''">
-                AND d.invdefinetype LIKE '%' + #{query.invdefinetype} + '%'
+                AND d.PartType LIKE '%' + #{query.invdefinetype} + '%'
             </if>
         </where>
         ORDER BY
@@ -1286,10 +1286,10 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
-        d.invdefinetype as invdefinetype,
+        d.PartType as invdefinetype,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1335,7 +1335,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1756,7 +1756,7 @@
         SELECT
         site,
         partNo,
-        part_desc,
+        PartDescription as part_desc,
         sku,
         spec
         FROM part
@@ -1766,7 +1766,7 @@
                 AND partNo LIKE '%' + #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND part_desc LIKE '%' + #{partDesc} + '%'
+                AND PartDescription LIKE '%' + #{partDesc} + '%'
             </if>
             <if test = "sku != null and sku != ''">
                 AND sku LIKE '%' + #{sku} + '%'
@@ -3314,6 +3314,15 @@
         set order_status = #{status}
         where site = #{site} and bu_no = #{buNo} and order_no = #{documentNo}
     </update>
+
+    <!-- 查询过程检验待检验记录数量 -->
+    <select id="checkProcessInspectionPendingCount" resultType="int">
+        SELECT COUNT(1) 
+        FROM qc_ipqc_record 
+        WHERE site = #{site}
+        AND order_no = #{orderNo} 
+        AND state IN ('未开始', '待检验')
+    </select>
 </mapper>
 
 
diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml
index 861a3b0..69c8a1f 100644
--- a/src/main/resources/mapper/pms/QcReportMapper.xml
+++ b/src/main/resources/mapper/pms/QcReportMapper.xml
@@ -162,7 +162,7 @@
             a.resource_id,
             r.resourceDesc,
             a.part_no,
-            d.part_desc,
+            d.PartDescription as part_desc,
             d.cinv_source_code as cinvSourceCode,
             d.sku as sku,
             d.invdefinetype as invdefinetype,
@@ -216,7 +216,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -291,7 +291,7 @@
             a.resource_id,
             r.resourceDesc,
             a.part_no,
-            d.part_desc,
+            d.PartDescription as part_desc,
             d.cinv_source_code as cinvSourceCode,
             d.sku as sku,
             d.invdefinetype as invdefinetype,
@@ -349,7 +349,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -420,7 +420,7 @@
             a.resource_id,
             r.resourceDesc,
             a.part_no,
-            d.part_desc,
+            d.PartDescription as part_desc,
             d.cinv_source_code as cinvSourceCode,
             d.sku as sku,
             d.invdefinetype as invdefinetype,
@@ -478,7 +478,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -549,7 +549,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
         d.invdefinetype as invdefinetype,
@@ -607,7 +607,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1037,7 +1037,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
         d.invdefinetype as invdefinetype,
@@ -1097,7 +1097,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1183,7 +1183,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1259,7 +1259,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         d.cinv_source_code as cinvSourceCode,
         d.sku as sku,
         d.invdefinetype as invdefinetype,
@@ -1319,7 +1319,7 @@
                 AND a.part_no LIKE '%' + #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND d.part_desc LIKE '%' + #{partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{partDesc} + '%'
             </if>
             <if test = "cinvSourceCode != null and cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'
@@ -1399,7 +1399,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1542,7 +1542,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1617,7 +1617,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1677,7 +1677,7 @@
                 AND a.part_no LIKE '%' + #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND d.part_desc LIKE '%' + #{partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{partDesc} + '%'
             </if>
             <if test = "cinvSourceCode != null and cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'
@@ -1754,7 +1754,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -1814,7 +1814,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1897,7 +1897,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -1972,7 +1972,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -2032,7 +2032,7 @@
                 AND a.part_no LIKE '%' + #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND d.part_desc LIKE '%' + #{partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{partDesc} + '%'
             </if>
             <if test = "cinvSourceCode != null and cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'
@@ -2109,7 +2109,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -2169,7 +2169,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -2252,7 +2252,7 @@
                 AND a.part_no LIKE '%' + #{query.partNo} + '%'
             </if>
             <if test = "query.partDesc != null and query.partDesc != ''">
-                AND d.part_desc LIKE '%' + #{query.partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{query.partDesc} + '%'
             </if>
             <if test = "query.cinvSourceCode != null and query.cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{query.cinvSourceCode} + '%'
@@ -2327,7 +2327,7 @@
         a.resource_id,
         r.resourceDesc,
         a.part_no,
-        d.part_desc,
+        d.PartDescription as part_desc,
         a.inspection_remark,
         a.roll_qty,
         a.sampling_qty,
@@ -2387,7 +2387,7 @@
                 AND a.part_no LIKE '%' + #{partNo} + '%'
             </if>
             <if test = "partDesc != null and partDesc != ''">
-                AND d.part_desc LIKE '%' + #{partDesc} + '%'
+                AND d.PartDescription LIKE '%' + #{partDesc} + '%'
             </if>
             <if test = "cinvSourceCode != null and cinvSourceCode != ''">
                 AND d.cinv_source_code LIKE '%' + #{cinvSourceCode} + '%'