From 6a220387ac7070f161e51caee28c789a73f5dd44 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 12 Jun 2026 14:10:29 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-12=20RoHs=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rohs/controller/RohsController.java       |  6 +--
 .../modules/rohs/service/RohsService.java     |  2 +-
 src/main/resources/mapper/rohs/RohsMapper.xml | 39 ++++++++-----------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/spring/modules/rohs/controller/RohsController.java b/src/main/java/com/spring/modules/rohs/controller/RohsController.java
index 952c9932..f20e83fc 100644
--- a/src/main/java/com/spring/modules/rohs/controller/RohsController.java
+++ b/src/main/java/com/spring/modules/rohs/controller/RohsController.java
@@ -51,12 +51,12 @@ public class RohsController {
     }
 
     /**
-     * 项目物料查询（用于RoHs材料明细选择）
+     * 物料查询（用于RoHs材料明细选择）
      */
     @GetMapping("/projectMaterialList")
     public R projectMaterialList(@RequestParam Map<String, Object> params) {
-        if (StringUtils.isBlank((String) params.get("site")) || StringUtils.isBlank((String) params.get("projectId"))) {
-            return R.error("工厂(site)和项目编码(projectId)不能为空");
+        if (StringUtils.isBlank((String) params.get("site"))) {
+            return R.error("工厂(site)不能为空");
         }
         PageUtils page = rohsService.queryProjectMaterialPage(params);
         return R.ok().put("page", page);
diff --git a/src/main/java/com/spring/modules/rohs/service/RohsService.java b/src/main/java/com/spring/modules/rohs/service/RohsService.java
index d5659aa8..f115fe8a 100644
--- a/src/main/java/com/spring/modules/rohs/service/RohsService.java
+++ b/src/main/java/com/spring/modules/rohs/service/RohsService.java
@@ -52,7 +52,7 @@ public interface RohsService extends IService<RohsEntity> {
     HashMap<String, String> getButtonCondition(String site, String referenceNo);
 
     /**
-     * 查询项目物料分页
+     * 查询物料分页
      */
     PageUtils queryProjectMaterialPage(Map<String, Object> params);
 
diff --git a/src/main/resources/mapper/rohs/RohsMapper.xml b/src/main/resources/mapper/rohs/RohsMapper.xml
index 72a509e6..6ae527c8 100644
--- a/src/main/resources/mapper/rohs/RohsMapper.xml
+++ b/src/main/resources/mapper/rohs/RohsMapper.xml
@@ -159,35 +159,28 @@
 
     <select id="queryProjectMaterialPage" resultType="java.util.HashMap">
         select
-            a.site as site,
-            a.project_id as projectId,
-            a.test_part_no as testPartNo,
-            a.final_part_no as finalPartNo,
-            a.part_desc as partDesc,
-            d.part_status as partStatus,
-            b.final_customer_id as finalCustomerId,
-            b.customer_id as customerId
-        from view_Project_Part as a
-        left join plm_project_info as b on a.site = b.site and a.project_id = b.project_id
-        left join part as d on a.site = d.site and a.test_part_no = d.part_no
-        where a.site = #{params.site}
-        and d.status = 'Y'
-        <if test="params.projectId != null and params.projectId != ''">
-            and a.project_id = #{params.projectId}
-        </if>
-        <if test="params.endCustomer != null and params.endCustomer != ''">
-            and (b.final_customer_id = #{params.endCustomer} or b.customer_id = #{params.endCustomer})
-        </if>
+            p.site as site,
+            p.part_no as testPartNo,
+            case when p.ifs_part_no is null or p.ifs_part_no = '' then p.part_no else p.ifs_part_no end as finalPartNo,
+            p.part_desc as partDesc,
+            p.part_status as partStatus
+        from part as p
+        where p.site = #{params.site}
+          and isnull(p.status, '') = 'Y'
+          and isnull(p.show_in_query_flag, 'N') = 'Y'
         <if test="params.partDesc != null and params.partDesc != ''">
-            and a.part_desc like #{params.partDesc}
+            and p.part_desc like #{params.partDesc}
         </if>
         <if test="params.finalPartNo != null and params.finalPartNo != ''">
-            and a.final_part_no like #{params.finalPartNo}
+            and (
+                isnull(p.ifs_part_no, '') like #{params.finalPartNo}
+                or p.part_no like #{params.finalPartNo}
+            )
         </if>
         <if test="params.partStatus != null and params.partStatus != ''">
-            and d.part_status like #{params.partStatus}
+            and p.part_status like #{params.partStatus}
         </if>
-        order by a.project_id, a.test_part_no
+        order by p.part_no
     </select>
 
     <select id="queryMaterialList" resultMap="MaterialResultMap">