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