From 8b180723ea4d9fb4daa0af96cca00cbb3ce97576 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Wed, 17 Jun 2026 14:24:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(logistics):=20=E6=9B=B4=E6=96=B0=E7=89=A9?=
 =?UTF-8?q?=E6=B5=81=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=92=8C=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 InspectionRequestDetailMapper.xml 中的字段映射，将 poNo 和 poItemNo 替换为 order_ref1 和 order_ref2
- 在 LogisticsMapper.xml 中添加物料编码筛选条件
- 为 LogisticsPoData 类新增 cCustomer 字段用于显示客户信息
- 为 LogisticsSearchData 类新增 partNo 字段用于物料编码搜索功能
- 更新数据库查询排序逻辑以匹配新的字段映射
---
 .../java/com/xujie/modules/npcIqc/data/LogisticsPoData.java | 1 +
 .../com/xujie/modules/npcIqc/data/LogisticsSearchData.java  | 5 +++++
 .../mapper/inspection/InspectionRequestDetailMapper.xml     | 6 +++---
 src/main/resources/mapper/npcIqc/LogisticsMapper.xml        | 4 ++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
index 03187b0..f7b6043 100644
--- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
+++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
@@ -6,6 +6,7 @@ import java.util.Date;
 
 @Data
 public class LogisticsPoData {
+    private String cCustomer;
 
     private String orderNo;
 
diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
index 8c4f095..368ab35 100644
--- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
+++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsSearchData.java
@@ -21,4 +21,9 @@ public class LogisticsSearchData extends QueryPage {
      * 供应商名称
      */
     private String supplierName;
+
+    /**
+     * 物料编码
+     */
+    private String partNo;
 }
diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
index f6024cf..874e15b 100644
--- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
+++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
@@ -39,8 +39,8 @@
     <select id="getInspectionResultList" resultType="com.xujie.modules.inspection.data.InspectionResultVO">
         SELECT
             d.request_no AS requestNo,
-            sub.po_no AS poNo,
-            sub.po_item_no AS poItemNo,
+            sub.order_ref1 AS poNo,
+            sub.order_ref2 AS poItemNo,
             d.part_no AS partNo,
             p.part_desc AS partDesc,
             d.qty AS qty,
@@ -50,7 +50,7 @@
             ON d.request_no = sub.request_no AND d.site = sub.site AND d.item_no = sub.item_no
         LEFT JOIN part p ON d.part_no = p.part_no AND d.site = p.site
         WHERE d.request_no = #{requestNo} AND d.site = #{site}
-        ORDER BY d.item_no ASC, sub.po_no ASC, sub.po_item_no ASC
+        ORDER BY d.item_no ASC, sub.order_ref1 ASC, sub.order_ref2 ASC
     </select>
 
     <update id="lockInspectQty">
diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
index 7c09909..463d72e 100644
--- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
+++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
@@ -27,6 +27,9 @@
         <if test="param.supplierName != null and param.supplierName != ''">
             AND s.supplier_name LIKE '%' + #{param.supplierName} + '%'
         </if>
+        <if test="param.partNo != null and param.partNo != ''">
+            AND d.part_no LIKE '%' + #{param.partNo} + '%'
+        </if>
         GROUP BY
         d.c_flexid,
         h.supplier_no,
@@ -37,6 +40,7 @@
     <!-- 查询PO清单 -->
     <select id="getPoListPage" resultType="com.xujie.modules.npcIqc.data.LogisticsPoData">
         SELECT
+            h.c_customer AS cCustomer,
             d.order_no AS orderNo,
             d.item_no AS itemNo,
             d.part_no AS partNo,