From 14df649282089ed9621401cf21f8677fc9e97ffe Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Sat, 21 Mar 2026 10:17:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E4=BC=98=E5=8C=96=E5=8D=B7?=
 =?UTF-8?q?=E6=9D=90=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 ExcelDictFormat 注解，改用文本字段显示数据类型
- 添加 dataTypeText 字段用于存储历史/现存文本描述
- 添加 isRelatedToOrderText 字段用于存储是/否文本描述
- 在服务层实现数据类型转换逻辑，将数字值转为对应文本
- 在服务层实现订单关联状态转换逻辑，将数字值转为对应文本
- 保持原有的 Excel 导出功能完整性
---
 .../com/klp/domain/vo/WmsMaterialCoilAllExportVo.java | 10 ++++++----
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java  | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
index b8a715d8..21ecdc4f 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
@@ -174,10 +174,11 @@ public class WmsMaterialCoilAllExportVo {
     private Date updateTime;
 
     // 数据类型
-    @ExcelProperty(value = "数据类型")
-    @ExcelDictFormat(readConverterExp = "0=历史,1=现存")
     private Integer dataType;
 
+    @ExcelProperty(value = "数据类型")
+    private String dataTypeText;
+
     // 调制度
     @ExcelProperty(value = "调制度")
     private String temperGrade;
@@ -190,7 +191,8 @@ public class WmsMaterialCoilAllExportVo {
     private String businessPurpose;
 
     // 是否与订单相关 readConverterExp
-    @ExcelProperty(value = "是否与订单相关")
-    @ExcelDictFormat(readConverterExp = "0=否,1=是")
     private Integer isRelatedToOrder;
+
+    @ExcelProperty(value = "是否与订单相关")
+    private String isRelatedToOrderText;
 }
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 a588f67a..5602c8bf 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
@@ -2498,6 +2498,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                 if (Objects.equals(vo.getDataType(), 0)) {
                     vo.setActualWarehouseName(null);
                 }
+                // 转换数据类型：0=历史,1=现存
+                if (vo.getDataType() != null) {
+                    String dataTypeText = vo.getDataType() == 0 ? "历史" : "现存";
+                    vo.setDataTypeText(dataTypeText);
+                }
+
+                // 转换是否与订单相关：0=否,1=是
+                if (vo.getIsRelatedToOrder() != null) {
+                    String isRelatedText = vo.getIsRelatedToOrder() == 0 ? "否" : "是";
+                    vo.setIsRelatedToOrderText(isRelatedText);
+                }
             }
         }