feat(wms): 为VO类添加基础实体继承并增加数据类型字段

- WmsLeaveRequestVo继承BaseEntity类
- WmsMealReportVo继承BaseEntity类
- WmsMaterialCoilExportVo新增dataType字段
- 在WmsMaterialCoilMapper.xml中映射数据类型字段
- 实现历史数据处理逻辑，当dataType为0时将实际库区设为null

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;
 

klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java

@@ -166,4 +166,7 @@ public class WmsMaterialCoilExportVo {
      * 更新时间（仅临时存储，不导出，用于发货时间为空时兜底）
      */
     private Date updateTime;
+
+    // 数据类型
+    private Integer dataType;
 }

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;
 

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;
     }

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,
             -- 实际库区