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 { * 检查订单明细是否已存在(用于防止重复上传) * @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 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}' and pod.po_header_id like '%${query.poHeaderId}%' and pod.order_no like '%${query.orderNo}%' + and poh.po_no like '%${query.poNo}%' + and poh.c_customer like '%${query.customer}%' + and poh.buyer like '%${query.buyer}%' and pod.item_no = '${query.itemNo}' and pod.part_no like '%${query.partNo}%' and pod.status like '%${query.status}%' @@ -306,6 +309,7 @@ and pod.need_date like '%${query.needDate}%' and pod.inspect_method like '%${query.inspectMethod}%' and pod.inv_notify_qty like '%${query.invNotifyQty}%' + and p.sku like '%${query.sku}%' order by pod.id desc @@ -497,7 +501,6 @@ FROM PODetail WHERE order_no = #{orderNo} AND site = #{site} - AND item = #{item}