From 18f5931b62c8dfa165fd3278f40dba8239a3c96c Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 22 Apr 2026 16:55:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(WmsMaterialCoil):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E5=8F=91=E8=B4=A7=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsMaterialCoilBo中新增exportTimeBy字段用于控制排序方式
- 实现按发货时间倒序排序的逻辑分支
- 当exportTimeBy为true时按mc.export_time倒序排列
- 保持原有的异常排序和创建时间排序逻辑
---
 .../src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java  | 6 ++++++
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java    | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
index 0d07ee5f..d56334ea 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java
@@ -366,5 +366,11 @@ public class WmsMaterialCoilBo extends BaseEntity {
      */
     @TableField(exist = false)
     private Boolean groupByEnterCoilNo;
+
+    /**
+     * 是否按发货时间倒序排序（true=按export_time倒序）
+     */
+    @TableField(exist = false)
+    private Boolean exportTimeBy;
 }
 
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 cc011675..c0da0c61 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
@@ -878,6 +878,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             // 按异常排序：异常的钢卷在前按创建时间倒序，没异常的钢卷在后按创建时间倒序
             qw.orderByAsc("CASE WHEN COALESCE(ca.abnormal_count, 0) > 0 THEN 0 ELSE 1 END");
             qw.orderByDesc("mc.create_time");
+        } else if (Boolean.TRUE.equals(bo.getExportTimeBy())) {
+            // 按发货时间倒序排序
+            qw.orderByDesc("mc.export_time");
         } else {
             //根据创建时间倒叙
             qw.orderByDesc("mc.create_time");