已完成已作废的作业不能再次操作，主子表刷新问题，导出字典国际化

ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java

@@ -19,79 +19,79 @@ public class BasCustomer extends BaseEntity
     private String id;
 
     /** 客户编号 */
-    @Excel(name = "客户编号")
+    @Excel(name = "${bas.Customer.customerNo}")
     private String customerNo;
 
     /** 客户基本分类 */
-    @Excel(name = "客户基本分类")
+    @Excel(name = "${bas.Customer.customerGroupNo}")
     private String customerGroupNo;
 
     /** 客户名称 */
-    @Excel(name = "客户名称")
+    @Excel(name = "${bas.Customer.customerName}")
     private String customerName;
 
     /** 客户简称 */
-    @Excel(name = "客户简称")
+    @Excel(name = "${bas.Customer.simpleName}")
     private String simpleName;
 
     /** 是否可用 */
-    @Excel(name = "是否可用")
+    @Excel(name = "${bas.Customer.useable}")
     private String useable;
 
     /** 业务部门 */
-    @Excel(name = "业务部门")
+    @Excel(name = "${bas.Customer.businessDepartment}")
     private String businessDepartment;
 
     /** 业务员 */
-    @Excel(name = "业务员")
+    @Excel(name = "${bas.Customer.salesman}")
     private String salesman;
 
     /** 助忆码 */
-    @Excel(name = "助忆码")
+    @Excel(name = "${bas.Customer.mnemonicCode}")
     private String mnemonicCode;
 
     /** 客户类型 */
-    @Excel(name = "客户类型")
+    @Excel(name = "${bas.Customer.type}")
     private String type;
 
     /** 纳税人登记号 */
-    @Excel(name = "纳税人登记号")
+    @Excel(name = "${bas.Customer.taxpayerRegistrationNumber}")
     private String taxpayerRegistrationNumber;
 
     /** 对应财务组织 */
-    @Excel(name = "对应财务组织")
+    @Excel(name = "${bas.Customer.organization}")
     private String organization;
 
     /** 上级客户 */
-    @Excel(name = "上级客户")
+    @Excel(name = "${bas.Customer.supCustomer}")
     private String supCustomer;
 
     /** 散户 */
-    @Excel(name = "散户")
+    @Excel(name = "${bas.Customer.retailInvestor}")
     private String retailInvestor;
 
     /** 国家/地区 */
-    @Excel(name = "国家/地区")
+    @Excel(name = "${bas.Customer.country}")
     private String country;
 
     /** 时区 */
-    @Excel(name = "时区")
+    @Excel(name = "${bas.Customer.timeZone}")
     private String timeZone;
 
     /** 数据格式 */
-    @Excel(name = "数据格式")
+    @Excel(name = "${bas.Customer.dataFormat}")
     private String dataFormat;
 
     /** 联系人姓名 */
-    @Excel(name = "联系人姓名")
+    @Excel(name = "${bas.Customer.contactName}")
     private String contactName;
 
     /** 发货国家 */
-    @Excel(name = "发货国家")
+    @Excel(name = "${bas.Customer.shipment}")
     private String shipment;
 
     /** 税类 */
-    @Excel(name = "税类")
+    @Excel(name = "${bas.Customer.taxCategory}")
     private String taxCategory;
 
     public void setId(String id) 

ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java

@@ -23,65 +23,65 @@ public class BasProduct extends BaseEntity
     private String productGuid;
 
     /** 物料编码 */
-    @Excel(name = "物料编码")
+    @Excel(name = "${bas.Product.productId}")
     private String productId;
 
     /** 父节点id */
-    @Excel(name = "父节点id")
+    @Excel(name = "${bas.Product.parentId}")
     private String parentId;
 
     /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${bas.Product.price}")
     private String price;
 
     /** 品牌 */
-    @Excel(name = "品牌")
+    @Excel(name = "${bas.Product.cargoNo}")
     private String cargoNo;
 
     /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${bas.Product.unit}")
     private String unit;
 
     /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${bas.Product.spec}")
     private String spec;
 
     /** 备用字段1 */
-    @Excel(name = "备用字段1")
+    @Excel(name = "${bas.Product.spare1}")
     private String spare1;
 
     /** 备用字段2 */
-    @Excel(name = "备用字段2")
+    @Excel(name = "${bas.Product.spare2}")
     private String spare2;
 
     /** 备用字段3 */
-    @Excel(name = "备用字段3")
+    @Excel(name = "${bas.Product.spare3}")
     private String spare3;
 
     /** 备用字段4 */
-    @Excel(name = "备用字段4")
+    @Excel(name = "${bas.Product.spare4}")
     private String spare4;
 
     /** 备用字段5 */
-    @Excel(name = "备用字段5")
+    @Excel(name = "${bas.Product.spare5}")
     private String spare5;
 
     /** 备用字段6 */
-    @Excel(name = "备用字段6")
+    @Excel(name = "${bas.Product.spare6}")
     private String spare6;
 
     /** 备用字段6 */
-    @Excel(name = "备用字段7")
+    @Excel(name = "${bas.Product.spare7}")
     private String spare7;
     /** 备用字段6 */
-    @Excel(name = "备用字段8")
+    @Excel(name = "${bas.Product.spare8}")
     private String spare8;
     /** 备用字段6 */
-    @Excel(name = "备用字段9")
+    @Excel(name = "${bas.Product.spare9}")
     private String spare9;
 
     /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${bas.Product.productName}")
     private String productName;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java

@@ -19,71 +19,71 @@ public class BasSupplier extends BaseEntity
     private String id;
 
     /**  供应商编号 */
-    @Excel(name = " 供应商编号")
+    @Excel(name = "${bas.Supplier.supplierNo}")
     private String supplierNo;
 
     /** 供应商名称 */
-    @Excel(name = "供应商名称")
+    @Excel(name = "${bas.Supplier.supplierGroupNo}")
     private String supplierGroupNo;
 
     /** 供应商名称 */
-    @Excel(name = "供应商名称")
+    @Excel(name = "${bas.Supplier.supplierName}")
     private String supplierName;
 
     /** 简称 */
-    @Excel(name = "简称")
+    @Excel(name = "${bas.Supplier.simpleName}")
     private String simpleName;
 
     /** 是否可用 */
-    @Excel(name = "是否可用")
+    @Excel(name = "${bas.Supplier.useable}")
     private String useable;
 
     /** 地区分类 */
-    @Excel(name = "地区分类")
+    @Excel(name = "${bas.Supplier.supplierArae}")
     private String supplierArae;
 
     /** 纳税人登记号 */
-    @Excel(name = "纳税人登记号")
+    @Excel(name = "${bas.Supplier.taxpayerRegistrationNumber}")
     private String taxpayerRegistrationNumber;
 
     /** 国家 */
-    @Excel(name = "国家")
+    @Excel(name = "${bas.Supplier.country}")
     private String country;
 
     /** 时区 */
-    @Excel(name = "时区")
+    @Excel(name = "${bas.Supplier.timeZone}")
     private String timeZone;
 
     /** 数据格式 */
-    @Excel(name = "数据格式")
+    @Excel(name = "${bas.Supplier.dataFormat}")
     private String dataFormat;
 
     /** 收货国家 */
-    @Excel(name = "收货国家")
+    @Excel(name = "${bas.Supplier.receivingCountry}")
     private String receivingCountry;
 
     /** 税类 */
-    @Excel(name = "税类")
+    @Excel(name = "${bas.Supplier.taxCategory}")
     private String taxCategory;
 
     /** 法人 */
-    @Excel(name = "法人")
+    @Excel(name = "${bas.Supplier.legalPerson}")
     private String legalPerson;
 
     /** 注册资金 */
-    @Excel(name = "注册资金")
+    @Excel(name = "${bas.Supplier.registeredCapital}")
     private String registeredCapital;
 
     /** 企业地址 */
-    @Excel(name = "企业地址")
+    @Excel(name = "${bas.Supplier.address}")
     private String address;
 
     /** 联系人姓名 */
-    @Excel(name = "联系人姓名")
+    @Excel(name = "${bas.Supplier.contactName}")
     private String contactName;
 
     /** 联系电话 */
-    @Excel(name = "联系电话")
+    @Excel(name = "${bas.Supplier.contactNumber}")
     private String contactNumber;
 
     public void setId(String id) 

ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java

@@ -26,77 +26,77 @@ public class BasCargoSpace extends BaseEntity {
     private String cargoSpaceId;
 
     /** 仓库id（不允许为空） */
-    @Excel(name = "仓库id", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.warehouseId}")
     private String warehouseId;
     private String warehouseName;
 
     /** 巷道id（允许为空） */
-    @Excel(name = "巷道id", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.CargoSpace.roadwayId}")
     private String roadwayId;
 
     /** 货区id（允许为空） */
-    @Excel(name = "货区id", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.CargoSpace.cargoAreaId}")
     private String cargoAreaId;
 
     /** 货位类型（允许为空） */
-    @Excel(name = "货位类型", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.CargoSpace.theType}")
     private String theType;
 
     /** 货位类型名称 */
-    @Excel(name = "货位类型名称")
+    @Excel(name = "${bas.CargoSpace.theTypeName}")
     private String theTypeName;
 
     /** 货位名称（不允许为空） */
-    @Excel(name = "货位名称", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.cargoSpaceName}")
     private String cargoSpaceName;
 
     /** 排（不允许为空） */
-    @Excel(name = "排", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.thePlatoon}")
     private Long thePlatoon;
 
     /** 列（不允许为空） */
-    @Excel(name = "列", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.theColumn}")
     private Long theColumn;
 
     /** 层（不允许为空） */
-    @Excel(name = "层", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.theFloor}")
     private Long theFloor;
 
     /** 货位状态1空2满 */
-    @Excel(name = "货位状态1空2满")
+    @Excel(name = "${bas.CargoSpace.status}")
     private String status;
 
     /** 是否锁定（不允许为空）
 Y锁、N开 */
-    @Excel(name = "是否锁定", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.CargoSpace.locked}")
     private String locked;
 
     /** 托盘条码（允许为空） */
-    @Excel(name = "托盘条码", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.CargoSpace.trayCode}")
     private String trayCode;
 
     /** 货位高度 */
-    @Excel(name = "货位高度")
+    @Excel(name = "${bas.CargoSpace.cargoHight}")
     private String cargoHight;
 
     /** 是否双伸 Y N  */
-    @Excel(name = "是否双伸 Y N ")
+    @Excel(name = "${bas.CargoSpace.issDouble}")
     private String issDouble;
 
     /** 双货位分组编码（标识区分） */
-    @Excel(name = "双货位分组编码", readConverterExp = "标=识区分")
+    @Excel(name = "${bas.CargoSpace.groupCodingNo}")
     private String groupCodingNo;
 
     /** 双货位分组编码1、2…  */
-    @Excel(name = "双货位分组编码1、2… ")
+    @Excel(name = "${bas.CargoSpace.groupCoding}")
     private String groupCoding;
 
     /** 双货位标识 0 外1内 */
-    @Excel(name = "双货位标识 0 外1内")
+    @Excel(name = "${bas.CargoSpace.cargoSpaceLogo}")
     private String cargoSpaceLogo;
 
     /** 本仓库区域 1--8 A9--15 B */
-    @Excel(name = "本仓库区域 1--8 A9--15 B")
+    @Excel(name = "${bas.CargoSpace.thisCargoArea}")
     private String thisCargoArea;
 
 //    @Override

ruoyi-admin/src/main/java/com/ruoyi/bas/container/domain/BasContainer.java

@@ -25,27 +25,27 @@ public class BasContainer extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 容器编号 */
-    @Excel(name = "容器编号")
+    @Excel(name = "${bas.Container.containerId}")
     private String containerId;
 
     /** 点位名称 */
-    @Excel(name = "点位名称")
+    @Excel(name = "${bas.Container.portName}")
     private String portName;
 
     /** 容器状态 */
-    @Excel(name = "容器状态")
+    @Excel(name = "${bas.Container.status}")
     private Long status;
 
     /** 物料种类数量 */
-    @Excel(name = "物料种类")
+    @Excel(name = "${bas.Container.productTypeQuantity}")
     private String productTypeQuantity;
 
     /** 容量（可存放料箱数量） */
-    @Excel(name = "容量", readConverterExp = "可存放料箱数量")
+    @Excel(name = "${bas.Container.capacity}")
     private Long capacity;
 
     /** 操作人 */
-    @Excel(name = "操作人")
+    @Excel(name = "${bas.Container.operationMan}")
     private String operationMan;
 
     /** 备用 */

ruoyi-admin/src/main/java/com/ruoyi/bas/port/domain/BasProductPort.java

@@ -21,19 +21,19 @@ public class BasProductPort extends BaseEntity
     private String id;
 
     /** 点位名称 */
-    @Excel(name = "点位名称")
+    @Excel(name = "${bas.ProductPort.portName}")
     private String portName;
 
     /** 点位分类 */
-    @Excel(name = "点位分类")
+    @Excel(name = "${bas.ProductPort.portType}")
     private String portType;
 
     /** 点位描述 */
-    @Excel(name = "点位描述")
+    @Excel(name = "${bas.ProductPort.portDesc}")
     private String portDesc;
 
     /** 创建人 */
-    @Excel(name = "创建人")
+    @Excel(name = "${bas.ProductPort.createMan}")
     private String createMan;
     private String warehouseId;
 

ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java

@@ -16,27 +16,28 @@ public class BasTraycode extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** id */
+    @Excel(name = "${bas.Traycode.id}")
     private Long id;
 
     /** 条码类型id */
-    @Excel(name = "条码类型id")
+    @Excel(name = "${bas.Traycode.formatId}")
     private Long formatId;
     private String formatName;
 
     /** 条码 */
-    @Excel(name = "条码")
+    @Excel(name = "${bas.Traycode.trayCode}")
     private String trayCode;
 
     /** 备用字段1 */
-    @Excel(name = "备用字段1")
+    @Excel(name = "${bas.Traycode.spare1}")
     private String spare1;
 
     /** 备用字段2 */
-    @Excel(name = "备用字段2")
+    @Excel(name = "${bas.Traycode.spare2}")
     private String spare2;
 
     /** 备用字段3 */
-    @Excel(name = "备用字段3")
+    @Excel(name = "${bas.Traycode.spare3}")
     private String spare3;
 
     public String getFormatName() {

ruoyi-admin/src/main/java/com/ruoyi/bas/traycodeformat/domain/BasTraycodeFormat.java

@@ -19,39 +19,39 @@ public class BasTraycodeFormat extends BaseEntity
     private Long id;
 
     /** 条码前缀 */
-    @Excel(name = "条码前缀")
+    @Excel(name = "${bas.TraycodeFormat.barcodeFormat}")
     private String barcodeFormat;
 
     /** 流水号 */
-    @Excel(name = "流水号")
+    @Excel(name = "${bas.TraycodeFormat.serialRule}")
     private String serialRule;
 
     /** 条码样例 */
-    @Excel(name = "条码样例")
+    @Excel(name = "${bas.TraycodeFormat.serialExample}")
     private String serialExample;
 
     /** 描述 */
-    @Excel(name = "描述")
+    @Excel(name = "${bas.TraycodeFormat.remarks}")
     private String remarks;
 
     /** 最小流水号 */
-    @Excel(name = "最小流水号")
+    @Excel(name = "${bas.TraycodeFormat.minNum}")
     private Long minNum;
 
     /** 最大流水号 */
-    @Excel(name = "最大流水号")
+    @Excel(name = "${bas.TraycodeFormat.maxNum}")
     private Long maxNum;
 
     /** 备用字段1 */
-    @Excel(name = "备用字段1")
+    @Excel(name = "${bas.TraycodeFormat.spare1}")
     private String spare1;
 
     /** 备用字段2 */
-    @Excel(name = "备用字段2")
+    @Excel(name = "${bas.TraycodeFormat.spare2}")
     private String spare2;
 
     /** 备用字段3 */
-    @Excel(name = "备用字段3")
+    @Excel(name = "${bas.TraycodeFormat.spare3}")
     private String spare3;
 
     public void setId(Long id) 

ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java

@@ -2,9 +2,8 @@ package com.ruoyi.bas.warehouse.domain;
 
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.List;
 
@@ -14,69 +13,172 @@ import java.util.List;
  * @author lsy
  * @date 2025-05-20
  */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
 public class BasWarehouse extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** id（主键不允许为空）主键 */
-    @Excel(name = "id", readConverterExp = "主=键不允许为空")
+    @Excel(name = "${bas.Warehouse.warehouseId}")
     private String warehouseId;
 
     /** 仓库id（不允许为空） */
-    @Excel(name = "仓库id", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.Warehouse.warehouseNo}")
     private String warehouseNo;
 
     /** 项目编号 */
-    @Excel(name = "项目编号")
+    @Excel(name = "${bas.Warehouse.projectNo}")
     private String projectNo;
 
     /** 仓库名称（不允许为空） */
-    @Excel(name = "仓库名称", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.Warehouse.warehouseName}")
     private String warehouseName;
 
     /** 仓库地址（允许为空） */
-    @Excel(name = "仓库地址", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.Warehouse.address}")
     private String address;
 
     /** 仓库描述（允许为空） */
-    @Excel(name = "仓库描述", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.Warehouse.cDesc}")
     private String cDesc;
 
     /** 仓库级别（允许为空）1、2 */
-    @Excel(name = "仓库级别", readConverterExp = "允=许为空")
+    @Excel(name = "${bas.Warehouse.warehouseKind}")
     private String warehouseKind;
 
     /** 仓库类型 */
-    @Excel(name = "仓库类型")
+    @Excel(name = "${bas.Warehouse.warehouseType}")
     private String warehouseType;
 
     /** 是否可用（不允许为空）Y、N */
-    @Excel(name = "是否可用", readConverterExp = "不=允许为空")
+    @Excel(name = "${bas.Warehouse.isCurrent}")
     private String isCurrent;
 
     /*仓库数据权限*/
     private List<String> dataScope;
     private List<String> typeData;
 
+    public void setWarehouseId(String warehouseId) 
+    {
+        this.warehouseId = warehouseId;
+    }
 
+    public String getWarehouseId() 
+    {
+        return warehouseId;
+    }
 
+    public void setWarehouseNo(String warehouseNo) 
+    {
+        this.warehouseNo = warehouseNo;
+    }
 
+    public String getWarehouseNo() 
+    {
+        return warehouseNo;
+    }
 
-//    @Override
-//    public String toString() {
-//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-//            .append("warehouseId", getWarehouseId())
-//            .append("warehouseNo", getWarehouseNo())
-//            .append("projectNo", getProjectNo())
-//            .append("warehouseName", getWarehouseName())
-//            .append("address", getAddress())
-//            .append("cDesc", getcDesc())
-//            .append("warehouseKind", getWarehouseKind())
-//            .append("warehouseType", getWarehouseType())
-//            .append("isCurrent", getIsCurrent())
-//            .toString();
-//    }
+    public void setProjectNo(String projectNo) 
+    {
+        this.projectNo = projectNo;
+    }
+
+    public String getProjectNo() 
+    {
+        return projectNo;
+    }
+
+    public void setWarehouseName(String warehouseName) 
+    {
+        this.warehouseName = warehouseName;
+    }
+
+    public String getWarehouseName() 
+    {
+        return warehouseName;
+    }
+
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+
+    public void setCDesc(String cDesc) 
+    {
+        this.cDesc = cDesc;
+    }
+
+    public String getCDesc() 
+    {
+        return cDesc;
+    }
+
+    public void setWarehouseKind(String warehouseKind) 
+    {
+        this.warehouseKind = warehouseKind;
+    }
+
+    public String getWarehouseKind() 
+    {
+        return warehouseKind;
+    }
+
+    public void setWarehouseType(String warehouseType) 
+    {
+        this.warehouseType = warehouseType;
+    }
+
+    public String getWarehouseType() 
+    {
+        return warehouseType;
+    }
+
+    public void setIsCurrent(String isCurrent) 
+    {
+        this.isCurrent = isCurrent;
+    }
+
+    public String getIsCurrent() 
+    {
+        return isCurrent;
+    }
+
+    public void setDataScope(List<String> dataScope) 
+    {
+        this.dataScope = dataScope;
+    }
+
+    public List<String> getDataScope() 
+    {
+        return dataScope;
+    }
+
+    public void setTypeData(List<String> typeData) 
+    {
+        this.typeData = typeData;
+    }
+
+    public List<String> getTypeData() 
+    {
+        return typeData;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("warehouseId", getWarehouseId())
+            .append("warehouseNo", getWarehouseNo())
+            .append("projectNo", getProjectNo())
+            .append("warehouseName", getWarehouseName())
+            .append("address", getAddress())
+            .append("cDesc", getCDesc())
+            .append("warehouseKind", getWarehouseKind())
+            .append("warehouseType", getWarehouseType())
+            .append("isCurrent", getIsCurrent())
+            .toString();
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/stock/freeze/domain/BasStockFreezeRecord.java

@@ -19,69 +19,71 @@ public class BasStockFreezeRecord extends BaseEntity
     private String whGuid;
 
     /** 库存编码 */
-    @Excel(name = "库存编码")
+    @Excel(name = "${stock.Freeze.stockId}")
     private String stockId;
 
     /** 货位编码 */
-    @Excel(name = "货位编码")
+    @Excel(name = "${stock.Freeze.cargoSpaceId}")
     private String cargoSpaceId;
+    /** 货位名称 */
+    @Excel(name = "${stock.Freeze.cargoSpaceName}")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "托盘条码")
+    @Excel(name = "${stock.Freeze.trayCode}")
     private String trayCode;
 
     /** 物品编码 */
-    @Excel(name = "物品编码")
+    @Excel(name = "${stock.Freeze.productId}")
     private String productId;
 
     /** 物品名称 */
-    @Excel(name = "物品名称")
+    @Excel(name = "${stock.Freeze.productName}")
     private String productName;
 
     /** 生产日期 */
-    @Excel(name = "生产日期")
+    @Excel(name = "${stock.Freeze.printDate}")
     private String printDate;
 
     /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${stock.Freeze.lotNo}")
     private String lotNo;
 
     /** 初始状态 */
-    @Excel(name = "初始状态")
+    @Excel(name = "${stock.Freeze.oldStatus}")
     private String oldStatus;
 
     /** 更改状态 */
-    @Excel(name = "更改状态")
+    @Excel(name = "${stock.Freeze.currStatus}")
     private String currStatus;
 
     /** 操作 */
-    @Excel(name = "操作")
+    @Excel(name = "${stock.Freeze.method}")
     private String method;
 
     /** 仓库 */
-    @Excel(name = "仓库")
+    @Excel(name = "${stock.Freeze.warehouseId}")
     private String warehouseId;
     private String warehouseName;
 
     /** 库存字表id */
-    @Excel(name = "库存字表id")
+    @Excel(name = "${stock.Freeze.stockDetailId}")
     private String stockDetailId;
 
     /** 操作目标 */
-    @Excel(name = "操作目标")
+    @Excel(name = "${stock.Freeze.operatingTarget}")
     private String operatingTarget;
 
     /** 条码数量（旧） */
-    @Excel(name = "条码数量", readConverterExp = "旧=")
+    @Excel(name = "${stock.Freeze.barCodeOldQuantity}")
     private String barCodeOldQuantity;
 
     /** 条码数量（新） */
-    @Excel(name = "条码数量", readConverterExp = "新=")
+    @Excel(name = "${stock.Freeze.barCodeQuantity}")
     private String barCodeQuantity;
 
     /** 物料guid */
-    @Excel(name = "物料guid")
+    @Excel(name = "${stock.Freeze.productGuid}")
     private String productGuid;
 
     public String getWarehouseName() {

ruoyi-admin/src/main/java/com/ruoyi/stock/maintain/domain/BasStockMaintainRecord.java

@@ -19,69 +19,71 @@ public class BasStockMaintainRecord extends BaseEntity
     private String whGuid;
 
     /** 库存编码 */
-    @Excel(name = "库存编码")
+    @Excel(name = "${stock.Maintain.stockId}")
     private String stockId;
 
     /** 货位编码 */
-    @Excel(name = "货位编码")
+    @Excel(name = "${stock.Maintain.cargoSpaceId}")
     private String cargoSpaceId;
+    /** 货位名称 */
+    @Excel(name = "${stock.Maintain.cargoSpaceName}")
     private String cargoSpaceName;
 
     /** 托盘条码 */
-    @Excel(name = "托盘条码")
+    @Excel(name = "${stock.Maintain.trayCode}")
     private String trayCode;
 
     /** 物品编码 */
-    @Excel(name = "物品编码")
+    @Excel(name = "${stock.Maintain.productId}")
     private String productId;
 
     /** 物品名称 */
-    @Excel(name = "物品名称")
+    @Excel(name = "${stock.Maintain.productName}")
     private String productName;
 
     /** 生产日期 */
-    @Excel(name = "生产日期")
+    @Excel(name = "${stock.Maintain.printDate}")
     private String printDate;
 
     /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${stock.Maintain.lotNo}")
     private String lotNo;
 
     /** 初始数量 */
-    @Excel(name = "初始数量")
+    @Excel(name = "${stock.Maintain.oldQuantity}")
     private String oldQuantity;
 
     /** 操作后数量 */
-    @Excel(name = "操作后数量")
+    @Excel(name = "${stock.Maintain.quantity}")
     private String quantity;
 
     /** 操作 */
-    @Excel(name = "操作")
+    @Excel(name = "${stock.Maintain.method}")
     private String method;
 
     /** 仓库 */
-    @Excel(name = "仓库")
+    @Excel(name = "${stock.Maintain.warehouseId}")
     private String warehouseId;
     private String warehouseName;
 
     /** 库存字表id */
-    @Excel(name = "库存字表id")
+    @Excel(name = "${stock.Maintain.stockDetailId}")
     private String stockDetailId;
 
     /** 操作目标 */
-    @Excel(name = "操作目标")
+    @Excel(name = "${stock.Maintain.operatingTarget}")
     private String operatingTarget;
 
     /** 条码数量（旧） */
-    @Excel(name = "条码数量", readConverterExp = "旧=")
+    @Excel(name = "${stock.Maintain.barCodeOldQuantity}")
     private String barCodeOldQuantity;
 
     /** 条码数量（新） */
-    @Excel(name = "条码数量", readConverterExp = "新=")
+    @Excel(name = "${stock.Maintain.barCodeQuantity}")
     private String barCodeQuantity;
 
     /** 物料guid */
-    @Excel(name = "物料guid")
+    @Excel(name = "${stock.Maintain.productGuid}")
     private String productGuid;
 
     public String getWarehouseName() {

ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java

@@ -1,5 +1,6 @@
 package com.ruoyi.stock.stock.domain;
 
+import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.domain.ExtraField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -19,116 +20,167 @@ public class BasStock extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 库存id */
-    @Excel(name = "库存id")
+    @Excel(name = "${stock.BasStock.stockId}")
     private String stockId;
 
     /** 货位id */
-    @Excel(name = "货位id")
+    @Excel(name = "${stock.BasStock.cargoSpaceId}")
     private String cargoSpaceId;
+    /** 货位名称 */
+    @Excel(name = "${stock.BasStock.cargoSpaceName}")
     private String cargoSpaceName;
 
     /** 库存状态 */
-    @Excel(name = "库存状态")
+    @Excel(name = "${stock.BasStock.stockStatus}", dictType = "stock_status")
     private String stockStatus;
+    //货位库存状态
+    @Excel(name = "${stock.BasStock.cargoSpaceStockStatus}", dictType = "cargo_space_status")
+    private String cargoSpaceStockStatus;
+    //货位是否锁定
+    @Excel(name = "${stock.BasStock.cargoSpaceStatus}", dictType = "cargo_space_lock_status")
+    private String cargoSpaceStatus;
 
     /** 物料状态 */
-    @Excel(name = "物料状态")
+    @Excel(name = "${stock.BasStock.productStatus}", dictType = "product_status")
     private String productStatus;
 
-    /** 批次号 */
-    @Excel(name = "批次号")
-    private String lotNo;
+    //额外字段
+    @Excels({
+            @Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 物料编码
+            @Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 物料描述
+            @Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
+            @Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
+            @Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
+            @Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
+            @Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
+            @Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
+    })
+    private ExtraField extraField;
 
-    /** 入库时间 */
-    @Excel(name = "入库时间")
-    private String inDate;
+    /** 物料编码 */
+//    @Excel(name = "${stock.BasStock.productId}")
+    private String productId;
 
-    /** 回流时间 */
-    @Excel(name = "回流时间")
-    private String backDate;
+    //物料描述
+//    @Excel(name = "${stock.BasStock.materialDesc}")
+    private String materialDesc;
 
-    /** 物料GUID */
-    @Excel(name = "物料GUID")
-    private String productGuid;
+    //物料英文描述
+//    @Excel(name = "${stock.BasStock.englishDesc}")
+    private String spare1;
+
+    //净重
+//    @Excel(name = "${stock.BasStock.netWeight}")
+    private String spare2;
+
+    //长度
+//    @Excel(name = "${stock.BasStock.length}")
+    private String spare5;
+
+    //宽度
+//    @Excel(name = "${stock.BasStock.width}")
+    private String spare6;
+
+    //高度
+//    @Excel(name = "${stock.BasStock.height}")
+    private String spare7;
+
+    //体积
+//    @Excel(name = "${stock.BasStock.volume}")
+    private String spare8;
 
     /** 库存数量 */
-    @Excel(name = "库存数量")
+    @Excel(name = "${stock.BasStock.quantity}")
     private String quantity;
 
     /** 作业ID */
-    @Excel(name = "作业ID")
+    @Excel(name = "${stock.BasStock.jobId}")
     private String jobId;
 
     /** 托盘条码 */
-    @Excel(name = "托盘条码")
+    @Excel(name = "${stock.BasStock.trayCode}")
     private String trayCode;
 
-    /** 出库数量 */
-    @Excel(name = "出库数量")
-    private String outQuantity;
-
-    /** 入库子单id */
-    @Excel(name = "入库子单id")
-    private String stockinDetailId;
-
     /** 入库主单 */
-    @Excel(name = "入库主单")
+    @Excel(name = "${stock.BasStock.stockinId}")
     private String stockinId;
 
+    /** 入库子单id */
+    @Excel(name = "${stock.BasStock.stockinDetailId}")
+    private String stockinDetailId;
+
     /** 入库类型 */
-    @Excel(name = "入库类型")
+    @Excel(name = "${stock.BasStock.inType}")
     private String inType;
 
+    /** 仓库名称 */
+    @Excel(name = "${stock.BasStock.warehouseName}")
+    private String warehouseName;
+
+    /** 入库时间 */
+    @Excel(name = "${stock.BasStock.inDate}")
+    private String inDate;
+
+    /** 批次号 */
+//     @Excel(name = "${stock.BasStock.lotNo}")
+    private String lotNo;
+
+    /** 回流时间 */
+//     @Excel(name = "${stock.BasStock.backDate}")
+    private String backDate;
+
+    /** 物料GUID */
+//     @Excel(name = "${stock.BasStock.productGuid}")
+    private String productGuid;
+
+    /** 出库数量 */
+//     @Excel(name = "${stock.BasStock.outQuantity}")
+    private String outQuantity;
+
     /** 入库班组ID */
-    @Excel(name = "入库班组ID")
+//     @Excel(name = "${stock.BasStock.inClassId}")
     private String inClassId;
 
     /** 仓库 */
-    @Excel(name = "仓库Id")
+//     @Excel(name = "${stock.BasStock.warehouseId}")
     private String warehouseId;
-    @Excel(name = "仓库")
-    private String warehouseName;
+
 
     /** 垛型ID */
-    @Excel(name = "垛型ID")
+//     @Excel(name = "${stock.BasStock.stackingId}")
     private String stackingId;
 
-    /** 备用字段1 */
-    @Excel(name = "备用字段1")
-    private String spare1;
-
-    /** 备用字段2 */
-    @Excel(name = "备用字段2")
-    private String spare2;
-
     /** 备用字段3 */
-    @Excel(name = "备用字段3")
+//     @Excel(name = "${stock.BasStock.spare3}")
     private String spare3;
 
     /** 备用字段4 */
-    @Excel(name = "备用字段4")
+//     @Excel(name = "${stock.BasStock.spare4}")
     private String spare4;
 
-    /** 备用字段5 */
-    @Excel(name = "备用字段5")
-    private String spare5;
 
-    /** 备用字段6 */
-    @Excel(name = "备用字段6")
-    private String spare6;
-    //额外字段
-    private ExtraField extraField;
     //物料名称
+//    @Excel(name = "物料名称")
     private String productName;
-    //货位是否锁定
-    private String cargoSpaceStatus;
-    //货位库存状态
-    private String cargoSpaceStockStatus;
-
-    private String productId;
 
     private List<String> typeData;
 
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
     public List<String> getTypeData() {
         return typeData;
     }
@@ -145,6 +197,15 @@ public class BasStock extends BaseEntity
         this.productId = productId;
     }
 
+    public void setMaterialDesc(String materialDesc) {
+        this.materialDesc = materialDesc;
+    }
+
+    public String getMaterialDesc() {
+        return materialDesc;
+    }
+
+
     public String getCargoSpaceStockStatus() {
         return cargoSpaceStockStatus;
     }