2025.04.24 IPQC 加工中心查询条件下拉

src/main/java/com/xujie/sys/modules/pms/data/QcReportData.java

@@ -2,6 +2,7 @@ package com.xujie.sys.modules.pms.data;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.common.utils.QueryPage;
 import lombok.Data;
@@ -369,4 +370,7 @@ public class QcReportData extends QueryPage {
     @ExcelIgnore
     private String downloadType;
 
+    @TableField(exist = false)
+    private String workCenterDesc;
+
 }

src/main/resources/mapper/pms/QcMapper.xml

@@ -2048,7 +2048,7 @@
                 AND #{query.endDate2} >= a.task_date
             </if>
             <if test = "query.workCenterNo != null and query.workCenterNo != ''">
-                AND a.work_center_no LIKE #{query.workCenterNo}
+                AND a.work_center_no = #{query.workCenterNo}
             </if>
             <if test = "query.shiftDesc != null and query.shiftDesc != ''">
                 AND c.shiftdesc = #{query.shiftDesc}

src/main/resources/mapper/pms/QcReportMapper.xml

@@ -181,6 +181,7 @@
             a.action_date,
             a.action_by,
             a.pass_qty,
+            wc.WorkCenterDesc as work_center_desc,
             a.not_pass_qty,
             b.item_no,
             b.item_desc,
@@ -201,6 +202,7 @@
         left join WorkCenterResource as r on a.site = r.site and a.resource_id = r.resourceID
         left join part as d on a.site = d.site and a.part_no = d.PartNo
         left join UM as um on a.site = um.site and a.um_id = um.UMID
+        LEFT JOIN WorkCenter as wc on a.site = wc.site and a.work_center_no = wc.WorkCenterNo
         <where>
             a.site in (select site from eam_access_site where username = #{query.userName})
             and (a.site + '-' + a.bu_no) in (select * from dbo.query_bu(#{query.userName}))
@@ -252,6 +254,9 @@
             <if test="query.endDate2 != null">
                 AND #{query.endDate2} >= a.task_date
             </if>
+            <if test = "query.workCenterNo != null and query.workCenterNo != ''">
+                AND a.work_center_no = #{query.workCenterNo}
+            </if>
             <if test = "query.itemResult != null and query.itemResult != ''">
                 AND b.item_result = #{query.itemResult}
             </if>