库存安全查询，预警查询字段修改，国际化。查询统计所有导出的国际化

2025-08-06 17:41:26 +08:00
parent 8aecea0a78
commit 37e026adb7
30 changed files with 2879 additions and 1725 deletions
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
@@ -20,71 +20,71 @@ public class StockSummary extends BaseEntity
    private Long onlyIdentity;

    /** 物料编码 */
-    @Excel(name = "物料编码")
+    @Excel(name = "${search.StockSummary.productId}")
    private String productId;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.StockSummary.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.StockSummary.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.StockSummary.unit}")
    private String unit;

    /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${search.StockSummary.lotNo}")
    private String lotNo;

    /** 仓库 */
    private String warehouseId;
-    @Excel(name = "仓库")
+    @Excel(name = "${search.StockSummary.warehouseName}")
    private String warehouseName;

    /** 巷道 */
    private String roadwayId;

    /** 库存数量 */
-    @Excel(name = "库存数量")
+    @Excel(name = "${search.StockSummary.quantity}")
    private Double quantity;


    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.StockSummary.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.StockSummary.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.StockSummary.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.StockSummary.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.StockSummary.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.StockSummary.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.StockSummary.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.StockSummary.remark}")
    private String remark;
    private String cargoSpaceId;
-    @Excel(name = "货位名称")
+    @Excel(name = "${search.StockSummary.cargoSpaceName}")
    private String cargoSpaceName;


--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
@@ -19,103 +19,103 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
    private Long id;

    /** 入出库类型 */
-    @Excel(name = "入出库类型")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOut}")
    private String inOrOut;

    /** 入出库主单据ID */
-    @Excel(name = "入出库主单据ID")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckId}")
    private String inOrOutSotckId;

    /** 入出库主子单据ID */
-    @Excel(name = "入出库主子单据ID")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckDetailId}")
    private String inOrOutSotckDetailId;

    /** 物料GUID */
-    @Excel(name = "物料GUID")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.productGuid}")
    private String productGuid;

    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.productId}")
    private String productId;

    /** 数量 */
-    @Excel(name = "数量")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.quantity}")
    private String quantity;

    /** 创建人 */
-    @Excel(name = "创建人")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.createMan}")
    private String createMan;

    /** 仓库id */
-    @Excel(name = "仓库id")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseId}")
    private String warehouseId;

    /** 仓库名称 */
-    @Excel(name = "仓库名称")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseName}")
    private String warehouseName;

    /** 仓库地址 */
-    @Excel(name = "仓库地址")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.address}")
    private String address;

    /** 仓库描述 */
-    @Excel(name = "仓库描述")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.cDesc}")
    private String cDesc;

    /** 仓库级别 */
-    @Excel(name = "仓库级别")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseKind}")
    private String warehouseKind;

    /** 仓库类型 */
-    @Excel(name = "仓库类型")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseType}")
    private String warehouseType;

    /** 是否可用 */
-    @Excel(name = "是否可用")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.isCurrent}")
    private String isCurrent;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.unit}")
    private String unit;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewFlatWarehouseInFlow.remark}")
    private String remark;

    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
@@ -19,104 +19,104 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
    private Long id;

    /** 入出库类型 */
-    @Excel(name = "入出库类型")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOut}")
    private String inOrOut;

    /** 入出库主单据ID */
-    @Excel(name = "入出库主单据ID")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOutSotckId}")
    private String inOrOutSotckId;

    /** 入出库主子单据ID */
-    @Excel(name = "入出库主子单据ID")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId}")
    private String inOrOutSotckDetailId;

    /** 物料GUID */
-    @Excel(name = "物料GUID")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.productGuid}")
    private String productGuid;

    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.productId}")
    private String productId;

    /** 入出库数量 */
-    @Excel(name = "入出库数量")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.quantity}")
    private String quantity;

    /** 创建人 */
-    @Excel(name = "创建人")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.createMan}")
    private String createMan;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseId}")
    private String warehouseId;

    /** 仓库名称 */
-    @Excel(name = "仓库名称")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseName}")
    private String warehouseName;

    /** 仓库地址 */
-    @Excel(name = "仓库地址")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.address}")
    private String address;

    /** 仓库描述 */
-    @Excel(name = "仓库描述")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.cDesc}")
    private String cDesc;

    /** 仓库级别 */
-    @Excel(name = "仓库级别")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseKind}")
    private String warehouseKind;

    /** 仓库类型 */
-    @Excel(name = "仓库类型")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseType}")
    private String warehouseType;

    /** 是否可用 */
-    @Excel(name = "是否可用")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.isCurrent}")
    private String isCurrent;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.unit}")
    private String unit;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.price}")
    private String price;


    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewFlatWarehouseOutFlow.remark}")
    private String remark;

    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
@@ -16,147 +16,147 @@ public class ViewInJobFlow extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 作业ID */
-    @Excel(name = "作业ID")
+    @Excel(name = "${search.ViewInJobFlow.jobId}")
    private String jobId;

    /** 子作业ID */
-    @Excel(name = "子作业ID")
+    @Excel(name = "${search.ViewInJobFlow.jobDetailId}")
    private String jobDetailId;

    /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "${search.ViewInJobFlow.status}")
    private String status;

    /** 任务号 */
-    @Excel(name = "任务号")
+    @Excel(name = "${search.ViewInJobFlow.taskNo}")
    private String taskNo;

    /** 托盘号 */
-    @Excel(name = "托盘号")
+    @Excel(name = "${search.ViewInJobFlow.trayCode}")
    private String trayCode;

    /** 巷道ID */
-    @Excel(name = "巷道ID")
+    @Excel(name = "${search.ViewInJobFlow.roadwayId}")
    private String roadwayId;

    /** 货位ID */
-    @Excel(name = "货位ID")
+    @Excel(name = "${search.ViewInJobFlow.cargoSpaceId}")
    private String cargoSpaceId;

    /** 货位名称 */
-    @Excel(name = "货位名称")
+    @Excel(name = "${search.ViewInJobFlow.cargoSpaceName}")
    private String cargoSpaceName;

    /** 排 */
-    @Excel(name = "排")
+    @Excel(name = "${search.ViewInJobFlow.thePlatoon}")
    private Long thePlatoon;

    /** 列 */
-    @Excel(name = "列")
+    @Excel(name = "${search.ViewInJobFlow.theColumn}")
    private Long theColumn;

    /** 层 */
-    @Excel(name = "层")
+    @Excel(name = "${search.ViewInJobFlow.theFloor}")
    private Long theFloor;

    /** 优先级 */
-    @Excel(name = "优先级")
+    @Excel(name = "${search.ViewInJobFlow.priority}")
    private Long priority;

    /** 执行阶段 */
-    @Excel(name = "执行阶段")
+    @Excel(name = "${search.ViewInJobFlow.executionPhase}")
    private String executionPhase;

    /** 作业类型 */
-    @Excel(name = "作业类型")
+    @Excel(name = "${search.ViewInJobFlow.inOrOut}")
    private String inOrOut;

    /** 入口ID */
-    @Excel(name = "入口ID")
+    @Excel(name = "${search.ViewInJobFlow.entranceId}")
    private String entranceId;

    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewInJobFlow.productId}")
    private String productId;

    /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${search.ViewInJobFlow.lotNo}")
    private String lotNo;

    /** 垛型ID */
-    @Excel(name = "垛型ID")
+    @Excel(name = "${search.ViewInJobFlow.stackingId}")
    private String stackingId;

    /** 库存状态 */
-    @Excel(name = "库存状态")
+    @Excel(name = "${search.ViewInJobFlow.stockStatus}")
    private String stockStatus;

    /** 入库数量 */
-    @Excel(name = "入库数量")
+    @Excel(name = "${search.ViewInJobFlow.inQuantity}")
    private String inQuantity;

    /** 单据ID */
-    @Excel(name = "单据ID")
+    @Excel(name = "${search.ViewInJobFlow.inOrOutId}")
    private String inOrOutId;

    /** 子单据ID */
-    @Excel(name = "子单据ID")
+    @Excel(name = "${search.ViewInJobFlow.inOrOutDId}")
    private String inOrOutDId;

    /** 开始时间 */
-    @Excel(name = "开始时间")
+    @Excel(name = "${search.ViewInJobFlow.startTime}")
    private String startTime;

    /** 结束时间 */
-    @Excel(name = "结束时间")
+    @Excel(name = "${search.ViewInJobFlow.finishTime}")
    private String finishTime;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewInJobFlow.warehouseId}")
    private String warehouseId;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewInJobFlow.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewInJobFlow.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewInJobFlow.unit}")
    private String unit;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewInJobFlow.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewInJobFlow.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewInJobFlow.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewInJobFlow.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewInJobFlow.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewInJobFlow.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewInJobFlow.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewInJobFlow.remark}")
    private String remark;

    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
@@ -16,155 +16,155 @@ public class ViewOutJobFlow extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 作业ID */
-    @Excel(name = "作业ID")
+    @Excel(name = "${search.ViewOutJobFlow.jobId}")
    private String jobId;

    /** 子作业ID */
-    @Excel(name = "子作业ID")
+    @Excel(name = "${search.ViewOutJobFlow.jobDetailId}")
    private String jobDetailId;

    /** 状态 */
-    @Excel(name = "状态")
+    @Excel(name = "${search.ViewOutJobFlow.status}")
    private String status;

    /** 任务号 */
-    @Excel(name = "任务号")
+    @Excel(name = "${search.ViewOutJobFlow.taskNo}")
    private String taskNo;

    /** 托盘码 */
-    @Excel(name = "托盘码")
+    @Excel(name = "${search.ViewOutJobFlow.trayCode}")
    private String trayCode;

    /** 巷道ID */
-    @Excel(name = "巷道ID")
+    @Excel(name = "${search.ViewOutJobFlow.roadwayId}")
    private String roadwayId;

    /** 货位ID */
-    @Excel(name = "货位ID")
+    @Excel(name = "${search.ViewOutJobFlow.cargoSpaceId}")
    private String cargoSpaceId;

    /** 货位名称 */
-    @Excel(name = "货位名称")
+    @Excel(name = "${search.ViewOutJobFlow.cargoSpaceName}")
    private String cargoSpaceName;

    /** 排 */
-    @Excel(name = "排")
+    @Excel(name = "${search.ViewOutJobFlow.thePlatoon}")
    private Long thePlatoon;

    /** 列 */
-    @Excel(name = "列")
+    @Excel(name = "${search.ViewOutJobFlow.theColumn}")
    private Long theColumn;

    /** 层 */
-    @Excel(name = "层")
+    @Excel(name = "${search.ViewOutJobFlow.theFloor}")
    private Long theFloor;

    /** 优先级 */
-    @Excel(name = "优先级")
+    @Excel(name = "${search.ViewOutJobFlow.priority}")
    private Long priority;

    /** 执行阶段 */
-    @Excel(name = "执行阶段")
+    @Excel(name = "${search.ViewOutJobFlow.executionPhase}")
    private String executionPhase;

    /** 作业类型 */
-    @Excel(name = "作业类型")
+    @Excel(name = "${search.ViewOutJobFlow.inOrOut}")
    private String inOrOut;

    /** 出口ID */
-    @Excel(name = "出口ID")
+    @Excel(name = "${search.ViewOutJobFlow.exitId}")
    private String exitId;

    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewOutJobFlow.productId}")
    private String productId;

    /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${search.ViewOutJobFlow.lotNo}")
    private String lotNo;

    /** 剁型ID */
-    @Excel(name = "剁型ID")
+    @Excel(name = "${search.ViewOutJobFlow.stackingId}")
    private String stackingId;

    /** 库存状态 */
-    @Excel(name = "库存状态")
+    @Excel(name = "${search.ViewOutJobFlow.stockStatus}")
    private String stockStatus;

    /** 出库数量 */
-    @Excel(name = "出库数量")
+    @Excel(name = "${search.ViewOutJobFlow.outQuantity}")
    private String outQuantity;

    /** 回流数量 */
-    @Excel(name = "回流数量")
+    @Excel(name = "${search.ViewOutJobFlow.giveNum}")
    private String giveNum;

    /** 单据ID */
-    @Excel(name = "单据ID")
+    @Excel(name = "${search.ViewOutJobFlow.inOrOutId}")
    private String inOrOutId;

    /** 子单据ID */
-    @Excel(name = "子单据ID")
+    @Excel(name = "${search.ViewOutJobFlow.inOrOutDId}")
    private String inOrOutDId;

    /** 开始时间 */
-    @Excel(name = "开始时间")
+    @Excel(name = "${search.ViewOutJobFlow.startTime}")
    private String startTime;

    /** 结束时间 */
-    @Excel(name = "结束时间")
+    @Excel(name = "${search.ViewOutJobFlow.finishTime}")
    private String finishTime;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewOutJobFlow.warehouseId}")
    private String warehouseId;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewOutJobFlow.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewOutJobFlow.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewOutJobFlow.unit}")
    private String unit;

    /** 客户名称 */
-    @Excel(name = "客户名称")
+    @Excel(name = "${search.ViewOutJobFlow.customerName}")
    private String customerName;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewOutJobFlow.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewOutJobFlow.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewOutJobFlow.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewOutJobFlow.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewOutJobFlow.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewOutJobFlow.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewOutJobFlow.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewOutJobFlow.remark}")
    private String remark;

    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
@@ -16,116 +16,116 @@ public class ViewStockDetail extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** id */
-    @Excel(name = "id")
+    @Excel(name = "${search.ViewStockDetail.onlyIdentity}")
    private Long onlyIdentity;

    /** 库存ID */
-    @Excel(name = "库存ID")
+    @Excel(name = "${search.ViewStockDetail.stockId}")
    private String stockId;

    /** 货位ID */
-    @Excel(name = "货位ID")
+    @Excel(name = "${search.ViewStockDetail.cargoSpaceId}")
    private String cargoSpaceId;

    /** 托盘条码 */
-    @Excel(name = "托盘条码")
+    @Excel(name = "${search.ViewStockDetail.trayCode}")
    private String trayCode;

    /** 数量 */
-    @Excel(name = "数量")
+    @Excel(name = "${search.ViewStockDetail.quantity}")
    private String quantity;

    /** 作业ID */
-    @Excel(name = "作业ID")
+    @Excel(name = "${search.ViewStockDetail.jobId}")
    private String jobId;

    /** 批号 */
-    @Excel(name = "批号")
+    @Excel(name = "${search.ViewStockDetail.lotNo}")
    private String lotNo;

    /** 入库子单ID */
-    @Excel(name = "入库子单ID")
+    @Excel(name = "${search.ViewStockDetail.stockinDetailId}")
    private String stockinDetailId;

    /** 入库时间 */
-    @Excel(name = "入库时间")
+    @Excel(name = "${search.ViewStockDetail.inDate}")
    private String inDate;

    /** 仓库 */
-    @Excel(name = "仓库")
+    @Excel(name = "${search.ViewStockDetail.warehouseId}")
    private String warehouseId;
    private String warehouseName;

    /** 剁型ID */
-    @Excel(name = "剁型ID")
+    @Excel(name = "${search.ViewStockDetail.stackingId}")
    private String stackingId;

    /** 货位名称 */
-    @Excel(name = "货位名称")
+    @Excel(name = "${search.ViewStockDetail.cargoSpaceName}")
    private String cargoSpaceName;

    /** 巷道ID */
-    @Excel(name = "巷道ID")
+    @Excel(name = "${search.ViewStockDetail.roadwayId}")
    private String roadwayId;

    /** 货位状态 */
-    @Excel(name = "货位状态")
+    @Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}")
    private String cargoSpaceStatus;

    /** 是否锁定 */
-    @Excel(name = "是否锁定")
+    @Excel(name = "${search.ViewStockDetail.locked}")
    private String locked;

    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewStockDetail.productId}")
    private String productId;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewStockDetail.productName}")
    private String productName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewStockDetail.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewStockDetail.unit}")
    private String unit;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewStockDetail.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewStockDetail.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewStockDetail.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewStockDetail.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewStockDetail.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewStockDetail.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewStockDetail.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewStockDetail.remark}")
    private String remark;
-    @Excel(name = "库存状态")
+    @Excel(name = "${search.ViewStockDetail.stockStatus}")
    private String stockStatus;
-    @Excel(name = "物料状态")
+    @Excel(name = "${search.ViewStockDetail.productStatus}")
    private String productStatus;

    public String getStockStatus() {
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java
@@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
 /**
 * 安全库存查询Controller
 * 
- * @author gw
- * @date 2025-05-30
+ * @author ruoyi
+ * @date 2025-08-06
 */
@RestController
@RequestMapping("/search/ViewStockSecure")
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
 /**
 * 安全库存查询Mapper接口
 * 
- * @author gw
- * @date 2025-05-30
+ * @author ruoyi
+ * @date 2025-08-06
 */
 public interface ViewStockSecureMapper 
 {
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java
@@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure;
 /**
 * 安全库存查询Service接口
 * 
- * @author gw
- * @date 2025-05-30
+ * @author ruoyi
+ * @date 2025-08-06
 */
 public interface IViewStockSecureService 
 {
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java
@@ -1,8 +1,6 @@
 package com.ruoyi.search.ViewStockSecure.service.impl;

 import java.util.List;
-
-import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper;
@@ -11,19 +9,19 @@ import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService;

 /**
 * 安全库存查询Service业务层处理
- *
- * @author gw
- * @date 2025-05-30
+ * 
+ * @author ruoyi
+ * @date 2025-08-06
 */
@Service
-public class ViewStockSecureServiceImpl implements IViewStockSecureService
+public class ViewStockSecureServiceImpl implements IViewStockSecureService 
 {
    @Autowired
    private ViewStockSecureMapper viewStockSecureMapper;

    /**
     * 查询安全库存查询
-     *
+     * 
     * @param stockId 安全库存查询主键
     * @return 安全库存查询
     */
@@ -35,12 +33,11 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService

    /**
     * 查询安全库存查询列表
-     *
+     * 
     * @param viewStockSecure 安全库存查询
     * @return 安全库存查询
     */
    @Override
-    @DataScope(warehouseAlias = "vss")
    public List<ViewStockSecure> selectViewStockSecureList(ViewStockSecure viewStockSecure)
    {
        return viewStockSecureMapper.selectViewStockSecureList(viewStockSecure);
@@ -48,7 +45,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService

    /**
     * 新增安全库存查询
-     *
+     * 
     * @param viewStockSecure 安全库存查询
     * @return 结果
     */
@@ -60,7 +57,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService

    /**
     * 修改安全库存查询
-     *
+     * 
     * @param viewStockSecure 安全库存查询
     * @return 结果
     */
@@ -72,7 +69,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService

    /**
     * 批量删除安全库存查询
-     *
+     * 
     * @param stockIds 需要删除的安全库存查询主键
     * @return 结果
     */
@@ -84,7 +81,7 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService

    /**
     * 删除安全库存查询信息
-     *
+     * 
     * @param stockId 安全库存查询主键
     * @return 结果
     */
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java
@@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;

 /**
- * 预警库存查询Controller
+ * 库存预警报表Controller
 * 
 * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
 */
@RestController
@RequestMapping("/search/ViewStockWarning")
@@ -35,7 +35,7 @@ public class ViewStockWarningController extends BaseController
    private IViewStockWarningService viewStockWarningService;

    /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:list')")
    @GetMapping("/list")
@@ -47,20 +47,20 @@ public class ViewStockWarningController extends BaseController
    }

    /**
-     * 导出预警库存查询列表
+     * 导出库存预警报表列表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:export')")
-    @Log(title = "预警库存查询", businessType = BusinessType.EXPORT)
+    @Log(title = "库存预警报表", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ViewStockWarning viewStockWarning)
    {
        List<ViewStockWarning> list = viewStockWarningService.selectViewStockWarningList(viewStockWarning);
        ExcelUtil<ViewStockWarning> util = new ExcelUtil<ViewStockWarning>(ViewStockWarning.class);
-        util.exportExcel(response, list, "预警库存查询数据");
+        util.exportExcel(response, list, "库存预警报表数据");
    }

    /**
-     * 获取预警库存查询详细信息
+     * 获取库存预警报表详细信息
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:query')")
    @GetMapping(value = "/{stockId}")
@@ -70,10 +70,10 @@ public class ViewStockWarningController extends BaseController
    }

    /**
-     * 新增预警库存查询
+     * 新增库存预警报表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:add')")
-    @Log(title = "预警库存查询", businessType = BusinessType.INSERT)
+    @Log(title = "库存预警报表", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ViewStockWarning viewStockWarning)
    {
@@ -81,10 +81,10 @@ public class ViewStockWarningController extends BaseController
    }

    /**
-     * 修改预警库存查询
+     * 修改库存预警报表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:edit')")
-    @Log(title = "预警库存查询", businessType = BusinessType.UPDATE)
+    @Log(title = "库存预警报表", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ViewStockWarning viewStockWarning)
    {
@@ -92,10 +92,10 @@ public class ViewStockWarningController extends BaseController
    }

    /**
-     * 删除预警库存查询
+     * 删除库存预警报表
     */
    @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:remove')")
-    @Log(title = "预警库存查询", businessType = BusinessType.DELETE)
+    @Log(title = "库存预警报表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{stockIds}")
    public AjaxResult remove(@PathVariable String[] stockIds)
    {
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
@@ -6,250 +6,245 @@ import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;

 /**
- * 预警库存查询对象 view_stock_warning
+ * 库存预警报表对象 view_stock_warning
 * 
 * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
 */
 public class ViewStockWarning extends BaseEntity
 {
    private static final long serialVersionUID = 1L;

    /** 库存ID */
-    @Excel(name = "库存ID")
+//    @Excel(name = "库存ID")
+    @Excel(name = "${search.ViewStockWarning.stockId}")
    private String stockId;

    /** 货位ID */
-    @Excel(name = "货位ID")
+    @Excel(name = "${search.ViewStockWarning.cargoSpaceId}")
    private String cargoSpaceId;

    /** 库存状态 */
-    @Excel(name = "库存状态")
+    @Excel(name = "${search.ViewStockWarning.stockStatus}")
    private String stockStatus;

    /** 物料状态 */
-    @Excel(name = "物料状态")
+    @Excel(name = "${search.ViewStockWarning.productStatus}")
    private String productStatus;

    /** 批次号 */
-    @Excel(name = "批次号")
+    @Excel(name = "${search.ViewStockWarning.lotNo}")
    private String lotNo;

    /** 入库时间 */
-    @Excel(name = "入库时间")
+    @Excel(name = "${search.ViewStockWarning.inDate}")
    private String inDate;

    /** 回流时间 */
-    @Excel(name = "回流时间")
+    @Excel(name = "${search.ViewStockWarning.backDate}")
    private String backDate;

    /** 物料GUID */
-    @Excel(name = "物料GUID")
+    @Excel(name = "${search.ViewStockWarning.productGuid}")
    private String productGuid;

    /** 库存数量 */
-    @Excel(name = "库存数量")
+    @Excel(name = "${search.ViewStockWarning.quantity}")
    private String quantity;

    /** 作业ID */
-    @Excel(name = "作业ID")
+    @Excel(name = "${search.ViewStockWarning.jobId}")
    private String jobId;

    /** 托盘条码 */
-    @Excel(name = "托盘条码")
+    @Excel(name = "${search.ViewStockWarning.trayCode}")
    private String trayCode;

    /** 出库数量 */
-    @Excel(name = "出库数量")
+    @Excel(name = "${search.ViewStockWarning.outQuantity}")
    private String outQuantity;

    /** 入库子单ID */
-    @Excel(name = "入库子单ID")
+    @Excel(name = "${search.ViewStockWarning.stockinDetailId}")
    private String stockinDetailId;

    /** 入库主单 */
-    @Excel(name = "入库主单")
+    @Excel(name = "${search.ViewStockWarning.stockinId}")
    private String stockinId;

    /** 入库类型 */
-    @Excel(name = "入库类型")
+    @Excel(name = "${search.ViewStockWarning.inType}")
    private String inType;

    /** 入库班组ID */
-    @Excel(name = "入库班组ID")
+    @Excel(name = "${search.ViewStockWarning.inClassId}")
    private String inClassId;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewStockWarning.warehouseId}")
    private String warehouseId;

    /** 垛型ID */
-    @Excel(name = "垛型ID")
+    @Excel(name = "${search.ViewStockWarning.stackingId}")
    private String stackingId;

-    /** 价格 */
-    @Excel(name = "价格")
-    private String price;
-
-    /** 英文名称 */
-    @Excel(name = "英文名称")
+    /** 库存预警标识 */
+    @Excel(name = "${search.ViewStockWarning.spare1}")
    private String spare1;

-    /** 单件净重 */
-    @Excel(name = "单件净重")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String spare2;

-    /** 长MM */
-    @Excel(name = "长MM")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare3;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String spare4;
+
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String spare5;

-    /** 宽MM */
-    @Excel(name = "宽MM")
+    /** $column.columnComment */
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String spare6;

-    /** 高MM */
-    @Excel(name = "高MM")
-    private String spare7;
-
-    /** 体积m³ */
-    @Excel(name = "体积m³")
-    private String spare8;
-
-    /** 备注 */
-    @Excel(name = "备注")
-    private String remark;
-
    /** 物料ID */
-    @Excel(name = "物料ID")
+    @Excel(name = "${search.ViewStockWarning.productId}")
    private String productId;

    /** 仓库名称 */
-    @Excel(name = "仓库名称")
+    @Excel(name = "${search.ViewStockWarning.warehouseName}")
    private String warehouseName;

    /** 仓库地址 */
-    @Excel(name = "仓库地址")
+    @Excel(name = "${search.ViewStockWarning.address}")
    private String address;

    /** 仓库描述 */
-    @Excel(name = "仓库描述")
+    @Excel(name = "${search.ViewStockWarning.cDesc}")
    private String cDesc;

    /** 仓库级别 */
-    @Excel(name = "仓库级别")
+    @Excel(name = "${search.ViewStockWarning.warehouseKind}")
    private String warehouseKind;

    /** 仓库类型 */
-    @Excel(name = "仓库类型")
+    @Excel(name = "${search.ViewStockWarning.warehouseType}")
    private String warehouseType;

    /** 是否可用 */
-    @Excel(name = "是否可用")
+    @Excel(name = "${search.ViewStockWarning.isCurrent}")
    private String isCurrent;

-    /** 物料名称 */
-    @Excel(name = "物料名称")
-    private String productName;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
+    /** 价格 */
+    @Excel(name = "${search.ViewStockWarning.price}")
+    private String price;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewStockWarning.unit}")
    private String unit;

+    /** 规格 */
+    @Excel(name = "${search.ViewStockWarning.spec}")
+    private String spec;
+
+    /** 英文名称 */
+    @Excel(name = "${search.ViewStockWarning.enName}")
+    private String enName;
+
+    /** 单件净重 */
+    @Excel(name = "${search.ViewStockWarning.weight}")
+    private String weight;
+
+    /** 长MM */
+    @Excel(name = "${search.ViewStockWarning.longMM}")
+    private String longMM;
+
+    /** 宽MM */
+    @Excel(name = "${search.ViewStockWarning.wide}")
+    private String wide;
+
+    /** 高MM */
+    @Excel(name = "${search.ViewStockWarning.hight}")
+    private String hight;
+
+    /** 体积m³ */
+    @Excel(name = "${search.ViewStockWarning.volume}")
+    private String volume;
+
+    /** 物料名称 */
+    @Excel(name = "${search.ViewStockWarning.productName}")
+    private String productName;
+
    /** 货位名称 */
-    @Excel(name = "货位名称")
+    @Excel(name = "${search.ViewStockWarning.cargoSpaceName}")
    private String cargoSpaceName;

    /** 巷道ID */
-    @Excel(name = "巷道ID")
+    @Excel(name = "${search.ViewStockWarning.roadwayId}")
    private String roadwayId;

    /** 货区ID */
-    @Excel(name = "货区ID")
+    @Excel(name = "${search.ViewStockWarning.cargoAreaId}")
    private String cargoAreaId;

    /** 货位类型 */
-    @Excel(name = "货位类型")
+    @Excel(name = "${search.ViewStockWarning.theType}")
    private String theType;

-    /** the_type_name： */
-    @Excel(name = "the_type_name：")
+    /** 货位类型名称 */
+    @Excel(name = "${search.ViewStockWarning.theTypeName}")
    private String theTypeName;

    /** 排 */
-    @Excel(name = "排")
+    @Excel(name = "${search.ViewStockWarning.thePlatoon}")
    private Long thePlatoon;

    /** 列 */
-    @Excel(name = "列")
+    @Excel(name = "${search.ViewStockWarning.theColumn}")
    private Long theColumn;

    /** 层 */
-    @Excel(name = "层")
+    @Excel(name = "${search.ViewStockWarning.theFloor}")
    private Long theFloor;

    /** 货位状态 */
-    @Excel(name = "货位状态")
+    @Excel(name = "${search.ViewStockWarning.cargoStatus}")
    private String cargoStatus;

    /** 是否锁定 */
-    @Excel(name = "是否锁定")
+    @Excel(name = "${search.ViewStockWarning.locked}")
    private String locked;

    /** 货位高度 */
-    @Excel(name = "货位高度")
+    @Excel(name = "${search.ViewStockWarning.cargoHight}")
    private String cargoHight;

    /** 是否双伸 */
-    @Excel(name = "是否双伸")
+    @Excel(name = "${search.ViewStockWarning.issDouble}")
    private String issDouble;

    /** 双货位分组编码 */
-    @Excel(name = "双货位分组编码")
+    @Excel(name = "${search.ViewStockWarning.groupCodingNo}")
    private String groupCodingNo;

    /** 双货位分组编码 */
-    @Excel(name = "双货位分组编码")
+    @Excel(name = "${search.ViewStockWarning.groupCoding}")
    private String groupCoding;

    /** 双货位标识 */
-    @Excel(name = "双货位标识")
+    @Excel(name = "${search.ViewStockWarning.cargoSpaceLogo}")
    private String cargoSpaceLogo;

    /** 本仓库区域 */
-    @Excel(name = "本仓库区域")
+    @Excel(name = "${search.ViewStockWarning.thisCargoArea}")
    private String thisCargoArea;

-    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;
-    }
-
-    @Override
-    public String getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public void setStockId(String stockId)
+    public void setStockId(String stockId) 
    {
        this.stockId = stockId;
    }
@@ -449,6 +444,26 @@ public class ViewStockWarning extends BaseEntity
        return spare2;
    }

+    public void setSpare3(String spare3) 
+    {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare3() 
+    {
+        return spare3;
+    }
+
+    public void setSpare4(String spare4) 
+    {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare4() 
+    {
+        return spare4;
+    }
+
    public void setSpare5(String spare5) 
    {
        this.spare5 = spare5;
@@ -539,14 +554,24 @@ public class ViewStockWarning extends BaseEntity
        return isCurrent;
    }

-    public void setProductName(String productName) 
+    public void setPrice(String price) 
    {
-        this.productName = productName;
+        this.price = price;
    }

-    public String getProductName() 
+    public String getPrice() 
    {
-        return productName;
+        return price;
+    }
+
+    public void setUnit(String unit) 
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit() 
+    {
+        return unit;
    }

    public void setSpec(String spec) 
@@ -559,24 +584,74 @@ public class ViewStockWarning extends BaseEntity
        return spec;
    }

-    public void setUnit(String unit)
+    public void setEnName(String enName) 
    {
-        this.unit = unit;
+        this.enName = enName;
    }

-    public String getUnit() 
+    public String getEnName() 
    {
-        return unit;
+        return enName;
    }

-    public void setPrice(String price) 
+    public void setWeight(String weight) 
    {
-        this.price = price;
+        this.weight = weight;
    }

-    public String getPrice() 
+    public String getWeight() 
    {
-        return price;
+        return weight;
+    }
+
+    public void setLongMM(String longMM) 
+    {
+        this.longMM = longMM;
+    }
+
+    public String getLongMM() 
+    {
+        return longMM;
+    }
+
+    public void setWide(String wide) 
+    {
+        this.wide = wide;
+    }
+
+    public String getWide() 
+    {
+        return wide;
+    }
+
+    public void setHight(String hight) 
+    {
+        this.hight = hight;
+    }
+
+    public String getHight() 
+    {
+        return hight;
+    }
+
+    public void setVolume(String volume) 
+    {
+        this.volume = volume;
+    }
+
+    public String getVolume() 
+    {
+        return volume;
+    }
+
+    public void setProductName(String productName) 
+    {
+        this.productName = productName;
+    }
+
+    public String getProductName() 
+    {
+        return productName;
    }

    public void setCargoSpaceName(String cargoSpaceName) 
@@ -741,59 +816,64 @@ public class ViewStockWarning extends BaseEntity

    @Override
    public String toString() {
-        return "ViewStockWarning{" +
-                "stockId='" + stockId + '\'' +
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
-                ", stockStatus='" + stockStatus + '\'' +
-                ", productStatus='" + productStatus + '\'' +
-                ", lotNo='" + lotNo + '\'' +
-                ", inDate='" + inDate + '\'' +
-                ", backDate='" + backDate + '\'' +
-                ", productGuid='" + productGuid + '\'' +
-                ", quantity='" + quantity + '\'' +
-                ", jobId='" + jobId + '\'' +
-                ", trayCode='" + trayCode + '\'' +
-                ", outQuantity='" + outQuantity + '\'' +
-                ", stockinDetailId='" + stockinDetailId + '\'' +
-                ", stockinId='" + stockinId + '\'' +
-                ", inType='" + inType + '\'' +
-                ", inClassId='" + inClassId + '\'' +
-                ", warehouseId='" + warehouseId + '\'' +
-                ", stackingId='" + stackingId + '\'' +
-                ", price='" + price + '\'' +
-                ", spare1='" + spare1 + '\'' +
-                ", spare2='" + spare2 + '\'' +
-                ", spare5='" + spare5 + '\'' +
-                ", spare6='" + spare6 + '\'' +
-                ", spare7='" + spare7 + '\'' +
-                ", spare8='" + spare8 + '\'' +
-                ", remark='" + remark + '\'' +
-                ", productId='" + productId + '\'' +
-                ", warehouseName='" + warehouseName + '\'' +
-                ", address='" + address + '\'' +
-                ", cDesc='" + cDesc + '\'' +
-                ", warehouseKind='" + warehouseKind + '\'' +
-                ", warehouseType='" + warehouseType + '\'' +
-                ", isCurrent='" + isCurrent + '\'' +
-                ", productName='" + productName + '\'' +
-                ", spec='" + spec + '\'' +
-                ", unit='" + unit + '\'' +
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
-                ", roadwayId='" + roadwayId + '\'' +
-                ", cargoAreaId='" + cargoAreaId + '\'' +
-                ", theType='" + theType + '\'' +
-                ", theTypeName='" + theTypeName + '\'' +
-                ", thePlatoon=" + thePlatoon +
-                ", theColumn=" + theColumn +
-                ", theFloor=" + theFloor +
-                ", cargoStatus='" + cargoStatus + '\'' +
-                ", locked='" + locked + '\'' +
-                ", cargoHight='" + cargoHight + '\'' +
-                ", issDouble='" + issDouble + '\'' +
-                ", groupCodingNo='" + groupCodingNo + '\'' +
-                ", groupCoding='" + groupCoding + '\'' +
-                ", cargoSpaceLogo='" + cargoSpaceLogo + '\'' +
-                ", thisCargoArea='" + thisCargoArea + '\'' +
-                '}';
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stockId", getStockId())
+            .append("cargoSpaceId", getCargoSpaceId())
+            .append("stockStatus", getStockStatus())
+            .append("productStatus", getProductStatus())
+            .append("lotNo", getLotNo())
+            .append("inDate", getInDate())
+            .append("backDate", getBackDate())
+            .append("productGuid", getProductGuid())
+            .append("quantity", getQuantity())
+            .append("jobId", getJobId())
+            .append("trayCode", getTrayCode())
+            .append("outQuantity", getOutQuantity())
+            .append("stockinDetailId", getStockinDetailId())
+            .append("stockinId", getStockinId())
+            .append("inType", getInType())
+            .append("inClassId", getInClassId())
+            .append("warehouseId", getWarehouseId())
+            .append("stackingId", getStackingId())
+            .append("spare1", getSpare1())
+            .append("spare2", getSpare2())
+            .append("spare3", getSpare3())
+            .append("spare4", getSpare4())
+            .append("spare5", getSpare5())
+            .append("spare6", getSpare6())
+            .append("productId", getProductId())
+            .append("warehouseName", getWarehouseName())
+            .append("address", getAddress())
+            .append("cDesc", getcDesc())
+            .append("warehouseKind", getWarehouseKind())
+            .append("warehouseType", getWarehouseType())
+            .append("isCurrent", getIsCurrent())
+            .append("price", getPrice())
+            .append("unit", getUnit())
+            .append("spec", getSpec())
+            .append("enName", getEnName())
+            .append("weight", getWeight())
+            .append("longMM", getLongMM())
+            .append("wide", getWide())
+            .append("hight", getHight())
+            .append("volume", getVolume())
+            .append("productName", getProductName())
+            .append("cargoSpaceName", getCargoSpaceName())
+            .append("roadwayId", getRoadwayId())
+            .append("cargoAreaId", getCargoAreaId())
+            .append("theType", getTheType())
+            .append("theTypeName", getTheTypeName())
+            .append("thePlatoon", getThePlatoon())
+            .append("theColumn", getTheColumn())
+            .append("theFloor", getTheFloor())
+            .append("cargoStatus", getCargoStatus())
+            .append("locked", getLocked())
+            .append("cargoHight", getCargoHight())
+            .append("issDouble", getIssDouble())
+            .append("groupCodingNo", getGroupCodingNo())
+            .append("groupCoding", getGroupCoding())
+            .append("cargoSpaceLogo", getCargoSpaceLogo())
+            .append("thisCargoArea", getThisCargoArea())
+            .toString();
    }
 }
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java
@@ -4,55 +4,55 @@ import java.util.List;
 import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;

 /**
- * 预警库存查询Mapper接口
+ * 库存预警报表Mapper接口
 * 
 * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
 */
 public interface ViewStockWarningMapper 
 {
    /**
-     * 查询预警库存查询
+     * 查询库存预警报表
     * 
-     * @param stockId 预警库存查询主键
-     * @return 预警库存查询
+     * @param stockId 库存预警报表主键
+     * @return 库存预警报表
     */
    public ViewStockWarning selectViewStockWarningByStockId(String stockId);

    /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
     * 
-     * @param viewStockWarning 预警库存查询
-     * @return 预警库存查询集合
+     * @param viewStockWarning 库存预警报表
+     * @return 库存预警报表集合
     */
    public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);

    /**
-     * 新增预警库存查询
+     * 新增库存预警报表
     * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    public int insertViewStockWarning(ViewStockWarning viewStockWarning);

    /**
-     * 修改预警库存查询
+     * 修改库存预警报表
     * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    public int updateViewStockWarning(ViewStockWarning viewStockWarning);

    /**
-     * 删除预警库存查询
+     * 删除库存预警报表
     * 
-     * @param stockId 预警库存查询主键
+     * @param stockId 库存预警报表主键
     * @return 结果
     */
    public int deleteViewStockWarningByStockId(String stockId);

    /**
-     * 批量删除预警库存查询
+     * 批量删除库存预警报表
     * 
     * @param stockIds 需要删除的数据主键集合
     * @return 结果
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java
@@ -4,57 +4,57 @@ import java.util.List;
 import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;

 /**
- * 预警库存查询Service接口
+ * 库存预警报表Service接口
 * 
 * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
 */
 public interface IViewStockWarningService 
 {
    /**
-     * 查询预警库存查询
+     * 查询库存预警报表
     * 
-     * @param stockId 预警库存查询主键
-     * @return 预警库存查询
+     * @param stockId 库存预警报表主键
+     * @return 库存预警报表
     */
    public ViewStockWarning selectViewStockWarningByStockId(String stockId);

    /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
     * 
-     * @param viewStockWarning 预警库存查询
-     * @return 预警库存查询集合
+     * @param viewStockWarning 库存预警报表
+     * @return 库存预警报表集合
     */
    public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning);

    /**
-     * 新增预警库存查询
+     * 新增库存预警报表
     * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    public int insertViewStockWarning(ViewStockWarning viewStockWarning);

    /**
-     * 修改预警库存查询
+     * 修改库存预警报表
     * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    public int updateViewStockWarning(ViewStockWarning viewStockWarning);

    /**
-     * 批量删除预警库存查询
+     * 批量删除库存预警报表
     * 
-     * @param stockIds 需要删除的预警库存查询主键集合
+     * @param stockIds 需要删除的库存预警报表主键集合
     * @return 结果
     */
    public int deleteViewStockWarningByStockIds(String[] stockIds);

    /**
-     * 删除预警库存查询信息
+     * 删除库存预警报表信息
     * 
-     * @param stockId 预警库存查询主键
+     * @param stockId 库存预警报表主键
     * @return 结果
     */
    public int deleteViewStockWarningByStockId(String stockId);
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java
@@ -1,8 +1,6 @@
 package com.ruoyi.search.ViewStockWarning.service.impl;

 import java.util.List;
-
-import com.ruoyi.common.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper;
@@ -10,22 +8,22 @@ import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning;
 import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService;

 /**
- * 预警库存查询Service业务层处理
- *
+ * 库存预警报表Service业务层处理
+ * 
 * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
 */
@Service
-public class ViewStockWarningServiceImpl implements IViewStockWarningService
+public class ViewStockWarningServiceImpl implements IViewStockWarningService 
 {
    @Autowired
    private ViewStockWarningMapper viewStockWarningMapper;

    /**
-     * 查询预警库存查询
-     *
-     * @param stockId 预警库存查询主键
-     * @return 预警库存查询
+     * 查询库存预警报表
+     * 
+     * @param stockId 库存预警报表主键
+     * @return 库存预警报表
     */
    @Override
    public ViewStockWarning selectViewStockWarningByStockId(String stockId)
@@ -34,22 +32,21 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
    }

    /**
-     * 查询预警库存查询列表
-     *
-     * @param viewStockWarning 预警库存查询
-     * @return 预警库存查询
+     * 查询库存预警报表列表
+     * 
+     * @param viewStockWarning 库存预警报表
+     * @return 库存预警报表
     */
    @Override
-    @DataScope(warehouseAlias = "vsw")
    public List<ViewStockWarning> selectViewStockWarningList(ViewStockWarning viewStockWarning)
    {
        return viewStockWarningMapper.selectViewStockWarningList(viewStockWarning);
    }

    /**
-     * 新增预警库存查询
-     *
-     * @param viewStockWarning 预警库存查询
+     * 新增库存预警报表
+     * 
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    @Override
@@ -59,9 +56,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
    }

    /**
-     * 修改预警库存查询
-     *
-     * @param viewStockWarning 预警库存查询
+     * 修改库存预警报表
+     * 
+     * @param viewStockWarning 库存预警报表
     * @return 结果
     */
    @Override
@@ -71,9 +68,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
    }

    /**
-     * 批量删除预警库存查询
-     *
-     * @param stockIds 需要删除的预警库存查询主键
+     * 批量删除库存预警报表
+     * 
+     * @param stockIds 需要删除的库存预警报表主键
     * @return 结果
     */
    @Override
@@ -83,9 +80,9 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
    }

    /**
-     * 删除预警库存查询信息
-     *
-     * @param stockId 预警库存查询主键
+     * 删除库存预警报表信息
+     * 
+     * @param stockId 库存预警报表主键
     * @return 结果
     */
    @Override
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
@@ -16,175 +16,174 @@ public class ViewStockinHistory extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 入库单guid */
-    @Excel(name = "入库单guid")
+    @Excel(name = "${search.ViewStockinHistory.stockinGuid}")
    private String stockinGuid;

    /** 入库单号 */
-    @Excel(name = "入库单号")
+    @Excel(name = "${search.ViewStockinHistory.stockinId}")
    private String stockinId;

    /** 入库类型 */
-    @Excel(name = "入库类型")
+    @Excel(name = "${search.ViewStockinHistory.inType}")
    private String inType;

    /** 创建时间 */
-    @Excel(name = "创建时间")
+    @Excel(name = "${search.ViewStockinHistory.createDate}")
    private String createDate;

    /** 创建人 */
-    @Excel(name = "创建人")
+    @Excel(name = "${search.ViewStockinHistory.createManId}")
    private String createManId;

    /** 单据状态 */
-    @Excel(name = "单据状态")
+    @Excel(name = "${search.ViewStockinHistory.status}")
    private String status;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewStockinHistory.warehouseId}")
    private String warehouseId;

    /** 完成时间 */
-    @Excel(name = "完成时间")
+    @Excel(name = "${search.ViewStockinHistory.finishDate}")
    private String finishDate;

    /** ERP单号 */
-    @Excel(name = "ERP单号")
+    @Excel(name = "${search.ViewStockinHistory.erpBill}")
    private String erpBill;

    /** 单据来源 */
-    @Excel(name = "单据来源")
+    @Excel(name = "${search.ViewStockinHistory.stockSource}")
    private String stockSource;

    /** 部门编码 */
-    @Excel(name = "部门编码")
+    @Excel(name = "${search.ViewStockinHistory.departmentNo}")
    private String departmentNo;

    /** 班组编码 */
-    @Excel(name = "班组编码")
+    @Excel(name = "${search.ViewStockinHistory.classNo}")
    private String classNo;

    /** 供应商编号 */
-    @Excel(name = "供应商编号")
+    @Excel(name = "${search.ViewStockinHistory.supplierNo}")
    private String supplierNo;

    /** 供应商名称 */
-    @Excel(name = "供应商名称")
+    @Excel(name = "${search.ViewStockinHistory.supplierName}")
    private String supplierName;

    /** 供应商简称 */
-    @Excel(name = "供应商简称")
+    @Excel(name = "${search.ViewStockinHistory.simpleName}")
    private String simpleName;
-
    /** 联系人 */
-    @Excel(name = "联系人")
+    @Excel(name = "${search.ViewStockinHistory.contactName}")
    private String contactName;

    /** 联系电话 */
-    @Excel(name = "联系电话")
+    @Excel(name = "${search.ViewStockinHistory.contactNumber}")
    private String contactNumber;

    /** 供应商地址 */
-    @Excel(name = "供应商地址")
+    @Excel(name = "${search.ViewStockinHistory.address}")
    private String address;

    /** 入库明细ID */
-    @Excel(name = "入库明细ID")
+    @Excel(name = "${search.ViewStockinHistory.stockinDetailId}")
    private String stockinDetailId;

    /** 批次号 */
-    @Excel(name = "批次号")
+    @Excel(name = "${search.ViewStockinHistory.lotNo}")
    private String lotNo;

    /** 计划数量 */
-    @Excel(name = "计划数量")
+    @Excel(name = "${search.ViewStockinHistory.quantity}")
    private String quantity;

    /** 计划箱数 */
-    @Excel(name = "计划箱数")
+    @Excel(name = "${search.ViewStockinHistory.quantityX}")
    private String quantityX;

    /** 计划件数 */
-    @Excel(name = "计划件数")
+    @Excel(name = "${search.ViewStockinHistory.quantityJ}")
    private String quantityJ;

    /** 实际数量 */
-    @Excel(name = "实际数量")
+    @Excel(name = "${search.ViewStockinHistory.assignNum}")
    private String assignNum;

    /** 实际箱数 */
-    @Excel(name = "实际箱数")
+    @Excel(name = "${search.ViewStockinHistory.assignNumX}")
    private String assignNumX;

    /** 实际件数 */
-    @Excel(name = "实际件数")
+    @Excel(name = "${search.ViewStockinHistory.assignNumJ}")
    private String assignNumJ;

    /** 扫码数量 */
-    @Excel(name = "扫码数量")
+    @Excel(name = "${search.ViewStockinHistory.scanNum}")
    private String scanNum;

    /** 扫码箱数 */
-    @Excel(name = "扫码箱数")
+    @Excel(name = "${search.ViewStockinHistory.scanNumX}")
    private String scanNumX;

    /** 扫码件数 */
-    @Excel(name = "扫码件数")
+    @Excel(name = "${search.ViewStockinHistory.scanNumJ}")
    private String scanNumJ;

    /** 入库日期 */
-    @Excel(name = "入库日期")
+    @Excel(name = "${search.ViewStockinHistory.printDate}")
    private String printDate;

    /** 库存状态 */
-    @Excel(name = "库存状态")
+    @Excel(name = "${search.ViewStockinHistory.stockStatus}")
    private String stockStatus;

    /** 单价 */
-    @Excel(name = "单价")
+    @Excel(name = "${search.ViewStockinHistory.price}")
    private String price;

    /** 物料编码 */
-    @Excel(name = "物料编码")
+    @Excel(name = "${search.ViewStockinHistory.productId}")
    private String productId;

    /** 物料名称 */
-    @Excel(name = "物料名称")
+    @Excel(name = "${search.ViewStockinHistory.productName}")
    private String productName;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewStockinHistory.unit}")
    private String unit;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewStockinHistory.spec}")
    private String spec;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewStockinHistory.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewStockinHistory.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewStockinHistory.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewStockinHistory.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewStockinHistory.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewStockinHistory.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewStockinHistory.remark}")
    private String remark;

    public String getSpare1() {
--- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
@@ -17,115 +17,115 @@ public class ViewStockoutHistory extends BaseEntity
    private static final long serialVersionUID = 1L;

    /** 出库单号 */
-    @Excel(name = "出库单号")
+    @Excel(name = "${search.ViewStockoutHistory.stockoutId}")
    private String stockoutId;

    /** 仓库ID */
-    @Excel(name = "仓库ID")
+    @Excel(name = "${search.ViewStockoutHistory.warehouseId}")
    private String warehouseId;

    /** 出库类型 */
-    @Excel(name = "出库类型")
+    @Excel(name = "${search.ViewStockoutHistory.outType}")
    private String outType;

    /** 创建日期 */
-    @Excel(name = "创建日期")
+    @Excel(name = "${search.ViewStockoutHistory.createDate}")
    private String createDate;

    /** 创建人ID */
-    @Excel(name = "创建人ID")
+    @Excel(name = "${search.ViewStockoutHistory.createManId}")
    private String createManId;

    /** 出库状态 */
-    @Excel(name = "出库状态")
+    @Excel(name = "${search.ViewStockoutHistory.status}")
    private String status;

    /** 出库来源 */
-    @Excel(name = "出库来源")
+    @Excel(name = "${search.ViewStockoutHistory.stockoutSource}")
    private String stockoutSource;

    /** 出口类型 */
-    @Excel(name = "出口类型")
+    @Excel(name = "${search.ViewStockoutHistory.exitId}")
    private String exitId;

    /** 出库明细ID */
-    @Excel(name = "出库明细ID")
+    @Excel(name = "${search.ViewStockoutHistory.stockoutDetailId}")
    private String stockoutDetailId;

    /** 产品ID */
-    @Excel(name = "产品ID")
+    @Excel(name = "${search.ViewStockoutHistory.productId}")
    private String productId;

    /** 产品名称 */
-    @Excel(name = "产品名称")
+    @Excel(name = "${search.ViewStockoutHistory.productName}")
    private String productName;

    /** 批次号 */
-    @Excel(name = "批次号")
+    @Excel(name = "${search.ViewStockoutHistory.lotNo}")
    private String lotNo;

    /** 出库数量 */
-    @Excel(name = "出库数量")
+    @Excel(name = "${search.ViewStockoutHistory.quantity}")
    private BigDecimal quantity;

    /** 分配数量 */
-    @Excel(name = "分配数量")
+    @Excel(name = "${search.ViewStockoutHistory.allotQuantity}")
    private BigDecimal allotQuantity;

    /** 分配编号 */
-    @Excel(name = "分配编号")
+    @Excel(name = "${search.ViewStockoutHistory.assignNum}")
    private BigDecimal assignNum;

    /** ERP出库单ID */
-    @Excel(name = "ERP出库单ID")
+    @Excel(name = "${search.ViewStockoutHistory.erpStockoutId}")
    private String erpStockoutId;

    /** 客户编号 */
-    @Excel(name = "客户编号")
+    @Excel(name = "${search.ViewStockoutHistory.entryid}")
    private String entryid;

    /** 客户名称 */
-    @Excel(name = "客户名称")
+    @Excel(name = "${search.ViewStockoutHistory.customerName}")
    private String customerName;

    /** 规格 */
-    @Excel(name = "规格")
+    @Excel(name = "${search.ViewStockoutHistory.spec}")
    private String spec;

    /** 单位 */
-    @Excel(name = "单位")
+    @Excel(name = "${search.ViewStockoutHistory.unit}")
    private String unit;

    /** 价格 */
-    @Excel(name = "价格")
+    @Excel(name = "${search.ViewStockoutHistory.price}")
    private String price;

    /** 英文名称 */
-    @Excel(name = "英文名称")
+    @Excel(name = "${search.ViewStockoutHistory.spare1}")
    private String spare1;

    /** 单件净重 */
-    @Excel(name = "单件净重")
+    @Excel(name = "${search.ViewStockoutHistory.spare2}")
    private String spare2;

    /** 长MM */
-    @Excel(name = "长MM")
+    @Excel(name = "${search.ViewStockoutHistory.spare5}")
    private String spare5;

    /** 宽MM */
-    @Excel(name = "宽MM")
+    @Excel(name = "${search.ViewStockoutHistory.spare6}")
    private String spare6;

    /** 高MM */
-    @Excel(name = "高MM")
+    @Excel(name = "${search.ViewStockoutHistory.spare7}")
    private String spare7;

    /** 体积m³ */
-    @Excel(name = "体积m³")
+    @Excel(name = "${search.ViewStockoutHistory.spare8}")
    private String spare8;

    /** 备注 */
-    @Excel(name = "备注")
+    @Excel(name = "${search.ViewStockoutHistory.remark}")
    private String remark;

    public String getWarehouseId() {