From a16eea1b378d9090f2818ceb80170a293d0fb2d2 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 30 Apr 2026 09:30:15 +0800
Subject: [PATCH] =?UTF-8?q?refactor(order):=20=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E9=87=8D=E5=A4=8D=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 countByOrderAndItem 方法中的 item 参数
- 更新 PODetailMapper.xml 中的 SQL 查询条件，移除 item 字段过滤
- 修改 POdetailServiceImpl 中的重复检查逻辑，仅使用订单号和站点进行验证
- 更新重复项提示信息，移除款号显示
- 在查询条件中新增 PO 编号、客户和采购员筛选功能
- 添加 SKU 查询条件支持
---
 .../java/com/xujie/modules/order/dao/PODetailMapper.java   | 4 +---
 .../modules/order/service/Impl/PODetailServiceImpl.java    | 7 +++----
 src/main/resources/mapper/order/PODetailMapper.xml         | 5 ++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java b/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java
index 7c51968..6182d15 100644
--- a/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java
+++ b/src/main/java/com/xujie/modules/order/dao/PODetailMapper.java
@@ -38,10 +38,8 @@ public interface PODetailMapper extends BaseMapper<PODetail> {
      * 检查订单明细是否已存在(用于防止重复上传)
      * @param orderNo 订单号
      * @param site 工厂编码
-     * @param item 款号
      * @return 存在的记录数
      */
     Integer countByOrderAndItem(@Param("orderNo") String orderNo,
-                                @Param("site") String site,
-                                @Param("item") String item);
+                                @Param("site") String site);
 }
diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java
index ad9c1f9..fb19a63 100644
--- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java
+++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java
@@ -227,12 +227,11 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i
 
                     // ========== 2. 检查是否重复 ==========
                     String poNo = excelDTO.getPoNo();
-                    String item = excelDTO.getItem();
                                     
-                    // 检查数据库中是否已存在相同的订单号+款号（使用part_no字段）
-                    Integer existCount = baseMapper.countByOrderAndItem(poNo, site, item);
+                    // 检查数据库中是否已存在相同的订单号（使用订单号+站点判断）
+                    Integer existCount = baseMapper.countByOrderAndItem(poNo, site);
                     if (existCount != null && existCount > 0) {
-                        duplicateItems.add("第" + rowNum + "行 - 订单号: " + poNo + ", 款号: " + item);
+                        duplicateItems.add("第" + rowNum + "行 - 订单号: " + poNo);
                         continue; // 跳过重复数据，继续处理下一条
                     }
                     
diff --git a/src/main/resources/mapper/order/PODetailMapper.xml b/src/main/resources/mapper/order/PODetailMapper.xml
index ad7f514..a93fef0 100644
--- a/src/main/resources/mapper/order/PODetailMapper.xml
+++ b/src/main/resources/mapper/order/PODetailMapper.xml
@@ -229,6 +229,9 @@
         where pod.site = '${query.site}'
         <if test="query.poHeaderId != null and query.poHeaderId != '' "> and pod.po_header_id like '%${query.poHeaderId}%'</if>
         <if test="query.orderNo != null and query.orderNo != '' "> and pod.order_no like '%${query.orderNo}%'</if>
+        <if test="query.poNo != null and query.poNo != '' "> and poh.po_no like '%${query.poNo}%'</if>
+        <if test="query.customer != null and query.customer != '' "> and poh.c_customer like '%${query.customer}%'</if>
+        <if test="query.buyer != null and query.buyer != '' "> and poh.buyer like '%${query.buyer}%'</if>
         <if test="query.itemNo != null "> and pod.item_no = '${query.itemNo}'</if>
         <if test="query.partNo != null and query.partNo != '' "> and pod.part_no like '%${query.partNo}%'</if>
         <if test="query.status != null and query.status != '' "> and pod.status like '%${query.status}%'</if>
@@ -306,6 +309,7 @@
         <if test="query.needDate != null and query.needDate != '' "> and pod.need_date like '%${query.needDate}%'</if>
         <if test="query.inspectMethod != null and query.inspectMethod != '' "> and pod.inspect_method like '%${query.inspectMethod}%'</if>
         <if test="query.invNotifyQty != null and query.invNotifyQty != '' "> and pod.inv_notify_qty like '%${query.invNotifyQty}%'</if>
+        <if test="query.sku != null and query.sku != '' "> and p.sku like '%${query.sku}%'</if>
         order by pod.id desc
     </select>
 
@@ -497,7 +501,6 @@
         FROM PODetail
         WHERE order_no = #{orderNo}
           AND site = #{site}
-          AND item = #{item}
     </select>
 
 </mapper>