From ac7a0172701b8a5b6d8aabccaa18aa125f3248e2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Thu, 29 Jan 2026 17:28:37 +0800 Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E6=9F=A5=E8=AF=A2=E4=B8=AD=E5=88=A0=E9=99=A4=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将内连接改为左连接以正确处理删除标记的数据关联 - 删除了关于绑定信息排序逻辑的冗余注释 - 确保查询结果包含被标记删除的运单和计划数据的关联信息 --- .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 1 - .../resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index ff5981b0..5738cbab 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -630,7 +630,6 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.apply("COALESCE(ca.abnormal_count, 0) >= {0}", bo.getMinAbnormalCount()); } // 排序： - // - 当前端需要绑定信息（includeBindInfo=true）时：优先展示“已绑定实际库位”的钢卷（actual_warehouse_id 非空在前） // 再按实际库位ID升序（库位ID为自增，升序即可满足“先生成的库位在前”） // - 否则：保持原有创建时间倒序 if (Boolean.TRUE.equals(bo.getOrderBy())) { diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml index 54421918..aea5cafa 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryWaybillDetailMapper.xml @@ -85,8 +85,8 @@ d.settlement_type, d.unit_price FROM wms_delivery_waybill_detail d - INNER JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0 - INNER JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0 + LEFT JOIN wms_delivery_waybill w ON w.waybill_id = d.waybill_id AND w.del_flag = 0 + LEFT JOIN wms_delivery_plan p ON p.plan_id = w.plan_id AND p.del_flag = 0 WHERE d.del_flag = 0 AND d.coil_id IN