From 8833f940bfc6a31204a8645f6c976521f6d8c9fd Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 11 Jun 2026 14:48:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(oss):=20=E6=B7=BB=E5=8A=A0=E9=99=84?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在SysOssServiceImpl中增加CAdditionalInfo字段的复制逻辑
- 确保OSS对象在批量保存时包含完整的附加信息数据
- 保持与其他订单参考字段的一致性处理方式
---
 .../com/xujie/modules/npcIqc/data/LogisticsMainData.java     | 2 +-
 .../java/com/xujie/modules/npcIqc/data/LogisticsPoData.java  | 4 ++++
 .../mapper/inspection/InspectionRequestDetailMapper.xml      | 1 +
 src/main/resources/mapper/npcIqc/LogisticsMapper.xml         | 5 +++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java
index 62efe41..8e99369 100644
--- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java
+++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsMainData.java
@@ -19,5 +19,5 @@ public class LogisticsMainData {
     /**
      * 发货数量
      */
-    private Double shippedQty;
+    private Double cShipQty;
 }
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 323b4db..03187b0 100644
--- a/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
+++ b/src/main/java/com/xujie/modules/npcIqc/data/LogisticsPoData.java
@@ -20,4 +20,8 @@ public class LogisticsPoData {
     private Double shippedQty;
 
     private String flexId;
+
+    private String sku;
+
+    private String orderRef1;
 }
diff --git a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
index c7bd842..a9ed5ea 100644
--- a/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
+++ b/src/main/resources/mapper/inspection/InspectionRequestDetailMapper.xml
@@ -30,6 +30,7 @@
         <where>
             <if test="query.site != null and query.site != ''">AND d.site = #{query.site}</if>
             <if test="query.requestNo != null and query.requestNo != ''">AND d.request_no LIKE '%' + #{query.requestNo} + '%'</if>
+            <if test="query.orderRef1 != null and query.orderRef1 != ''">AND d.order_ref1 = #{query.orderRef1}</if>
         </where>
         ORDER BY d.request_no DESC, d.item_no ASC
     </select>
diff --git a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
index a7b81c7..7c09909 100644
--- a/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
+++ b/src/main/resources/mapper/npcIqc/LogisticsMapper.xml
@@ -9,7 +9,7 @@
         h.supplier_no AS supplierNo,
         ISNULL(s.supplier_name, '') AS supplierName,
         COUNT(DISTINCT d.order_no) AS poCount,
-        ISNULL(SUM(d.shipped_qty), 0) AS shippedQty
+        ISNULL(SUM(d.c_ship_qty), 0) AS shippedQty
         FROM PODetail d
         INNER JOIN POHeader h
         ON d.order_no = h.order_no
@@ -42,8 +42,9 @@
             d.part_no AS partNo,
             h.order_date AS orderDate,
             d.qty,
-            d.shipped_qty AS shippedQty,
+            d.c_ship_qty AS shippedQty,
             d.c_flexid AS flexId,
+            d.order_ref1 AS orderRef1,
             p.sku
         FROM PODetail d
         LEFT JOIN POHeader h