fix(wms/ShippingBill): 修复导出功能bug

ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsShippingBillVo.java

@@ -32,7 +32,7 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 发货单ID
      */
-    @ExcelProperty(value = "发货单ID")
+//    @ExcelProperty(value = "发货单ID")
     private Long shippingBillId;
 
     /**
@@ -44,59 +44,58 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 发货单类型
      */
-    @ExcelProperty(value = "发货单类型")
+    @ExcelProperty(value = "发货单类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=销售发货,2=调拨发货,3=其它发货")
     private String shippingType;
 
     /**
      * 发货方式：1公司仓库发货 2供应商代发货
      */
-    @ExcelProperty(value = "发货方式：1公司仓库发货 2供应商代发货")
+    @ExcelProperty(value = "发货方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=公司仓库发货,2=供应商代发货")
     private String shippingMode;
 
     /**
      * 绑定类型：1项目 2合同
      */
-    @ExcelProperty(value = "绑定类型：1项目 2合同")
+    @ExcelProperty(value = "绑定类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=项目,2=合同")
     private String bindType;
 
     /**
      * 项目ID
      */
-    @ExcelProperty(value = "项目ID")
+//    @ExcelProperty(value = "项目ID")
     private Long projectId;
 
     /**
      * 项目编号（冗余，方便导出）
      */
-    @ExcelProperty(value = "项目编号", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "项目编号")
     private String projectCode;
 
     /**
      * 项目名称（冗余，方便导出）
      */
-    @ExcelProperty(value = "项目名称", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "项目名称")
     private String projectName;
 
     /**
      * 客户ID（逻辑外键）
      */
-    @ExcelProperty(value = "客户ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逻=辑外键")
+//    @ExcelProperty(value = "客户ID")
     private Long customerId;
 
     /**
      * 客户联系人ID（逻辑外键）
      */
-    @ExcelProperty(value = "客户联系人ID")
+//    @ExcelProperty(value = "客户联系人ID")
     private Long customerContactId;
 
     /**
      * 客户名称（冗余，方便导出）
      */
-    @ExcelProperty(value = "客户名称", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "客户名称")
     private String customerName;
 
     /**
@@ -108,54 +107,49 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 关联单号
      */
-    @ExcelProperty(value = "关联单号")
+//    @ExcelProperty(value = "关联单号")
     private String inventoryAmount;
 
     /**
      * 来源单据类型（如PO采购订单、SO销售订单、PR项目采购申请等）
      */
-    @ExcelProperty(value = "来源单据类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "如=PO采购订单、SO销售订单、PR项目采购申请等")
+//    @ExcelProperty(value = "来源单据类型")
     private String sourceBillType;
 
     /**
      * 来源单据ID（逻辑外键，不建物理外键）
      */
-    @ExcelProperty(value = "来源单据ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逻=辑外键，不建物理外键")
+//    @ExcelProperty(value = "来源单据ID")
     private Long sourceBillId;
 
     /**
      * 来源单据编号
      */
-    @ExcelProperty(value = "来源单据编号")
+//    @ExcelProperty(value = "来源单据编号")
     private String sourceBillCode;
 
     /**
      * 合同ID（逻辑外键）
      */
-    @ExcelProperty(value = "合同ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逻=辑外键")
+//    @ExcelProperty(value = "合同ID")
     private Long contractId;
 
     /**
      * 合同编号（冗余，方便导出）
      */
-    @ExcelProperty(value = "合同编号", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "合同编号")
     private String contractCode;
 
     /**
      * 合同名称（冗余，方便导出）
      */
-    @ExcelProperty(value = "合同名称", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "合同名称")
     private String contractName;
 
     /**
      * SAP订单号（来源合同表，不入库）
      */
-    @ExcelProperty(value = "SAP订单号")
+//    @ExcelProperty(value = "SAP订单号")
     private String orderContractCode;
 
     /**
@@ -167,8 +161,7 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 供应商ID（逻辑外键）
      */
-    @ExcelProperty(value = "供应商ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "逻=辑外键")
+//    @ExcelProperty(value = "供应商ID")
     private Long supplierId;
 
     /**
@@ -222,8 +215,7 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 计划到货时间（冗余，用于未按时发货台账）
      */
-    @ExcelProperty(value = "计划到货时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，用于未按时发货台账")
+    @ExcelProperty(value = "计划到货时间")
     private Date planArrivalTime;
 
     /**
@@ -241,38 +233,40 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 业务完成时间（如SAP投料 / 内部流程完成）
      */
-    @ExcelProperty(value = "业务完成时间", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "如=SAP投料,/=,内=部流程完成")
+    @ExcelProperty(value = "业务完成时间")
     private Date completedTime;
 
     /**
      * 发货单状态(1暂存 2审批中 3完成)
      */
-    @ExcelProperty(value = "发货单状态(1暂存 2审批中 3完成)")
+//    @ExcelProperty(value = "发货单状态(1暂存 2审批中 3完成)", converter = ExcelDictConvert.class)
+//    @ExcelDictFormat(readConverterExp = "1=暂存,2=审批中,3=完成")
     private String outStockBillStatus;
 
     /**
      * 流程状态
      */
-    @ExcelProperty(value = "流程状态")
+//    @ExcelProperty(value = "流程状态")
     private String flowStatus;
 
     /**
      * 是否需要到货确认（1是 0否）
      */
-    @ExcelProperty(value = "是否需到货确认")
+    @ExcelProperty(value = "是否需到货确认", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=是,0=否")
     private String needArrivalConfirm;
 
     /**
      * 到货标识（0全部到货 1部分到货）
      */
-    @ExcelProperty(value = "到货标识")
+    @ExcelProperty(value = "到货标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=全部到货,1=部分到货")
     private String isAllReceiving;
 
     /**
      * 到货收货单附件OSS ID
      */
-    @ExcelProperty(value = "到货收货单附件")
+//    @ExcelProperty(value = "到货收货单附件")
     private String arrivalReceiptOssId;
 
     /**
@@ -300,27 +294,26 @@ public class WmsShippingBillVo implements Serializable {
     /**
      * 创建时间
      */
-    @ExcelProperty(value = "创建时间")
+//    @ExcelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 发货状态，字典shipping_status：1待发货 2已发货 3已收货 4已完成
      */
-    @ExcelProperty(value = "发货状态，字典shipping_status：1待发货 2已发货 3已收货 4已完成")
+    @ExcelProperty(value = "发货状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=待发货,2=已发货,3=已收货,4=已完成")
     private String shippingStatus;
 
     /**
      * 仓库ID（预留）
      */
-    @ExcelProperty(value = "仓库ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "预=留")
+//    @ExcelProperty(value = "仓库ID")
     private Long warehouseId;
 
     /**
      * 仓库名称（冗余，方便导出）
      */
-    @ExcelProperty(value = "仓库名称", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "冗=余，方便导出")
+    @ExcelProperty(value = "仓库名称")
     private String warehouseName;
 
     /**