From 112cdce0d091446d6c0e43cabf1df4b4e7dca3b9 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 28 Mar 2026 18:10:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=AE=8C=E5=96=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8D=B7VO=E7=BB=93=E6=9E=84=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsMaterialCoilVo中新增actualWarehouse字段存储仓库信息
- 为WmsMaterialCoilVo补充WmsActualWarehouse导入声明
- 在物料卷服务实现中设置仓库名称和实际仓库信息
- 为运单查询条件添加按创建时间降序排列功能
---
 .../src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java  | 6 ++++++
 .../com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java | 1 +
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java    | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
index 683d1dd5..5163b2c6 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
 import com.klp.common.core.domain.BaseEntity;
+import com.klp.domain.WmsActualWarehouse;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -136,6 +137,11 @@ public class WmsMaterialCoilVo extends BaseEntity {
      */
     private WmsWarehouseVo nextWarehouse;
 
+    /**
+     * 仓库信息
+     */
+    private WmsActualWarehouseVo actualWarehouse;
+
     /**
      * 二维码信息
      */
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
index 1dffc81d..1bf5904e 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillServiceImpl.java
@@ -82,6 +82,7 @@ public class WmsDeliveryWaybillServiceImpl implements IWmsDeliveryWaybillService
         qw.eq(bo.getStatus() != null, "wd.status", bo.getStatus());
         // 逻辑删除
         qw.eq("wd.del_flag", 0);
+        qw.orderByDesc("wd.create_time");
         return qw;
     }
 
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 6575ea58..2823937c 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
@@ -246,6 +246,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
         if (vo.getWarehouseId() != null) {
             WmsWarehouseVo warehouse = warehouseService.queryById(vo.getWarehouseId());
             vo.setWarehouse(warehouse);
+            vo.setWarehouseName(warehouse.getWarehouseName());
         }
 
         // 查询下一库区信息
@@ -259,6 +260,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
             WmsActualWarehouseVo actualWarehouse = actualWarehouseService.queryById(vo.getActualWarehouseId());
             if (actualWarehouse != null) {
                 vo.setActualWarehouseName(actualWarehouse.getActualWarehouseName());
+                vo.setActualWarehouse(actualWarehouse);
             }
         }