From c408d15f854b363727198c0cbf2ccd777babdd6e Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 17 Jan 2026 10:18:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=B8=BAVO=E7=B1=BB=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=9F=BA=E7=A1=80=E5=AE=9E=E4=BD=93=E7=BB=A7=E6=89=BF?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- WmsLeaveRequestVo继承BaseEntity类
- WmsMealReportVo继承BaseEntity类
- WmsMaterialCoilExportVo新增dataType字段
- 在WmsMaterialCoilMapper.xml中映射数据类型字段
- 实现历史数据处理逻辑，当dataType为0时将实际库区设为null
---
 .../src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java   | 3 ++-
 .../main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java | 3 +++
 klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java | 3 ++-
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java     | 5 +++++
 .../src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml  | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java
index 3a3e3aa7..d44e2b7a 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java
@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -18,7 +19,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsLeaveRequestVo {
+public class WmsLeaveRequestVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
index 9624b5fa..928c630e 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java
@@ -166,4 +166,7 @@ public class WmsMaterialCoilExportVo {
      * 更新时间（仅临时存储，不导出，用于发货时间为空时兜底）
      */
     private Date updateTime;
+
+    // 数据类型
+    private Integer dataType;
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java
index 668c4c15..5a9faba7 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMealReportVo.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -17,7 +18,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsMealReportVo {
+public class WmsMealReportVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
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 0a1c3bc5..b324a0e4 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
@@ -2210,6 +2210,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 vo.setCreateTime(finalDate);
             }
             // 非1的情况，保持原有create_time不变
+
+            // 如果是dataType=0的历史数据，将实际库区设置为null
+            if (vo.getDataType() != null && vo.getDataType() == 0) {
+                vo.setActualWarehouseName(null);
+            }
         });
         return wmsMaterialCoilExportVos;
     }
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
index d74429fe..9b28ee82 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml
@@ -350,6 +350,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             END AS itemTypeDesc,
             -- 物品ID
             mc.item_id AS itemId,
+            -- 数据类型
+            mc.data_type AS dataType,
             -- 逻辑库区
             w.warehouse_name AS warehouseName,
             -- 实际库区