From d81324fdf93ff9640d8379ed9a9c351293e4c283 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Fri, 12 Sep 2025 17:32:10 +0800
Subject: [PATCH] =?UTF-8?q?BOM=E5=92=8CRouting=E9=A1=B5=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/controller/QcController.java  | 22 ++++++++
 .../gaotao/modules/pms/data/BomListData.java  | 34 ++++++++++++
 .../modules/pms/data/RoutingListData.java     | 34 ++++++++++++
 .../gaotao/modules/pms/mapper/QcMapper.java   | 14 +++++
 .../pms/service/Impl/QcServiceImpl.java       | 26 +++++++++
 .../gaotao/modules/pms/service/QcService.java | 14 +++++
 src/main/resources/mapper/pms/QcMapper.xml    | 54 +++++++++++++++++++
 7 files changed, 198 insertions(+)
 create mode 100644 src/main/java/com/gaotao/modules/pms/data/BomListData.java
 create mode 100644 src/main/java/com/gaotao/modules/pms/data/RoutingListData.java

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 98d9a07..087ec71 100644
--- a/src/main/java/com/gaotao/modules/pms/controller/QcController.java
+++ b/src/main/java/com/gaotao/modules/pms/controller/QcController.java
@@ -1633,6 +1633,28 @@ public class QcController {
         return R.ok();
     }
 
+    // ======================= BOM清单API =======================
+
+    /**
+     * BOM清单查询
+     **/
+    @PostMapping("/bomListSearch")
+    public R bomListSearch(@RequestBody BomListData data){
+        PageUtils page = qcService.bomListSearch(data);
+        return R.ok().put("page", page);
+    }
+
+    // ======================= Routing清单API =======================
+
+    /**
+     * Routing清单查询
+     **/
+    @PostMapping("/routingListSearch")
+    public R routingListSearch(@RequestBody RoutingListData data){
+        PageUtils page = qcService.routingListSearch(data);
+        return R.ok().put("page", page);
+    }
+
 }
 
 
diff --git a/src/main/java/com/gaotao/modules/pms/data/BomListData.java b/src/main/java/com/gaotao/modules/pms/data/BomListData.java
new file mode 100644
index 0000000..5b03298
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/pms/data/BomListData.java
@@ -0,0 +1,34 @@
+package com.gaotao.modules.pms.data;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * BOM清单数据传输对象
+ */
+@Data
+public class BomListData {
+    
+    /**
+     * 分页参数
+     */
+    private Integer page;
+    private Integer limit;
+    
+    /**
+     * 查询条件
+     */
+    private String site;
+    private String buNo;
+    private String partNo;
+    
+    /**
+     * BOM数据字段
+     */
+    private String revno;
+    private String bomtype;
+    private String status;
+    private Date phaseindate;
+    private Date phaseoutdate;
+}
diff --git a/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java b/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java
new file mode 100644
index 0000000..a7395b3
--- /dev/null
+++ b/src/main/java/com/gaotao/modules/pms/data/RoutingListData.java
@@ -0,0 +1,34 @@
+package com.gaotao.modules.pms.data;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Routing清单数据传输对象
+ */
+@Data
+public class RoutingListData {
+    
+    /**
+     * 分页参数
+     */
+    private Integer page;
+    private Integer limit;
+    
+    /**
+     * 查询条件
+     */
+    private String site;
+    private String buNo;
+    private String partNo;
+    
+    /**
+     * Routing数据字段
+     */
+    private String revno;
+    private String routingtype;
+    private String status;
+    private Date phaseindate;
+    private Date phaseoutdate;
+}
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 ba838bb..c82606e 100644
--- a/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
+++ b/src/main/java/com/gaotao/modules/pms/mapper/QcMapper.java
@@ -446,4 +446,18 @@ public interface QcMapper {
      * 删除SOP记录
      */
     void deleteSopRecord(@Param("params") Map<String, Object> params);
+
+    // ======================= BOM清单相关方法 =======================
+
+    /**
+     * BOM清单查询
+     */
+    IPage<BomListData> bomListSearch(Page<BomListData> page, @Param("query") BomListData data);
+
+    // ======================= Routing清单相关方法 =======================
+
+    /**
+     * Routing清单查询
+     */
+    IPage<RoutingListData> routingListSearch(Page<RoutingListData> page, @Param("query") RoutingListData data);
 }
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 6ce34c5..c0bd64a 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
@@ -3507,6 +3507,32 @@ public class QcServiceImpl implements QcService {
         qcMapper.deleteSopRecord(params);
     }
 
+    // ======================= BOM清单相关方法 =======================
+
+    /**
+     * BOM清单查询
+     */
+    @Override
+    @Transactional
+    public PageUtils bomListSearch(BomListData data) {
+        IPage<BomListData> resultList = this.qcMapper.bomListSearch(
+                new Page<BomListData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
+
+    // ======================= Routing清单相关方法 =======================
+
+    /**
+     * Routing清单查询
+     */
+    @Override
+    @Transactional
+    public PageUtils routingListSearch(RoutingListData data) {
+        IPage<RoutingListData> resultList = this.qcMapper.routingListSearch(
+                new Page<RoutingListData>(data.getPage(), data.getLimit()), data);
+        return new PageUtils(resultList);
+    }
+
 }
 
 
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 071d5fe..2d2fe4f 100644
--- a/src/main/java/com/gaotao/modules/pms/service/QcService.java
+++ b/src/main/java/com/gaotao/modules/pms/service/QcService.java
@@ -246,4 +246,18 @@ public interface QcService {
      * 删除SOP记录
      */
     void deleteSopRecord(Map<String, Object> params);
+
+    // ======================= BOM清单相关方法 =======================
+
+    /**
+     * BOM清单查询
+     */
+    PageUtils bomListSearch(BomListData data);
+
+    // ======================= Routing清单相关方法 =======================
+
+    /**
+     * Routing清单查询
+     */
+    PageUtils routingListSearch(RoutingListData data);
 }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 4c3f58d..75beb9f 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -3253,6 +3253,60 @@
         </where>
     </delete>
 
+    <!-- ================================================= BOM清单相关SQL ================================================= -->
+
+    <!-- BOM清单查询 -->
+    <select id="bomListSearch" resultType="com.gaotao.modules.pms.data.BomListData">
+        SELECT
+            bh.site,
+            bh.bu_no as buNo,
+            bh.revno,
+            bh.bomtype,
+            bh.status,
+            bh.phaseindate,
+            bh.phaseoutdate
+        FROM BOMHeader bh
+        <where>
+            <if test="query.site != null and query.site != ''">
+                AND bh.site = #{query.site}
+            </if>
+            <if test="query.buNo != null and query.buNo != ''">
+                AND bh.bu_no = #{query.buNo}
+            </if>
+            <if test="query.partNo != null and query.partNo != ''">
+                AND bh.bu_no = #{query.partNo}
+            </if>
+        </where>
+        ORDER BY bh.phaseindate DESC
+    </select>
+
+    <!-- ================================================= Routing清单相关SQL ================================================= -->
+
+    <!-- Routing清单查询 -->
+    <select id="routingListSearch" resultType="com.gaotao.modules.pms.data.RoutingListData">
+        SELECT
+            rh.site,
+            rh.bu_no as buNo,
+            rh.revno,
+            rh.routingtype,
+            rh.status,
+            rh.phaseindate,
+            rh.phaseoutdate
+        FROM RoutingHeader rh
+        <where>
+            <if test="query.site != null and query.site != ''">
+                AND rh.site = #{query.site}
+            </if>
+            <if test="query.buNo != null and query.buNo != ''">
+                AND rh.bu_no = #{query.buNo}
+            </if>
+            <if test="query.partNo != null and query.partNo != ''">
+                AND rh.bu_no = #{query.partNo}
+            </if>
+        </where>
+        ORDER BY rh.phaseindate DESC
+    </select>
+
 </mapper>