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

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;
 
 

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

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

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

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

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() {

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
+ * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
  */
 @RestController
 @RequestMapping("/search/ViewStockSecure")

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
+ * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
  */
 public interface ViewStockSecureMapper 
 {

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
+ * @author ruoyi
- * @date 2025-05-30
+ * @date 2025-08-06
  */
 public interface IViewStockSecureService 
 {

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
+ * @author ruoyi
- * @date 2025-05-30
+ * @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 结果
      */

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)
     {

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 = "价格")
+    @Excel(name = "${search.ViewStockWarning.spare1}")
-    private String price;
-
-    /** 英文名称 */
-    @Excel(name = "英文名称")
     private String spare1;
 
-    /** 单件净重 */
+    /** $column.columnComment */
-    @Excel(name = "单件净重")
+//    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String spare2;
 
-    /** 长MM */
+    /** $column.columnComment */
-    @Excel(name = "长MM")
+//    @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 */
+    /** $column.columnComment */
-    @Excel(name = "宽MM")
+//    @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 = "物料名称")
+    @Excel(name = "${search.ViewStockWarning.price}")
-    private String productName;
+    private String price;
-
-    /** 规格 */
-    @Excel(name = "规格")
-    private String spec;
 
     /** 单位 */
-    @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() {
+    public void setStockId(String stockId) 
-        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)
     {
         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{" +
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                "stockId='" + stockId + '\'' +
+            .append("stockId", getStockId())
-                ", cargoSpaceId='" + cargoSpaceId + '\'' +
+            .append("cargoSpaceId", getCargoSpaceId())
-                ", stockStatus='" + stockStatus + '\'' +
+            .append("stockStatus", getStockStatus())
-                ", productStatus='" + productStatus + '\'' +
+            .append("productStatus", getProductStatus())
-                ", lotNo='" + lotNo + '\'' +
+            .append("lotNo", getLotNo())
-                ", inDate='" + inDate + '\'' +
+            .append("inDate", getInDate())
-                ", backDate='" + backDate + '\'' +
+            .append("backDate", getBackDate())
-                ", productGuid='" + productGuid + '\'' +
+            .append("productGuid", getProductGuid())
-                ", quantity='" + quantity + '\'' +
+            .append("quantity", getQuantity())
-                ", jobId='" + jobId + '\'' +
+            .append("jobId", getJobId())
-                ", trayCode='" + trayCode + '\'' +
+            .append("trayCode", getTrayCode())
-                ", outQuantity='" + outQuantity + '\'' +
+            .append("outQuantity", getOutQuantity())
-                ", stockinDetailId='" + stockinDetailId + '\'' +
+            .append("stockinDetailId", getStockinDetailId())
-                ", stockinId='" + stockinId + '\'' +
+            .append("stockinId", getStockinId())
-                ", inType='" + inType + '\'' +
+            .append("inType", getInType())
-                ", inClassId='" + inClassId + '\'' +
+            .append("inClassId", getInClassId())
-                ", warehouseId='" + warehouseId + '\'' +
+            .append("warehouseId", getWarehouseId())
-                ", stackingId='" + stackingId + '\'' +
+            .append("stackingId", getStackingId())
-                ", price='" + price + '\'' +
+            .append("spare1", getSpare1())
-                ", spare1='" + spare1 + '\'' +
+            .append("spare2", getSpare2())
-                ", spare2='" + spare2 + '\'' +
+            .append("spare3", getSpare3())
-                ", spare5='" + spare5 + '\'' +
+            .append("spare4", getSpare4())
-                ", spare6='" + spare6 + '\'' +
+            .append("spare5", getSpare5())
-                ", spare7='" + spare7 + '\'' +
+            .append("spare6", getSpare6())
-                ", spare8='" + spare8 + '\'' +
+            .append("productId", getProductId())
-                ", remark='" + remark + '\'' +
+            .append("warehouseName", getWarehouseName())
-                ", productId='" + productId + '\'' +
+            .append("address", getAddress())
-                ", warehouseName='" + warehouseName + '\'' +
+            .append("cDesc", getcDesc())
-                ", address='" + address + '\'' +
+            .append("warehouseKind", getWarehouseKind())
-                ", cDesc='" + cDesc + '\'' +
+            .append("warehouseType", getWarehouseType())
-                ", warehouseKind='" + warehouseKind + '\'' +
+            .append("isCurrent", getIsCurrent())
-                ", warehouseType='" + warehouseType + '\'' +
+            .append("price", getPrice())
-                ", isCurrent='" + isCurrent + '\'' +
+            .append("unit", getUnit())
-                ", productName='" + productName + '\'' +
+            .append("spec", getSpec())
-                ", spec='" + spec + '\'' +
+            .append("enName", getEnName())
-                ", unit='" + unit + '\'' +
+            .append("weight", getWeight())
-                ", cargoSpaceName='" + cargoSpaceName + '\'' +
+            .append("longMM", getLongMM())
-                ", roadwayId='" + roadwayId + '\'' +
+            .append("wide", getWide())
-                ", cargoAreaId='" + cargoAreaId + '\'' +
+            .append("hight", getHight())
-                ", theType='" + theType + '\'' +
+            .append("volume", getVolume())
-                ", theTypeName='" + theTypeName + '\'' +
+            .append("productName", getProductName())
-                ", thePlatoon=" + thePlatoon +
+            .append("cargoSpaceName", getCargoSpaceName())
-                ", theColumn=" + theColumn +
+            .append("roadwayId", getRoadwayId())
-                ", theFloor=" + theFloor +
+            .append("cargoAreaId", getCargoAreaId())
-                ", cargoStatus='" + cargoStatus + '\'' +
+            .append("theType", getTheType())
-                ", locked='" + locked + '\'' +
+            .append("theTypeName", getTheTypeName())
-                ", cargoHight='" + cargoHight + '\'' +
+            .append("thePlatoon", getThePlatoon())
-                ", issDouble='" + issDouble + '\'' +
+            .append("theColumn", getTheColumn())
-                ", groupCodingNo='" + groupCodingNo + '\'' +
+            .append("theFloor", getTheFloor())
-                ", groupCoding='" + groupCoding + '\'' +
+            .append("cargoStatus", getCargoStatus())
-                ", cargoSpaceLogo='" + cargoSpaceLogo + '\'' +
+            .append("locked", getLocked())
-                ", thisCargoArea='" + thisCargoArea + '\'' +
+            .append("cargoHight", getCargoHight())
-                '}';
+            .append("issDouble", getIssDouble())
+            .append("groupCodingNo", getGroupCodingNo())
+            .append("groupCoding", getGroupCoding())
+            .append("cargoSpaceLogo", getCargoSpaceLogo())
+            .append("thisCargoArea", getThisCargoArea())
+            .toString();
     }
 }

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 预警库存查询主键
+     * @param stockId 库存预警报表主键
-     * @return 预警库存查询
+     * @return 库存预警报表
      */
     public ViewStockWarning selectViewStockWarningByStockId(String stockId);
 
     /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
      * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
-     * @return 预警库存查询集合
+     * @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 结果

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 预警库存查询主键
+     * @param stockId 库存预警报表主键
-     * @return 预警库存查询
+     * @return 库存预警报表
      */
     public ViewStockWarning selectViewStockWarningByStockId(String stockId);
 
     /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
      * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
-     * @return 预警库存查询集合
+     * @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);

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 预警库存查询主键
+     * @param stockId 库存预警报表主键
-     * @return 预警库存查询
+     * @return 库存预警报表
      */
     @Override
     public ViewStockWarning selectViewStockWarningByStockId(String stockId)
@@ -34,22 +32,21 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService
     }
 
     /**
-     * 查询预警库存查询列表
+     * 查询库存预警报表列表
-     *
+     * 
-     * @param viewStockWarning 预警库存查询
+     * @param viewStockWarning 库存预警报表
-     * @return 预警库存查询
+     * @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

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() {

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() {

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -71,3 +71,367 @@ error.message4=没有该拣选工位绑定的电子标签
 error.message5=容器码不能为空
 error.message6=起始点位不能为空
 error.message7=目标点位不能为空
+
+#ViewStockWarning
+search.ViewStockWarning.stockId=Stock ID
+search.ViewStockWarning.cargoSpaceId=Cargo Space ID
+search.ViewStockWarning.stockStatus=Stock Status
+search.ViewStockWarning.productStatus=Product Status
+search.ViewStockWarning.lotNo=Lot Number
+search.ViewStockWarning.inDate=In Date
+search.ViewStockWarning.backDate=Back Date
+search.ViewStockWarning.productGuid=Product GUID
+search.ViewStockWarning.quantity=Quantity
+search.ViewStockWarning.jobId=Job ID
+search.ViewStockWarning.trayCode=Tray Code
+search.ViewStockWarning.outQuantity=Out Quantity
+search.ViewStockWarning.stockinDetailId=Stock In Detail ID
+search.ViewStockWarning.stockinId=Stock In ID
+search.ViewStockWarning.inType=In Type
+search.ViewStockWarning.inClassId=In Class ID
+search.ViewStockWarning.warehouseId=Warehouse ID
+search.ViewStockWarning.stackingId=Stacking ID
+search.ViewStockWarning.spare1=Stock Warning Flag
+search.ViewStockWarning.productId=Product ID
+search.ViewStockWarning.warehouseName=Warehouse Name
+search.ViewStockWarning.address=Address
+search.ViewStockWarning.cDesc=Description
+search.ViewStockWarning.warehouseKind=Warehouse Kind
+search.ViewStockWarning.warehouseType=Warehouse Type
+search.ViewStockWarning.isCurrent=Is Current
+search.ViewStockWarning.price=Price
+search.ViewStockWarning.unit=Unit
+search.ViewStockWarning.spec=Specification
+search.ViewStockWarning.enName=English Name
+search.ViewStockWarning.weight=Weight
+search.ViewStockWarning.longMM=Length MM
+search.ViewStockWarning.wide=Width MM
+search.ViewStockWarning.hight=Height MM
+search.ViewStockWarning.volume=Volume m³
+search.ViewStockWarning.productName=Product Name
+search.ViewStockWarning.cargoSpaceName=Cargo Space Name
+search.ViewStockWarning.roadwayId=Roadway ID
+search.ViewStockWarning.cargoAreaId=Cargo Area ID
+search.ViewStockWarning.theType=Cargo Type
+search.ViewStockWarning.theTypeName=Cargo Type Name
+search.ViewStockWarning.thePlatoon=Row
+search.ViewStockWarning.theColumn=Column
+search.ViewStockWarning.theFloor=Floor
+search.ViewStockWarning.cargoStatus=Cargo Status
+search.ViewStockWarning.locked=Locked
+search.ViewStockWarning.cargoHight=Cargo Height
+search.ViewStockWarning.issDouble=Is Double
+search.ViewStockWarning.groupCodingNo=Group Coding No
+search.ViewStockWarning.groupCoding=Group Coding
+search.ViewStockWarning.cargoSpaceLogo=Cargo Space Logo
+search.ViewStockWarning.thisCargoArea=This Cargo Area
+
+#ViewStockSecure
+search.ViewStockSecure.stockId=Stock ID
+search.ViewStockSecure.cargoSpaceId=Cargo Space ID
+search.ViewStockSecure.stockStatus=Stock Status
+search.ViewStockSecure.productStatus=Product Status
+search.ViewStockSecure.lotNo=Lot Number
+search.ViewStockSecure.inDate=In Date
+search.ViewStockSecure.backDate=Back Date
+search.ViewStockSecure.productGuid=Product GUID
+search.ViewStockSecure.quantity=Quantity
+search.ViewStockSecure.jobId=Job ID
+search.ViewStockSecure.trayCode=Tray Code
+search.ViewStockSecure.outQuantity=Out Quantity
+search.ViewStockSecure.stockinDetailId=Stock In Detail ID
+search.ViewStockSecure.stockinId=Stock In ID
+search.ViewStockSecure.inType=In Type
+search.ViewStockSecure.inClassId=In Class ID
+search.ViewStockSecure.warehouseId=Warehouse ID
+search.ViewStockSecure.stackingId=Stack Type ID
+search.ViewStockSecure.spare1=Stock Warning Flag
+search.ViewStockSecure.productId=Product ID
+search.ViewStockSecure.warehouseName=Warehouse Name
+search.ViewStockSecure.address=Address
+search.ViewStockSecure.cDesc=Description
+search.ViewStockSecure.warehouseKind=Warehouse Kind
+search.ViewStockSecure.warehouseType=Warehouse Type
+search.ViewStockSecure.isCurrent=Is Current
+search.ViewStockSecure.price=Price
+search.ViewStockSecure.unit=Unit
+search.ViewStockSecure.spec=Specification
+search.ViewStockSecure.enName=English Name
+search.ViewStockSecure.weight=Weight
+search.ViewStockSecure.longMM=Length MM
+search.ViewStockSecure.wide=Width MM
+search.ViewStockSecure.hight=Height MM
+search.ViewStockSecure.volume=Volume m³
+search.ViewStockSecure.productName=Product Name
+search.ViewStockSecure.cargoSpaceName=Cargo Space Name
+search.ViewStockSecure.roadwayId=Roadway ID
+search.ViewStockSecure.cargoAreaId=Cargo Area ID
+search.ViewStockSecure.theType=Type
+search.ViewStockSecure.theTypeName=Type Name
+search.ViewStockSecure.thePlatoon=Platoon
+search.ViewStockSecure.theColumn=Column
+search.ViewStockSecure.theFloor=Floor
+search.ViewStockSecure.cargoStatus=Cargo Status
+search.ViewStockSecure.locked=Locked
+search.ViewStockSecure.cargoHight=Cargo Height
+search.ViewStockSecure.issDouble=Is Double
+search.ViewStockSecure.groupCodingNo=Group Coding No
+search.ViewStockSecure.groupCoding=Group Coding
+search.ViewStockSecure.cargoSpaceLogo=Cargo Space Logo
+search.ViewStockSecure.thisCargoArea=This Cargo Area
+
+#ViewFlatWarehouseOutFlow
+search.ViewFlatWarehouseOutFlow.inOrOut=In/Out Type
+search.ViewFlatWarehouseOutFlow.inOrOutSotckId=In/Out Main Document ID
+search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId=In/Out Sub Document ID
+search.ViewFlatWarehouseOutFlow.productGuid=Product GUID
+search.ViewFlatWarehouseOutFlow.productId=Product ID
+search.ViewFlatWarehouseOutFlow.quantity=In/Out Quantity
+search.ViewFlatWarehouseOutFlow.createMan=Creator
+search.ViewFlatWarehouseOutFlow.warehouseId=Warehouse ID
+search.ViewFlatWarehouseOutFlow.warehouseName=Warehouse Name
+search.ViewFlatWarehouseOutFlow.address=Address
+search.ViewFlatWarehouseOutFlow.cDesc=Description
+search.ViewFlatWarehouseOutFlow.warehouseKind=Warehouse Kind
+search.ViewFlatWarehouseOutFlow.warehouseType=Warehouse Type
+search.ViewFlatWarehouseOutFlow.isCurrent=Is Current
+search.ViewFlatWarehouseOutFlow.productName=Product Name
+search.ViewFlatWarehouseOutFlow.spec=Specification
+search.ViewFlatWarehouseOutFlow.unit=Unit
+search.ViewFlatWarehouseOutFlow.price=Price
+search.ViewFlatWarehouseOutFlow.spare1=English Name
+search.ViewFlatWarehouseOutFlow.spare2=Net Weight
+search.ViewFlatWarehouseOutFlow.spare5=Length MM
+search.ViewFlatWarehouseOutFlow.spare6=Width MM
+search.ViewFlatWarehouseOutFlow.spare7=Height MM
+search.ViewFlatWarehouseOutFlow.spare8=Volume m³
+search.ViewFlatWarehouseOutFlow.remark=Remark
+
+# ViewFlatWarehouseInFlow
+search.ViewFlatWarehouseInFlow.inOrOut=In/Out Type
+search.ViewFlatWarehouseInFlow.inOrOutSotckId=In/Out Main Document ID
+search.ViewFlatWarehouseInFlow.inOrOutSotckDetailId=In/Out Sub Document ID
+search.ViewFlatWarehouseInFlow.productGuid=Product GUID
+search.ViewFlatWarehouseInFlow.productId=Product ID
+search.ViewFlatWarehouseInFlow.quantity=Quantity
+search.ViewFlatWarehouseInFlow.createMan=Creator
+search.ViewFlatWarehouseInFlow.warehouseId=Warehouse ID
+search.ViewFlatWarehouseInFlow.warehouseName=Warehouse Name
+search.ViewFlatWarehouseInFlow.address=Warehouse Address
+search.ViewFlatWarehouseInFlow.cDesc=Warehouse Description
+search.ViewFlatWarehouseInFlow.warehouseKind=Warehouse Level
+search.ViewFlatWarehouseInFlow.warehouseType=Warehouse Type
+search.ViewFlatWarehouseInFlow.isCurrent=Is Available
+search.ViewFlatWarehouseInFlow.productName=Product Name
+search.ViewFlatWarehouseInFlow.spec=Specification
+search.ViewFlatWarehouseInFlow.unit=Unit
+search.ViewFlatWarehouseInFlow.price=Price
+search.ViewFlatWarehouseInFlow.spare1=English Name
+search.ViewFlatWarehouseInFlow.spare2=Net Weight per Unit
+search.ViewFlatWarehouseInFlow.spare5=Length MM
+search.ViewFlatWarehouseInFlow.spare6=Width MM
+search.ViewFlatWarehouseInFlow.spare7=Height MM
+search.ViewFlatWarehouseInFlow.spare8=Volume m³
+search.ViewFlatWarehouseInFlow.remark=Remark
+
+# ViewInJobFlow
+search.ViewInJobFlow.jobId=Job ID
+search.ViewInJobFlow.jobDetailId=Job Detail ID
+search.ViewInJobFlow.status=Status
+search.ViewInJobFlow.taskNo=Task Number
+search.ViewInJobFlow.trayCode=Tray Code
+search.ViewInJobFlow.roadwayId=Roadway ID
+search.ViewInJobFlow.cargoSpaceId=Cargo Space ID
+search.ViewInJobFlow.cargoSpaceName=Cargo Space Name
+search.ViewInJobFlow.thePlatoon=Row
+search.ViewInJobFlow.theColumn=Column
+search.ViewInJobFlow.theFloor=Floor
+search.ViewInJobFlow.priority=Priority
+search.ViewInJobFlow.executionPhase=Execution Phase
+search.ViewInJobFlow.inOrOut=Job Type
+search.ViewInJobFlow.entranceId=Entrance ID
+search.ViewInJobFlow.productId=Product ID
+search.ViewInJobFlow.lotNo=Lot Number
+search.ViewInJobFlow.stackingId=Stacking ID
+search.ViewInJobFlow.stockStatus=Stock Status
+search.ViewInJobFlow.inQuantity=In Quantity
+search.ViewInJobFlow.inOrOutId=Document ID
+search.ViewInJobFlow.inOrOutDId=Sub Document ID
+search.ViewInJobFlow.startTime=Start Time
+search.ViewInJobFlow.finishTime=Finish Time
+search.ViewInJobFlow.warehouseId=Warehouse ID
+search.ViewInJobFlow.productName=Product Name
+search.ViewInJobFlow.spec=Specification
+search.ViewInJobFlow.unit=Unit
+search.ViewInJobFlow.price=Price
+search.ViewInJobFlow.spare1=English Name
+search.ViewInJobFlow.spare2=Net Weight per Unit
+search.ViewInJobFlow.spare5=Length MM
+search.ViewInJobFlow.spare6=Width MM
+search.ViewInJobFlow.spare7=Height MM
+search.ViewInJobFlow.spare8=Volume m³
+search.ViewInJobFlow.remark=Remark
+
+#ViewOutJobFlow
+search.ViewOutJobFlow.jobId=Job ID
+search.ViewOutJobFlow.jobDetailId=Job Detail ID
+search.ViewOutJobFlow.status=Status
+search.ViewOutJobFlow.taskNo=Task Number
+search.ViewOutJobFlow.trayCode=Tray Code
+search.ViewOutJobFlow.roadwayId=Roadway ID
+search.ViewOutJobFlow.cargoSpaceId=Cargo Space ID
+search.ViewOutJobFlow.cargoSpaceName=Cargo Space Name
+search.ViewOutJobFlow.thePlatoon=Row
+search.ViewOutJobFlow.theColumn=Column
+search.ViewOutJobFlow.theFloor=Floor
+search.ViewOutJobFlow.priority=Priority
+search.ViewOutJobFlow.executionPhase=Execution Phase
+search.ViewOutJobFlow.inOrOut=Job Type
+search.ViewOutJobFlow.exitId=Exit ID
+search.ViewOutJobFlow.productId=Product ID
+search.ViewOutJobFlow.lotNo=Lot Number
+search.ViewOutJobFlow.stackingId=Stacking ID
+search.ViewOutJobFlow.stockStatus=Stock Status
+search.ViewOutJobFlow.outQuantity=Out Quantity
+search.ViewOutJobFlow.giveNum=Return Quantity
+search.ViewOutJobFlow.inOrOutId=Document ID
+search.ViewOutJobFlow.inOrOutDId=Sub Document ID
+search.ViewOutJobFlow.startTime=Start Time
+search.ViewOutJobFlow.finishTime=Finish Time
+search.ViewOutJobFlow.warehouseId=Warehouse ID
+search.ViewOutJobFlow.productName=Product Name
+search.ViewOutJobFlow.spec=Specification
+search.ViewOutJobFlow.unit=Unit
+search.ViewOutJobFlow.customerName=Customer Name
+search.ViewOutJobFlow.price=Price
+search.ViewOutJobFlow.spare1=English Name
+search.ViewOutJobFlow.spare2=Net Weight per Unit
+search.ViewOutJobFlow.spare5=Length MM
+search.ViewOutJobFlow.spare6=Width MM
+search.ViewOutJobFlow.spare7=Height MM
+search.ViewOutJobFlow.spare8=Volume m³
+search.ViewOutJobFlow.remark=Remark
+
+# ViewStockoutHistory
+search.ViewStockoutHistory.stockoutId=Stockout ID
+search.ViewStockoutHistory.warehouseId=Warehouse ID
+search.ViewStockoutHistory.outType=Out Type
+search.ViewStockoutHistory.createDate=Create Date
+search.ViewStockoutHistory.createManId=Creator ID
+search.ViewStockoutHistory.status=Status
+search.ViewStockoutHistory.stockoutSource=Stockout Source
+search.ViewStockoutHistory.exitId=Exit Type
+search.ViewStockoutHistory.stockoutDetailId=Stockout Detail ID
+search.ViewStockoutHistory.productId=Product ID
+search.ViewStockoutHistory.productName=Product Name
+search.ViewStockoutHistory.lotNo=Lot Number
+search.ViewStockoutHistory.quantity=Out Quantity
+search.ViewStockoutHistory.allotQuantity=Allot Quantity
+search.ViewStockoutHistory.assignNum=Assign Number
+search.ViewStockoutHistory.erpStockoutId=ERP Stockout ID
+search.ViewStockoutHistory.entryid=Customer Code
+search.ViewStockoutHistory.customerName=Customer Name
+search.ViewStockoutHistory.spec=Specification
+search.ViewStockoutHistory.unit=Unit
+search.ViewStockoutHistory.price=Price
+search.ViewStockoutHistory.spare1=English Name
+search.ViewStockoutHistory.spare2=Net Weight per Unit
+search.ViewStockoutHistory.spare5=Length MM
+search.ViewStockoutHistory.spare6=Width MM
+search.ViewStockoutHistory.spare7=Height MM
+search.ViewStockoutHistory.spare8=Volume m³
+search.ViewStockoutHistory.remark=Remark
+
+# ViewStockinHistory
+search.ViewStockinHistory.stockinGuid=Stockin GUID
+search.ViewStockinHistory.stockinId=Stockin ID
+search.ViewStockinHistory.inType=In Type
+search.ViewStockinHistory.createDate=Create Date
+search.ViewStockinHistory.createManId=Creator
+search.ViewStockinHistory.status=Status
+search.ViewStockinHistory.warehouseId=Warehouse ID
+search.ViewStockinHistory.finishDate=Finish Date
+search.ViewStockinHistory.erpBill=ERP Bill
+search.ViewStockinHistory.stockSource=Stock Source
+search.ViewStockinHistory.departmentNo=Department No
+search.ViewStockinHistory.classNo=Class No
+search.ViewStockinHistory.supplierNo=Supplier No
+search.ViewStockinHistory.supplierName=Supplier Name
+search.ViewStockinHistory.simpleName=Simple Name
+search.ViewStockinHistory.contactName=Contact Name
+search.ViewStockinHistory.contactNumber=Contact Number
+search.ViewStockinHistory.address=Supplier Address
+search.ViewStockinHistory.stockinDetailId=Stockin Detail ID
+search.ViewStockinHistory.lotNo=Lot Number
+search.ViewStockinHistory.quantity=Planned Quantity
+search.ViewStockinHistory.quantityX=Planned Boxes
+search.ViewStockinHistory.quantityJ=Planned Pieces
+search.ViewStockinHistory.assignNum=Actual Quantity
+search.ViewStockinHistory.assignNumX=Actual Boxes
+search.ViewStockinHistory.assignNumJ=Actual Pieces
+search.ViewStockinHistory.scanNum=Scan Quantity
+search.ViewStockinHistory.scanNumX=Scan Boxes
+search.ViewStockinHistory.scanNumJ=Scan Pieces
+search.ViewStockinHistory.printDate=In Date
+search.ViewStockinHistory.stockStatus=Stock Status
+search.ViewStockinHistory.price=Price
+search.ViewStockinHistory.productId=Product ID
+search.ViewStockinHistory.productName=Product Name
+search.ViewStockinHistory.unit=Unit
+search.ViewStockinHistory.spec=Specification
+search.ViewStockinHistory.spare1=English Name
+search.ViewStockinHistory.spare2=Net Weight per Unit
+search.ViewStockinHistory.spare5=Length MM
+search.ViewStockinHistory.spare6=Width MM
+search.ViewStockinHistory.spare7=Height MM
+search.ViewStockinHistory.spare8=Volume m³
+search.ViewStockinHistory.remark=Remark
+
+# StockSummary
+search.StockSummary.productId=Product ID
+search.StockSummary.productName=Product Name
+search.StockSummary.spec=Specification
+search.StockSummary.unit=Unit
+search.StockSummary.lotNo=Lot Number
+search.StockSummary.warehouseName=Warehouse
+search.StockSummary.quantity=Stock Quantity
+search.StockSummary.price=Price
+search.StockSummary.spare1=English Name
+search.StockSummary.spare2=Net Weight per Unit
+search.StockSummary.spare5=Length MM
+search.StockSummary.spare6=Width MM
+search.StockSummary.spare7=Height MM
+search.StockSummary.spare8=Volume m³
+search.StockSummary.remark=Remark
+search.StockSummary.cargoSpaceName=Cargo Space Name
+
+# ViewStockDetail
+search.ViewStockDetail.onlyIdentity=ID
+search.ViewStockDetail.stockId=Stock ID
+search.ViewStockDetail.cargoSpaceId=Cargo Space ID
+search.ViewStockDetail.trayCode=Tray Code
+search.ViewStockDetail.quantity=Quantity
+search.ViewStockDetail.jobId=Job ID
+search.ViewStockDetail.lotNo=Lot Number
+search.ViewStockDetail.stockinDetailId=Stock In Detail ID
+search.ViewStockDetail.inDate=In Date
+search.ViewStockDetail.warehouseId=Warehouse
+search.ViewStockDetail.stackingId=Stacking ID
+search.ViewStockDetail.cargoSpaceName=Cargo Space Name
+search.ViewStockDetail.roadwayId=Roadway ID
+search.ViewStockDetail.cargoSpaceStatus=Cargo Space Status
+search.ViewStockDetail.locked=Locked
+search.ViewStockDetail.productId=Product ID
+search.ViewStockDetail.productName=Product Name
+search.ViewStockDetail.spec=Specification
+search.ViewStockDetail.unit=Unit
+search.ViewStockDetail.price=Price
+search.ViewStockDetail.spare1=English Name
+search.ViewStockDetail.spare2=Net Weight per Unit
+search.ViewStockDetail.spare5=Length MM
+search.ViewStockDetail.spare6=Width MM
+search.ViewStockDetail.spare7=Height MM
+search.ViewStockDetail.spare8=Volume m³
+search.ViewStockDetail.remark=Remark
+search.ViewStockDetail.stockStatus=Stock Status
+search.ViewStockDetail.productStatus=Product Status

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -69,3 +69,367 @@ error.message4=没有该拣选工位绑定的电子标签
 error.message5=容器码不能为空
 error.message6=起始点位不能为空
 error.message7=目标点位不能为空
+
+#ViewStockWarning
+search.ViewStockWarning.stockId=库存ID
+search.ViewStockWarning.cargoSpaceId=货位ID
+search.ViewStockWarning.stockStatus=库存状态
+search.ViewStockWarning.productStatus=物料状态
+search.ViewStockWarning.lotNo=批次号
+search.ViewStockWarning.inDate=入库时间
+search.ViewStockWarning.backDate=回流时间
+search.ViewStockWarning.productGuid=物料GUID
+search.ViewStockWarning.quantity=库存数量
+search.ViewStockWarning.jobId=作业ID
+search.ViewStockWarning.trayCode=托盘条码
+search.ViewStockWarning.outQuantity=出库数量
+search.ViewStockWarning.stockinDetailId=入库子单ID
+search.ViewStockWarning.stockinId=入库主单
+search.ViewStockWarning.inType=入库类型
+search.ViewStockWarning.inClassId=入库班组ID
+search.ViewStockWarning.warehouseId=仓库ID
+search.ViewStockWarning.stackingId=垛型ID
+search.ViewStockWarning.spare1=库存预警标识
+search.ViewStockWarning.productId=物料ID
+search.ViewStockWarning.warehouseName=仓库名称
+search.ViewStockWarning.address=仓库地址
+search.ViewStockWarning.cDesc=仓库描述
+search.ViewStockWarning.warehouseKind=仓库级别
+search.ViewStockWarning.warehouseType=仓库类型
+search.ViewStockWarning.isCurrent=是否可用
+search.ViewStockWarning.price=价格
+search.ViewStockWarning.unit=单位
+search.ViewStockWarning.spec=规格
+search.ViewStockWarning.enName=英文名称
+search.ViewStockWarning.weight=单件净重
+search.ViewStockWarning.longMM=长MM
+search.ViewStockWarning.wide=宽MM
+search.ViewStockWarning.hight=高MM
+search.ViewStockWarning.volume=体积m³
+search.ViewStockWarning.productName=物料名称
+search.ViewStockWarning.cargoSpaceName=货位名称
+search.ViewStockWarning.roadwayId=巷道ID
+search.ViewStockWarning.cargoAreaId=货区ID
+search.ViewStockWarning.theType=货位类型
+search.ViewStockWarning.theTypeName=货位类型名称
+search.ViewStockWarning.thePlatoon=排
+search.ViewStockWarning.theColumn=列
+search.ViewStockWarning.theFloor=层
+search.ViewStockWarning.cargoStatus=货位状态
+search.ViewStockWarning.locked=是否锁定
+search.ViewStockWarning.cargoHight=货位高度
+search.ViewStockWarning.issDouble=是否双伸
+search.ViewStockWarning.groupCodingNo=双货位分组编码
+search.ViewStockWarning.groupCoding=双货位分组编码
+search.ViewStockWarning.cargoSpaceLogo=双货位标识
+search.ViewStockWarning.thisCargoArea=本仓库区域
+
+#ViewStockSecure
+search.ViewStockSecure.stockId=库存ID
+search.ViewStockSecure.cargoSpaceId=货位ID
+search.ViewStockSecure.stockStatus=库存状态
+search.ViewStockSecure.productStatus=物料状态
+search.ViewStockSecure.lotNo=批次号
+search.ViewStockSecure.inDate=入库时间
+search.ViewStockSecure.backDate=回流时间
+search.ViewStockSecure.productGuid=物料GUID
+search.ViewStockSecure.quantity=库存数量
+search.ViewStockSecure.jobId=作业ID
+search.ViewStockSecure.trayCode=托盘条码
+search.ViewStockSecure.outQuantity=出库数量
+search.ViewStockSecure.stockinDetailId=入库子单ID
+search.ViewStockSecure.stockinId=入库主单
+search.ViewStockSecure.inType=入库类型
+search.ViewStockSecure.inClassId=入库班组ID
+search.ViewStockSecure.warehouseId=仓库ID
+search.ViewStockSecure.stackingId=垛型ID
+search.ViewStockSecure.spare1=库存预警标识
+search.ViewStockSecure.productId=物料ID
+search.ViewStockSecure.warehouseName=仓库名称
+search.ViewStockSecure.address=仓库地址
+search.ViewStockSecure.cDesc=仓库描述
+search.ViewStockSecure.warehouseKind=仓库级别
+search.ViewStockSecure.warehouseType=仓库类型
+search.ViewStockSecure.isCurrent=是否可用
+search.ViewStockSecure.price=价格
+search.ViewStockSecure.unit=单位
+search.ViewStockSecure.spec=规格
+search.ViewStockSecure.enName=英文名称
+search.ViewStockSecure.weight=单件净重
+search.ViewStockSecure.longMM=长MM
+search.ViewStockSecure.wide=宽MM
+search.ViewStockSecure.hight=高MM
+search.ViewStockSecure.volume=体积m³
+search.ViewStockSecure.productName=物料名称
+search.ViewStockSecure.cargoSpaceName=货位名称
+search.ViewStockSecure.roadwayId=巷道ID
+search.ViewStockSecure.cargoAreaId=货区ID
+search.ViewStockSecure.theType=货位类型
+search.ViewStockSecure.theTypeName=货位类型名称
+search.ViewStockSecure.thePlatoon=排
+search.ViewStockSecure.theColumn=列
+search.ViewStockSecure.theFloor=层
+search.ViewStockSecure.cargoStatus=货位状态
+search.ViewStockSecure.locked=是否锁定
+search.ViewStockSecure.cargoHight=货位高度
+search.ViewStockSecure.issDouble=是否双伸
+search.ViewStockSecure.groupCodingNo=双货位分组编码
+search.ViewStockSecure.groupCoding=双货位分组编码
+search.ViewStockSecure.cargoSpaceLogo=双货位标识
+search.ViewStockSecure.thisCargoArea=本仓库区域
+
+#ViewFlatWarehouseOutFlow
+search.ViewFlatWarehouseOutFlow.inOrOut=入出库类型
+search.ViewFlatWarehouseOutFlow.inOrOutSotckId=入出库主单据ID
+search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId=入出库主子单据ID
+search.ViewFlatWarehouseOutFlow.productGuid=物料GUID
+search.ViewFlatWarehouseOutFlow.productId=物料ID
+search.ViewFlatWarehouseOutFlow.quantity=入出库数量
+search.ViewFlatWarehouseOutFlow.createMan=创建人
+search.ViewFlatWarehouseOutFlow.warehouseId=仓库ID
+search.ViewFlatWarehouseOutFlow.warehouseName=仓库名称
+search.ViewFlatWarehouseOutFlow.address=仓库地址
+search.ViewFlatWarehouseOutFlow.cDesc=仓库描述
+search.ViewFlatWarehouseOutFlow.warehouseKind=仓库级别
+search.ViewFlatWarehouseOutFlow.warehouseType=仓库类型
+search.ViewFlatWarehouseOutFlow.isCurrent=是否可用
+search.ViewFlatWarehouseOutFlow.productName=物料名称
+search.ViewFlatWarehouseOutFlow.spec=规格
+search.ViewFlatWarehouseOutFlow.unit=单位
+search.ViewFlatWarehouseOutFlow.price=价格
+search.ViewFlatWarehouseOutFlow.spare1=英文名称
+search.ViewFlatWarehouseOutFlow.spare2=单件净重
+search.ViewFlatWarehouseOutFlow.spare5=长MM
+search.ViewFlatWarehouseOutFlow.spare6=宽MM
+search.ViewFlatWarehouseOutFlow.spare7=高MM
+search.ViewFlatWarehouseOutFlow.spare8=体积m³
+search.ViewFlatWarehouseOutFlow.remark=备注
+
+# ViewFlatWarehouseInFlow
+search.ViewFlatWarehouseInFlow.inOrOut=入出库类型
+search.ViewFlatWarehouseInFlow.inOrOutSotckId=入出库主单据ID
+search.ViewFlatWarehouseInFlow.inOrOutSotckDetailId=入出库主子单据ID
+search.ViewFlatWarehouseInFlow.productGuid=物料GUID
+search.ViewFlatWarehouseInFlow.productId=物料ID
+search.ViewFlatWarehouseInFlow.quantity=数量
+search.ViewFlatWarehouseInFlow.createMan=创建人
+search.ViewFlatWarehouseInFlow.warehouseId=仓库id
+search.ViewFlatWarehouseInFlow.warehouseName=仓库名称
+search.ViewFlatWarehouseInFlow.address=仓库地址
+search.ViewFlatWarehouseInFlow.cDesc=仓库描述
+search.ViewFlatWarehouseInFlow.warehouseKind=仓库级别
+search.ViewFlatWarehouseInFlow.warehouseType=仓库类型
+search.ViewFlatWarehouseInFlow.isCurrent=是否可用
+search.ViewFlatWarehouseInFlow.productName=物料名称
+search.ViewFlatWarehouseInFlow.spec=规格
+search.ViewFlatWarehouseInFlow.unit=单位
+search.ViewFlatWarehouseInFlow.price=价格
+search.ViewFlatWarehouseInFlow.spare1=英文名称
+search.ViewFlatWarehouseInFlow.spare2=单件净重
+search.ViewFlatWarehouseInFlow.spare5=长MM
+search.ViewFlatWarehouseInFlow.spare6=宽MM
+search.ViewFlatWarehouseInFlow.spare7=高MM
+search.ViewFlatWarehouseInFlow.spare8=体积m³
+search.ViewFlatWarehouseInFlow.remark=备注
+
+# ViewInJobFlow
+search.ViewInJobFlow.jobId=作业ID
+search.ViewInJobFlow.jobDetailId=子作业ID
+search.ViewInJobFlow.status=状态
+search.ViewInJobFlow.taskNo=任务号
+search.ViewInJobFlow.trayCode=托盘号
+search.ViewInJobFlow.roadwayId=巷道ID
+search.ViewInJobFlow.cargoSpaceId=货位ID
+search.ViewInJobFlow.cargoSpaceName=货位名称
+search.ViewInJobFlow.thePlatoon=排
+search.ViewInJobFlow.theColumn=列
+search.ViewInJobFlow.theFloor=层
+search.ViewInJobFlow.priority=优先级
+search.ViewInJobFlow.executionPhase=执行阶段
+search.ViewInJobFlow.inOrOut=作业类型
+search.ViewInJobFlow.entranceId=入口ID
+search.ViewInJobFlow.productId=物料ID
+search.ViewInJobFlow.lotNo=批号
+search.ViewInJobFlow.stackingId=垛型ID
+search.ViewInJobFlow.stockStatus=库存状态
+search.ViewInJobFlow.inQuantity=入库数量
+search.ViewInJobFlow.inOrOutId=单据ID
+search.ViewInJobFlow.inOrOutDId=子单据ID
+search.ViewInJobFlow.startTime=开始时间
+search.ViewInJobFlow.finishTime=结束时间
+search.ViewInJobFlow.warehouseId=仓库ID
+search.ViewInJobFlow.productName=物料名称
+search.ViewInJobFlow.spec=规格
+search.ViewInJobFlow.unit=单位
+search.ViewInJobFlow.price=价格
+search.ViewInJobFlow.spare1=英文名称
+search.ViewInJobFlow.spare2=单件净重
+search.ViewInJobFlow.spare5=长MM
+search.ViewInJobFlow.spare6=宽MM
+search.ViewInJobFlow.spare7=高MM
+search.ViewInJobFlow.spare8=体积m³
+search.ViewInJobFlow.remark=备注
+
+# ViewOutJobFlow
+search.ViewOutJobFlow.jobId=作业ID
+search.ViewOutJobFlow.jobDetailId=子作业ID
+search.ViewOutJobFlow.status=状态
+search.ViewOutJobFlow.taskNo=任务号
+search.ViewOutJobFlow.trayCode=托盘码
+search.ViewOutJobFlow.roadwayId=巷道ID
+search.ViewOutJobFlow.cargoSpaceId=货位ID
+search.ViewOutJobFlow.cargoSpaceName=货位名称
+search.ViewOutJobFlow.thePlatoon=排
+search.ViewOutJobFlow.theColumn=列
+search.ViewOutJobFlow.theFloor=层
+search.ViewOutJobFlow.priority=优先级
+search.ViewOutJobFlow.executionPhase=执行阶段
+search.ViewOutJobFlow.inOrOut=作业类型
+search.ViewOutJobFlow.exitId=出口ID
+search.ViewOutJobFlow.productId=物料ID
+search.ViewOutJobFlow.lotNo=批号
+search.ViewOutJobFlow.stackingId=剁型ID
+search.ViewOutJobFlow.stockStatus=库存状态
+search.ViewOutJobFlow.outQuantity=出库数量
+search.ViewOutJobFlow.giveNum=回流数量
+search.ViewOutJobFlow.inOrOutId=单据ID
+search.ViewOutJobFlow.inOrOutDId=子单据ID
+search.ViewOutJobFlow.startTime=开始时间
+search.ViewOutJobFlow.finishTime=结束时间
+search.ViewOutJobFlow.warehouseId=仓库ID
+search.ViewOutJobFlow.productName=物料名称
+search.ViewOutJobFlow.spec=规格
+search.ViewOutJobFlow.unit=单位
+search.ViewOutJobFlow.customerName=客户名称
+search.ViewOutJobFlow.price=价格
+search.ViewOutJobFlow.spare1=英文名称
+search.ViewOutJobFlow.spare2=单件净重
+search.ViewOutJobFlow.spare5=长MM
+search.ViewOutJobFlow.spare6=宽MM
+search.ViewOutJobFlow.spare7=高MM
+search.ViewOutJobFlow.spare8=体积m³
+search.ViewOutJobFlow.remark=备注
+
+# ViewStockoutHistory
+search.ViewStockoutHistory.stockoutId=出库单号
+search.ViewStockoutHistory.warehouseId=仓库ID
+search.ViewStockoutHistory.outType=出库类型
+search.ViewStockoutHistory.createDate=创建日期
+search.ViewStockoutHistory.createManId=创建人ID
+search.ViewStockoutHistory.status=出库状态
+search.ViewStockoutHistory.stockoutSource=出库来源
+search.ViewStockoutHistory.exitId=出口类型
+search.ViewStockoutHistory.stockoutDetailId=出库明细ID
+search.ViewStockoutHistory.productId=产品ID
+search.ViewStockoutHistory.productName=产品名称
+search.ViewStockoutHistory.lotNo=批次号
+search.ViewStockoutHistory.quantity=出库数量
+search.ViewStockoutHistory.allotQuantity=分配数量
+search.ViewStockoutHistory.assignNum=分配编号
+search.ViewStockoutHistory.erpStockoutId=ERP出库单ID
+search.ViewStockoutHistory.entryid=客户编号
+search.ViewStockoutHistory.customerName=客户名称
+search.ViewStockoutHistory.spec=规格
+search.ViewStockoutHistory.unit=单位
+search.ViewStockoutHistory.price=价格
+search.ViewStockoutHistory.spare1=英文名称
+search.ViewStockoutHistory.spare2=单件净重
+search.ViewStockoutHistory.spare5=长MM
+search.ViewStockoutHistory.spare6=宽MM
+search.ViewStockoutHistory.spare7=高MM
+search.ViewStockoutHistory.spare8=体积m³
+search.ViewStockoutHistory.remark=备注
+
+# ViewStockinHistory
+search.ViewStockinHistory.stockinGuid=入库单guid
+search.ViewStockinHistory.stockinId=入库单号
+search.ViewStockinHistory.inType=入库类型
+search.ViewStockinHistory.createDate=创建时间
+search.ViewStockinHistory.createManId=创建人
+search.ViewStockinHistory.status=单据状态
+search.ViewStockinHistory.warehouseId=仓库ID
+search.ViewStockinHistory.finishDate=完成时间
+search.ViewStockinHistory.erpBill=ERP单号
+search.ViewStockinHistory.stockSource=单据来源
+search.ViewStockinHistory.departmentNo=部门编码
+search.ViewStockinHistory.classNo=班组编码
+search.ViewStockinHistory.supplierNo=供应商编号
+search.ViewStockinHistory.supplierName=供应商名称
+search.ViewStockinHistory.simpleName=供应商简称
+search.ViewStockinHistory.contactName=联系人
+search.ViewStockinHistory.contactNumber=联系电话
+search.ViewStockinHistory.address=供应商地址
+search.ViewStockinHistory.stockinDetailId=入库明细ID
+search.ViewStockinHistory.lotNo=批次号
+search.ViewStockinHistory.quantity=计划数量
+search.ViewStockinHistory.quantityX=计划箱数
+search.ViewStockinHistory.quantityJ=计划件数
+search.ViewStockinHistory.assignNum=实际数量
+search.ViewStockinHistory.assignNumX=实际箱数
+search.ViewStockinHistory.assignNumJ=实际件数
+search.ViewStockinHistory.scanNum=扫码数量
+search.ViewStockinHistory.scanNumX=扫码箱数
+search.ViewStockinHistory.scanNumJ=扫码件数
+search.ViewStockinHistory.printDate=入库日期
+search.ViewStockinHistory.stockStatus=库存状态
+search.ViewStockinHistory.price=单价
+search.ViewStockinHistory.productId=物料编码
+search.ViewStockinHistory.productName=物料名称
+search.ViewStockinHistory.unit=单位
+search.ViewStockinHistory.spec=规格
+search.ViewStockinHistory.spare1=英文名称
+search.ViewStockinHistory.spare2=单件净重
+search.ViewStockinHistory.spare5=长MM
+search.ViewStockinHistory.spare6=宽MM
+search.ViewStockinHistory.spare7=高MM
+search.ViewStockinHistory.spare8=体积m³
+search.ViewStockinHistory.remark=备注
+
+# StockSummary
+search.StockSummary.productId=物料编码
+search.StockSummary.productName=物料名称
+search.StockSummary.spec=规格
+search.StockSummary.unit=单位
+search.StockSummary.lotNo=批号
+search.StockSummary.warehouseName=仓库
+search.StockSummary.quantity=库存数量
+search.StockSummary.price=价格
+search.StockSummary.spare1=英文名称
+search.StockSummary.spare2=单件净重
+search.StockSummary.spare5=长MM
+search.StockSummary.spare6=宽MM
+search.StockSummary.spare7=高MM
+search.StockSummary.spare8=体积m³
+search.StockSummary.remark=备注
+search.StockSummary.cargoSpaceName=货位名称
+
+# ViewStockDetail
+search.ViewStockDetail.onlyIdentity=id
+search.ViewStockDetail.stockId=库存ID
+search.ViewStockDetail.cargoSpaceId=货位ID
+search.ViewStockDetail.trayCode=托盘条码
+search.ViewStockDetail.quantity=数量
+search.ViewStockDetail.jobId=作业ID
+search.ViewStockDetail.lotNo=批号
+search.ViewStockDetail.stockinDetailId=入库子单ID
+search.ViewStockDetail.inDate=入库时间
+search.ViewStockDetail.warehouseId=仓库
+search.ViewStockDetail.stackingId=剁型ID
+search.ViewStockDetail.cargoSpaceName=货位名称
+search.ViewStockDetail.roadwayId=巷道ID
+search.ViewStockDetail.cargoSpaceStatus=货位状态
+search.ViewStockDetail.locked=是否锁定
+search.ViewStockDetail.productId=物料ID
+search.ViewStockDetail.productName=物料名称
+search.ViewStockDetail.spec=规格
+search.ViewStockDetail.unit=单位
+search.ViewStockDetail.price=价格
+search.ViewStockDetail.spare1=英文名称
+search.ViewStockDetail.spare2=单件净重
+search.ViewStockDetail.spare5=长MM
+search.ViewStockDetail.spare6=宽MM
+search.ViewStockDetail.spare7=高MM
+search.ViewStockDetail.spare8=体积m³
+search.ViewStockDetail.remark=备注
+search.ViewStockDetail.stockStatus=库存状态
+search.ViewStockDetail.productStatus=物料状态

ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.check.DifferenceRecordFinish.mapper.CheckDifferenceRecordFinishMapper">
-
-    <resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
-        <result property="checkGuid" column="check_guid"/>
-        <result property="checkStockDetailId" column="check_stock_detail_id"/>
-        <result property="stockId" column="stock_id"/>
-        <result property="trayCode" column="tray_code"/>
-        <result property="cargoSpaceId" column="cargo_space_id"/>
-        <result property="cargoSpaceName" column="cargo_space_name"/>
-        <result property="productId" column="product_id"/>
-        <result property="lotNo" column="lot_no"/>
-        <result property="supplier" column="supplier"/>
-        <result property="customer" column="customer"/>
-        <result property="oldQuantity" column="old_quantity"/>
-        <result property="newQuantity" column="new_quantity"/>
-        <result property="recordType" column="record_type"/>
-        <result property="createTime" column="create_time"/>
-        <result property="productGuid" column="product_guid"/>
-        <result property="status" column="status"/>
-        <result property="warehouseId" column="warehouse_id"/>
-        <result property="warehouseName" column="warehouse_name"/>
-        <association property="extraField" javaType="ExtraField">
-            <result property="productId" column="product_id"/>
-            <result property="materialDesc" column="product_name"/>
-            <result property="englishDesc" column="englishDesc"/>
-            <result property="length" column="length"/>
-            <result property="width" column="width"/>
-            <result property="height" column="height"/>
-            <result property="volume" column="volume"/>
-            <result property="netWeight" column="netWeight"/>
-        </association>
-    </resultMap>
-
-    <sql id="selectCheckDifferenceRecordFinishVo">
-        select r.check_guid,
-               r.check_stock_detail_id,
-               r.stock_id,
-               r.tray_code,
-               r.cargo_space_id,
-               r.product_id,
-               r.lot_no,
-               r.supplier,
-               r.customer,
-               r.old_quantity,
-               r.new_quantity,
-               r.record_type,
-               r.create_time,
-               r.product_guid,
-               r.status,
-               r.warehouse_id,
-               w.warehouse_name,
-               bp.product_name,
-               bp.spare1 as englishDesc,
-               bp.spare2 as netWeight,
-               bp.spare5 as length,
-               bp.spare6 as width,
-               bp.spare7 as height,
-               bp.spare8 as volume,
-               bcs.cargo_space_name
-        from check_difference_record_finish r
-                 left join bas_warehouse w on r.warehouse_id = w.warehouse_id
-                 left join bas_product bp on r.product_id = bp.product_id
-                 left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
-    </sql>
-
-    <select id="selectCheckDifferenceRecordFinishList" parameterType="CheckDifferenceRecordFinish" resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordFinishVo"/>
-        <where>
-            <if test="stockId != null  and stockId != ''"> and r.stock_id = #{stockId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and r.tray_code = #{trayCode}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and r.cargo_space_id = #{cargoSpaceId}</if>
-            <if test="productId != null  and productId != ''"> and r.product_id = #{productId}</if>
-            <if test="lotNo != null  and lotNo != ''"> and r.lot_no = #{lotNo}</if>
-            <if test="supplier != null  and supplier != ''"> and r.supplier = #{supplier}</if>
-            <if test="customer != null  and customer != ''"> and r.customer = #{customer}</if>
-            <if test="oldQuantity != null  and oldQuantity != ''"> and r.old_quantity = #{oldQuantity}</if>
-            <if test="newQuantity != null  and newQuantity != ''"> and r.new_quantity = #{newQuantity}</if>
-            <if test="recordType != null "> and r.record_type = #{recordType}</if>
-            <if test="productGuid != null  and productGuid != ''"> and r.product_guid = #{productGuid}</if>
-            <if test="checkStockDetailId != null  and checkStockDetailId != ''"> and r.check_stock_detail_id = #{checkStockDetailId}</if>
-            <if test="status != null  and status != ''"> and r.status = #{status}</if>
-        </where>
-    </select>
-
-    <select id="selectCheckDifferenceRecordFinishByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
-        <include refid="selectCheckDifferenceRecordFinishVo"/>
-        where check_guid = #{checkGuid}
-    </select>
-
-    <insert id="insertCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecordFinish">
-        insert into check_difference_record_finish
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">check_guid,</if>
-            <if test="stockId != null">stock_id,</if>
-            <if test="trayCode != null">tray_code,</if>
-            <if test="cargoSpaceId != null">cargo_space_id,</if>
-            <if test="productId != null">product_id,</if>
-            <if test="lotNo != null">lot_no,</if>
-            <if test="supplier != null">supplier,</if>
-            <if test="customer != null">customer,</if>
-            <if test="oldQuantity != null">old_quantity,</if>
-            <if test="newQuantity != null">new_quantity,</if>
-            <if test="recordType != null">record_type,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="productGuid != null">product_guid,</if>
-            <if test="checkStockDetailId != null">check_stock_detail_id,</if>
-            <if test="status != null">status,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="checkGuid != null">#{checkGuid},</if>
-            <if test="stockId != null">#{stockId},</if>
-            <if test="trayCode != null">#{trayCode},</if>
-            <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="supplier != null">#{supplier},</if>
-            <if test="customer != null">#{customer},</if>
-            <if test="oldQuantity != null">#{oldQuantity},</if>
-            <if test="newQuantity != null">#{newQuantity},</if>
-            <if test="recordType != null">#{recordType},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="checkStockDetailId != null">#{checkStockDetailId},</if>
-            <if test="status != null">#{status},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCheckDifferenceRecordFinish" parameterType="CheckDifferenceRecordFinish">
-        update check_difference_record_finish
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="stockId != null">stock_id = #{stockId},</if>
-            <if test="trayCode != null">tray_code = #{trayCode},</if>
-            <if test="cargoSpaceId != null">cargo_space_id = #{cargoSpaceId},</if>
-            <if test="productId != null">product_id = #{productId},</if>
-            <if test="lotNo != null">lot_no = #{lotNo},</if>
-            <if test="supplier != null">supplier = #{supplier},</if>
-            <if test="customer != null">customer = #{customer},</if>
-            <if test="oldQuantity != null">old_quantity = #{oldQuantity},</if>
-            <if test="newQuantity != null">new_quantity = #{newQuantity},</if>
-            <if test="recordType != null">record_type = #{recordType},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="productGuid != null">product_guid = #{productGuid},</if>
-            <if test="checkStockDetailId != null">check_stock_detail_id = #{checkStockDetailId},</if>
-            <if test="status != null">status = #{status},</if>
-        </trim>
-        where check_guid = #{checkGuid}
-    </update>
-
-    <delete id="deleteCheckDifferenceRecordFinishByCheckGuid" parameterType="String">
-        delete from check_difference_record_finish where check_guid = #{checkGuid}
-    </delete>
-
-    <delete id="deleteCheckDifferenceRecordFinishByCheckGuids" parameterType="String">
-        delete from check_difference_record_finish where check_guid in
-        <foreach item="checkGuid" collection="array" open="(" separator="," close=")">
-            #{checkGuid}
-        </foreach>
-    </delete>
-</mapper>

ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper">
-
+    
     <resultMap type="ViewStockSecure" id="ViewStockSecureResult">
         <result property="stockId"    column="stock_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stackingId"    column="stacking_id"    />
         <result property="spare1"    column="spare1"    />
         <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
         <result property="productId"    column="product_id"    />
@@ -34,10 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseKind"    column="warehouse_kind"    />
         <result property="warehouseType"    column="warehouse_type"    />
         <result property="isCurrent"    column="is_current"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
         <result property="price"    column="price"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="enName"    column="enName"    />
+        <result property="weight"    column="weight"    />
+        <result property="longMM"    column="longMM"    />
+        <result property="wide"    column="wide"    />
+        <result property="hight"    column="hight"    />
+        <result property="volume"    column="volume"    />
+        <result property="productName"    column="product_name"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -54,74 +62,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="groupCoding"    column="group_coding"    />
         <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
         <result property="thisCargoArea"    column="this_cargo_area"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
     </resultMap>
 
     <sql id="selectViewStockSecureVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_secure vss
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure
     </sql>
 
     <select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
         <include refid="selectViewStockSecureVo"/>
-        <where>
+        <where>  
-            <if test="stockId != null  and stockId != ''"> and stock_id like concat('%', #{stockId}, '%')</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat('%', #{productStatus}, '%')</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat('%', #{inType}, '%')</if>
+            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
-            <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
+            <if test="productId != null  and productId != ''"> and product_id like concat('%',#{productId}, '%')</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc = #{cDesc}</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current = #{isCurrent}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="enName != null  and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="longMM != null  and longMM != ''"> and longMM = #{longMM}</if>
+            <if test="wide != null  and wide != ''"> and wide = #{wide}</if>
+            <if test="hight != null  and hight != ''"> and hight = #{hight}</if>
+            <if test="volume != null  and volume != ''"> and volume = #{volume}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
-            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type = #{theType}</if>
             <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
+            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
-            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat('%', #{cargoStatus}, '%')</if>
+            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
-            <if test="locked != null  and locked != ''"> and locked like concat('%', #{locked}, '%')</if>
+            <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double = #{issDouble}</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding = #{groupCoding}</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
         </where>
     </select>
-
+    
     <select id="selectViewStockSecureByStockId" parameterType="String" resultMap="ViewStockSecureResult">
         <include refid="selectViewStockSecureVo"/>
         where stock_id = #{stockId}
@@ -150,6 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">stacking_id,</if>
             <if test="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
             <if test="productId != null">product_id,</if>
@@ -159,10 +170,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">warehouse_kind,</if>
             <if test="warehouseType != null">warehouse_type,</if>
             <if test="isCurrent != null">is_current,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
             <if test="price != null">price,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="enName != null">enName,</if>
+            <if test="weight != null">weight,</if>
+            <if test="longMM != null">longMM,</if>
+            <if test="wide != null">wide,</if>
+            <if test="hight != null">hight,</if>
+            <if test="volume != null">volume,</if>
+            <if test="productName != null">product_name,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -179,9 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">group_coding,</if>
             <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
             <if test="thisCargoArea != null">this_cargo_area,</if>
-            <if test="spare7 != null">spare7,</if>
+         </trim>
-            <if test="spare8 != null">spare8,</if>
-        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null and stockId != ''">#{stockId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
@@ -203,6 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">#{stackingId},</if>
             <if test="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
             <if test="productId != null">#{productId},</if>
@@ -212,10 +229,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">#{warehouseKind},</if>
             <if test="warehouseType != null">#{warehouseType},</if>
             <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
             <if test="price != null">#{price},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="enName != null">#{enName},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="longMM != null">#{longMM},</if>
+            <if test="wide != null">#{wide},</if>
+            <if test="hight != null">#{hight},</if>
+            <if test="volume != null">#{volume},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -232,9 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">#{groupCoding},</if>
             <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
             <if test="thisCargoArea != null">#{thisCargoArea},</if>
-            <if test="spare7 != null">#{spare7},</if>
+         </trim>
-            <if test="spare8 != null">#{spare8},</if>
-        </trim>
     </insert>
 
     <update id="updateViewStockSecure" parameterType="ViewStockSecure">
@@ -259,6 +280,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
             <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
             <if test="productId != null">product_id = #{productId},</if>
@@ -268,10 +291,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
             <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
             <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
             <if test="price != null">price = #{price},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="enName != null">enName = #{enName},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="longMM != null">longMM = #{longMM},</if>
+            <if test="wide != null">wide = #{wide},</if>
+            <if test="hight != null">hight = #{hight},</if>
+            <if test="volume != null">volume = #{volume},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
@@ -288,8 +317,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">group_coding = #{groupCoding},</if>
             <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
             <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
         </trim>
         where stock_id = #{stockId}
     </update>
@@ -299,9 +326,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewStockSecureByStockIds" parameterType="String">
-        delete from view_stock_secure where stock_id in
+        delete from view_stock_secure where stock_id in 
         <foreach item="stockId" collection="array" open="(" separator="," close=")">
             #{stockId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper">
-
+    
     <resultMap type="ViewStockWarning" id="ViewStockWarningResult">
         <result property="stockId"    column="stock_id"    />
         <result property="cargoSpaceId"    column="cargo_space_id"    />
@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stackingId"    column="stacking_id"    />
         <result property="spare1"    column="spare1"    />
         <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
         <result property="productId"    column="product_id"    />
@@ -34,10 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseKind"    column="warehouse_kind"    />
         <result property="warehouseType"    column="warehouse_type"    />
         <result property="isCurrent"    column="is_current"    />
-        <result property="productName"    column="product_name"    />
-        <result property="spec"    column="spec"    />
-        <result property="unit"    column="unit"    />
         <result property="price"    column="price"    />
+        <result property="unit"    column="unit"    />
+        <result property="spec"    column="spec"    />
+        <result property="enName"    column="enName"    />
+        <result property="weight"    column="weight"    />
+        <result property="longMM"    column="longMM"    />
+        <result property="wide"    column="wide"    />
+        <result property="hight"    column="hight"    />
+        <result property="volume"    column="volume"    />
+        <result property="productName"    column="product_name"    />
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="roadwayId"    column="roadway_id"    />
         <result property="cargoAreaId"    column="cargo_area_id"    />
@@ -54,74 +62,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="groupCoding"    column="group_coding"    />
         <result property="cargoSpaceLogo"    column="cargo_space_logo"    />
         <result property="thisCargoArea"    column="this_cargo_area"    />
-        <result property="spare7"    column="spare7"    />
-        <result property="spare8"    column="spare8"    />
     </resultMap>
 
     <sql id="selectViewStockWarningVo">
-        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8 from view_stock_warning vsw
+        select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, price, unit, spec, enName, weight, longMM, wide, hight, volume, product_name, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning
     </sql>
 
     <select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
         <include refid="selectViewStockWarningVo"/>
-        <where>
+        <where>  
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
-            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id like concat('%', #{cargoSpaceId}, '%')</if>
+            <if test="cargoSpaceId != null  and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
-            <if test="stockStatus != null  and stockStatus != ''"> and stock_status like concat('%', #{stockStatus}, '%')</if>
+            <if test="stockStatus != null  and stockStatus != ''"> and stock_status = #{stockStatus}</if>
-            <if test="productStatus != null  and productStatus != ''"> and product_status like concat('%', #{productStatus}, '%')</if>
+            <if test="productStatus != null  and productStatus != ''"> and product_status = #{productStatus}</if>
-            <if test="lotNo != null  and lotNo != ''"> and lot_no like concat('%', #{lotNo}, '%')</if>
+            <if test="lotNo != null  and lotNo != ''"> and lot_no = #{lotNo}</if>
-            <if test="inDate != null  and inDate != ''"> and in_date like concat('%', #{inDate}, '%')</if>
+            <if test="inDate != null  and inDate != ''"> and in_date = #{inDate}</if>
-            <if test="backDate != null  and backDate != ''"> and back_date like concat('%', #{backDate}, '%')</if>
+            <if test="backDate != null  and backDate != ''"> and back_date = #{backDate}</if>
-            <if test="productGuid != null  and productGuid != ''"> and product_guid like concat('%', #{productGuid}, '%')</if>
+            <if test="productGuid != null  and productGuid != ''"> and product_guid = #{productGuid}</if>
-            <if test="quantity != null  and quantity != ''"> and quantity like concat('%', #{quantity}, '%')</if>
+            <if test="quantity != null  and quantity != ''"> and quantity = #{quantity}</if>
-            <if test="jobId != null  and jobId != ''"> and job_id like concat('%', #{jobId}, '%')</if>
+            <if test="jobId != null  and jobId != ''"> and job_id = #{jobId}</if>
-            <if test="trayCode != null  and trayCode != ''"> and tray_code like concat('%', #{trayCode}, '%')</if>
+            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
-            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity like concat('%', #{outQuantity}, '%')</if>
+            <if test="outQuantity != null  and outQuantity != ''"> and out_quantity = #{outQuantity}</if>
-            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id like concat('%', #{stockinDetailId}, '%')</if>
+            <if test="stockinDetailId != null  and stockinDetailId != ''"> and stockin_detail_id = #{stockinDetailId}</if>
-            <if test="stockinId != null  and stockinId != ''"> and stockin_id like concat('%', #{stockinId}, '%')</if>
+            <if test="stockinId != null  and stockinId != ''"> and stockin_id = #{stockinId}</if>
-            <if test="inType != null  and inType != ''"> and in_type like concat('%', #{inType}, '%')</if>
+            <if test="inType != null  and inType != ''"> and in_type = #{inType}</if>
-            <if test="inClassId != null  and inClassId != ''"> and in_class_id like concat('%', #{inClassId}, '%')</if>
+            <if test="inClassId != null  and inClassId != ''"> and in_class_id = #{inClassId}</if>
-            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
+            <if test="warehouseId != null  and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
-            <if test="stackingId != null  and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
+            <if test="stackingId != null  and stackingId != ''"> and stacking_id = #{stackingId}</if>
-            <if test="spare1 != null  and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and spare1 = #{spare1}</if>
-            <if test="spare2 != null  and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and spare2 = #{spare2}</if>
-            <if test="spare5 != null  and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
+            <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
-            <if test="spare6 != null  and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
+            <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="spare6 != null  and spare6 != ''"> and spare6 = #{spare6}</if>
             <if test="productId != null  and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
             <if test="warehouseName != null  and warehouseName != ''"> and warehouse_name like concat('%', #{warehouseName}, '%')</if>
-            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
-            <if test="cDesc != null  and cDesc != ''"> and c_desc like concat('%', #{cDesc}, '%')</if>
+            <if test="cDesc != null  and cDesc != ''"> and c_desc = #{cDesc}</if>
-            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind like concat('%', #{warehouseKind}, '%')</if>
+            <if test="warehouseKind != null  and warehouseKind != ''"> and warehouse_kind = #{warehouseKind}</if>
-            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type like concat('%', #{warehouseType}, '%')</if>
+            <if test="warehouseType != null  and warehouseType != ''"> and warehouse_type = #{warehouseType}</if>
-            <if test="isCurrent != null  and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
+            <if test="isCurrent != null  and isCurrent != ''"> and is_current = #{isCurrent}</if>
+            <if test="price != null  and price != ''"> and price = #{price}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
+            <if test="spec != null  and spec != ''"> and spec = #{spec}</if>
+            <if test="enName != null  and enName != ''"> and enName like concat('%', #{enName}, '%')</if>
+            <if test="weight != null  and weight != ''"> and weight = #{weight}</if>
+            <if test="longMM != null  and longMM != ''"> and longMM = #{longMM}</if>
+            <if test="wide != null  and wide != ''"> and wide = #{wide}</if>
+            <if test="hight != null  and hight != ''"> and hight = #{hight}</if>
+            <if test="volume != null  and volume != ''"> and volume = #{volume}</if>
             <if test="productName != null  and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
-            <if test="spec != null  and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
-            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
-            <if test="price != null  and price != ''"> and price like concat('%', #{price}, '%')</if>
             <if test="cargoSpaceName != null  and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
-            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id like concat('%', #{roadwayId}, '%')</if>
+            <if test="roadwayId != null  and roadwayId != ''"> and roadway_id = #{roadwayId}</if>
-            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id like concat('%', #{cargoAreaId}, '%')</if>
+            <if test="cargoAreaId != null  and cargoAreaId != ''"> and cargo_area_id = #{cargoAreaId}</if>
-            <if test="theType != null  and theType != ''"> and the_type like concat('%', #{theType}, '%')</if>
+            <if test="theType != null  and theType != ''"> and the_type = #{theType}</if>
             <if test="theTypeName != null  and theTypeName != ''"> and the_type_name like concat('%', #{theTypeName}, '%')</if>
-            <if test="thePlatoon != null "> and the_platoon like concat('%', #{thePlatoon}, '%')</if>
+            <if test="thePlatoon != null "> and the_platoon = #{thePlatoon}</if>
-            <if test="theColumn != null "> and the_column like concat('%', #{theColumn}, '%')</if>
+            <if test="theColumn != null "> and the_column = #{theColumn}</if>
-            <if test="theFloor != null "> and the_floor like concat('%', #{theFloor}, '%')</if>
+            <if test="theFloor != null "> and the_floor = #{theFloor}</if>
-            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status like concat('%', #{cargoStatus}, '%')</if>
+            <if test="cargoStatus != null  and cargoStatus != ''"> and cargo_status = #{cargoStatus}</if>
-            <if test="locked != null  and locked != ''"> and locked like concat('%', #{locked}, '%')</if>
+            <if test="locked != null  and locked != ''"> and locked = #{locked}</if>
-            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight like concat('%', #{cargoHight}, '%')</if>
+            <if test="cargoHight != null  and cargoHight != ''"> and cargo_hight = #{cargoHight}</if>
-            <if test="issDouble != null  and issDouble != ''"> and iss_double like concat('%', #{issDouble}, '%')</if>
+            <if test="issDouble != null  and issDouble != ''"> and iss_double = #{issDouble}</if>
-            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no like concat('%', #{groupCodingNo}, '%')</if>
+            <if test="groupCodingNo != null  and groupCodingNo != ''"> and group_coding_no = #{groupCodingNo}</if>
-            <if test="groupCoding != null  and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
+            <if test="groupCoding != null  and groupCoding != ''"> and group_coding = #{groupCoding}</if>
-            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
+            <if test="cargoSpaceLogo != null  and cargoSpaceLogo != ''"> and cargo_space_logo = #{cargoSpaceLogo}</if>
-            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
+            <if test="thisCargoArea != null  and thisCargoArea != ''"> and this_cargo_area = #{thisCargoArea}</if>
-            <if test="spare7 != null  and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
-            <if test="spare8 != null  and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
-            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
-                ${params.warehouseDataScope}
-            </if>
         </where>
     </select>
-
+    
     <select id="selectViewStockWarningByStockId" parameterType="String" resultMap="ViewStockWarningResult">
         <include refid="selectViewStockWarningVo"/>
         where stock_id = #{stockId}
@@ -150,6 +159,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">stacking_id,</if>
             <if test="spare1 != null">spare1,</if>
             <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
             <if test="spare5 != null">spare5,</if>
             <if test="spare6 != null">spare6,</if>
             <if test="productId != null">product_id,</if>
@@ -159,10 +170,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">warehouse_kind,</if>
             <if test="warehouseType != null">warehouse_type,</if>
             <if test="isCurrent != null">is_current,</if>
-            <if test="productName != null">product_name,</if>
-            <if test="spec != null">spec,</if>
-            <if test="unit != null">unit,</if>
             <if test="price != null">price,</if>
+            <if test="unit != null">unit,</if>
+            <if test="spec != null">spec,</if>
+            <if test="enName != null">enName,</if>
+            <if test="weight != null">weight,</if>
+            <if test="longMM != null">longMM,</if>
+            <if test="wide != null">wide,</if>
+            <if test="hight != null">hight,</if>
+            <if test="volume != null">volume,</if>
+            <if test="productName != null">product_name,</if>
             <if test="cargoSpaceName != null">cargo_space_name,</if>
             <if test="roadwayId != null">roadway_id,</if>
             <if test="cargoAreaId != null">cargo_area_id,</if>
@@ -179,9 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">group_coding,</if>
             <if test="cargoSpaceLogo != null">cargo_space_logo,</if>
             <if test="thisCargoArea != null">this_cargo_area,</if>
-            <if test="spare7 != null">spare7,</if>
+         </trim>
-            <if test="spare8 != null">spare8,</if>
-        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockId != null and stockId != ''">#{stockId},</if>
             <if test="cargoSpaceId != null">#{cargoSpaceId},</if>
@@ -203,6 +218,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">#{stackingId},</if>
             <if test="spare1 != null">#{spare1},</if>
             <if test="spare2 != null">#{spare2},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare4 != null">#{spare4},</if>
             <if test="spare5 != null">#{spare5},</if>
             <if test="spare6 != null">#{spare6},</if>
             <if test="productId != null">#{productId},</if>
@@ -212,10 +229,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">#{warehouseKind},</if>
             <if test="warehouseType != null">#{warehouseType},</if>
             <if test="isCurrent != null">#{isCurrent},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="unit != null">#{unit},</if>
             <if test="price != null">#{price},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="spec != null">#{spec},</if>
+            <if test="enName != null">#{enName},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="longMM != null">#{longMM},</if>
+            <if test="wide != null">#{wide},</if>
+            <if test="hight != null">#{hight},</if>
+            <if test="volume != null">#{volume},</if>
+            <if test="productName != null">#{productName},</if>
             <if test="cargoSpaceName != null">#{cargoSpaceName},</if>
             <if test="roadwayId != null">#{roadwayId},</if>
             <if test="cargoAreaId != null">#{cargoAreaId},</if>
@@ -232,9 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">#{groupCoding},</if>
             <if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
             <if test="thisCargoArea != null">#{thisCargoArea},</if>
-            <if test="spare7 != null">#{spare7},</if>
+         </trim>
-            <if test="spare8 != null">#{spare8},</if>
-        </trim>
     </insert>
 
     <update id="updateViewStockWarning" parameterType="ViewStockWarning">
@@ -259,6 +280,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stackingId != null">stacking_id = #{stackingId},</if>
             <if test="spare1 != null">spare1 = #{spare1},</if>
             <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
             <if test="spare6 != null">spare6 = #{spare6},</if>
             <if test="productId != null">product_id = #{productId},</if>
@@ -268,10 +291,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warehouseKind != null">warehouse_kind = #{warehouseKind},</if>
             <if test="warehouseType != null">warehouse_type = #{warehouseType},</if>
             <if test="isCurrent != null">is_current = #{isCurrent},</if>
-            <if test="productName != null">product_name = #{productName},</if>
-            <if test="spec != null">spec = #{spec},</if>
-            <if test="unit != null">unit = #{unit},</if>
             <if test="price != null">price = #{price},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="spec != null">spec = #{spec},</if>
+            <if test="enName != null">enName = #{enName},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="longMM != null">longMM = #{longMM},</if>
+            <if test="wide != null">wide = #{wide},</if>
+            <if test="hight != null">hight = #{hight},</if>
+            <if test="volume != null">volume = #{volume},</if>
+            <if test="productName != null">product_name = #{productName},</if>
             <if test="cargoSpaceName != null">cargo_space_name = #{cargoSpaceName},</if>
             <if test="roadwayId != null">roadway_id = #{roadwayId},</if>
             <if test="cargoAreaId != null">cargo_area_id = #{cargoAreaId},</if>
@@ -288,8 +317,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="groupCoding != null">group_coding = #{groupCoding},</if>
             <if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
             <if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
-            <if test="spare7 != null">spare7 = #{spare7},</if>
-            <if test="spare8 != null">spare8 = #{spare8},</if>
         </trim>
         where stock_id = #{stockId}
     </update>
@@ -299,9 +326,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteViewStockWarningByStockIds" parameterType="String">
-        delete from view_stock_warning where stock_id in
+        delete from view_stock_warning where stock_id in 
         <foreach item="stockId" collection="array" open="(" separator="," close=")">
             #{stockId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -287,7 +287,8 @@ public class ExcelUtil<T>
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
                     Cell cell = subRow.createCell(column);
-                    cell.setCellValue(attr.name());
+//                    cell.setCellValue(attr.name());
+                    cell.setCellValue(MessageUtils.parseMessage(attr.name()));  // 修改后方法
                     cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                     if (subFieldSize > 1)
                     {
@@ -299,7 +300,8 @@ public class ExcelUtil<T>
                 else
                 {
                     Cell cell = subRow.createCell(column++);
-                    cell.setCellValue(attr.name());
+//                    cell.setCellValue(attr.name());
+                    cell.setCellValue(MessageUtils.parseMessage(attr.name()));  // 修改后方法
                     cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                 }
             }
@@ -992,7 +994,8 @@ public class ExcelUtil<T>
         // 创建列
         Cell cell = row.createCell(column);
         // 写入列信息
-        cell.setCellValue(attr.name());
+//        cell.setCellValue(attr.name());
+        cell.setCellValue(MessageUtils.parseMessage(attr.name()));  // 修改后方法
         // 国际化
         //cell.setCellValue(MessageUtils.parseMessage(attr.name()));
         setDataValidation(attr, row, column);

ruoyi-ui/src/api/search/ViewStockWarning.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询预警库存查询列表
+// 查询库存预警报表列表
 export function listViewStockWarning(query) {
   return request({
     url: '/search/ViewStockWarning/list',
@@ -9,7 +9,7 @@ export function listViewStockWarning(query) {
   })
 }
 
-// 查询预警库存查询详细
+// 查询库存预警报表详细
 export function getViewStockWarning(stockId) {
   return request({
     url: '/search/ViewStockWarning/' + stockId,
@@ -17,7 +17,7 @@ export function getViewStockWarning(stockId) {
   })
 }
 
-// 新增预警库存查询
+// 新增库存预警报表
 export function addViewStockWarning(data) {
   return request({
     url: '/search/ViewStockWarning',
@@ -26,7 +26,7 @@ export function addViewStockWarning(data) {
   })
 }
 
-// 修改预警库存查询
+// 修改库存预警报表
 export function updateViewStockWarning(data) {
   return request({
     url: '/search/ViewStockWarning',
@@ -35,7 +35,7 @@ export function updateViewStockWarning(data) {
   })
 }
 
-// 删除预警库存查询
+// 删除库存预警报表
 export function delViewStockWarning(stockId) {
   return request({
     url: '/search/ViewStockWarning/' + stockId,

ruoyi-ui/src/lang/en.js

@@ -787,6 +787,45 @@ export default {
     stockinDetailId: 'Stock-in Detail ID',
     stockinId: 'Stock-in ID',
     inType: 'In Type',
+    inClassId: 'In Class ID',
+    warehouseId: 'Warehouse ID',
+    stackingId: 'Stacking ID',
+    spare1: 'Stock Warning Flag',
+    productId: 'Product ID',
+    warehouseName: 'Warehouse Name',
+    address: 'Warehouse Address',
+    cDesc: 'Warehouse Description',
+    warehouseKind: 'Warehouse Level',
+    warehouseType: 'Warehouse Type',
+    isCurrent: 'Is Available',
+    price: 'Price',
+    unit: 'Unit',
+    spec: 'Specification',
+    enName: 'English Name',
+    weight: 'Net Weight',
+    longMM: 'Length MM',
+    wide: 'Width MM',
+    hight: 'Height MM',
+    volume: 'Volume m³',
+    productName: 'Product Name',
+    cargoSpaceName: 'Cargo Space Name',
+    roadwayId: 'Roadway ID',
+    cargoAreaId: 'Cargo Area ID',
+    theType: 'Cargo Space Type',
+    theTypeName: 'Cargo Space Type Name',
+    thePlatoon: 'Row',
+    theColumn: 'Column',
+    theFloor: 'Floor',
+    cargoStatus: 'Cargo Status',
+    locked: 'Is Locked',
+    cargoHight: 'Cargo Height',
+    issDouble: 'Is Double',
+    groupCodingNo: 'Double Cargo Space Group Code',
+    groupCoding: 'Double Cargo Space Group Code',
+    cargoSpaceLogo: 'Double Cargo Space Logo',
+    thisCargoArea: 'This Warehouse Area',
+    warehouse: 'Warehouse',
+    selectWarehouse: 'Please select warehouse',
     inputStockId: 'Please enter stock ID',
     inputCargoSpaceId: 'Please enter cargo space ID',
     selectStockStatus: 'Please select stock status',
@@ -801,18 +840,25 @@ export default {
     inputStockinDetailId: 'Please enter stock-in detail ID',
     inputStockinId: 'Please enter stock-in ID',
     selectInType: 'Please select in type',
+    inputInClassId: 'Please enter in class ID',
+    inputWarehouseId: 'Please enter warehouse ID',
+    inputStackingId: 'Please enter stacking ID',
+    inputSpare1: 'Please enter stock warning flag',
+    inputProductId: 'Please enter product ID',
+    inputProductName: 'Please enter product name',
     confirm: 'Confirm',
     cancel: 'Cancel',
     stockIdRequired: 'Stock ID is required',
     addTitle: 'Add Stock Secure Query',
     editTitle: 'Edit Stock Secure Query',
     addSuccess: 'Added successfully',
+    updateSuccess: 'Updated successfully',
     editSuccess: 'Modified successfully',
     deleteSuccess: 'Deleted successfully',
     deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?',
-    search: 'search',
+    search: 'Search',
-    reset: 'reset',
+    reset: 'Reset',
-    export: 'export'
+    export: 'Export'
   },
 
   // *************Supplier Management***************
@@ -3135,81 +3181,124 @@ export default {
     unit: 'Unit',
     quantity: 'Quantity',
   },
-// ***************预警库存查询*************
+// ***************Stock Warning Query*************
   searchViewStockWarning: {
-    stockId: '库存ID111111111',
+    stockId: 'Stock ID',
-    inputStockId: '请输入库存ID',
+    inputStockId: 'Please enter stock ID',
-    cargoSpaceId: '货位ID',
+    cargoSpaceId: 'Cargo Space ID',
-    inputCargoSpaceId: '请输入货位ID',
+    inputCargoSpaceId: 'Please enter cargo space ID',
-    stockStatus: '库存状态',
+    stockStatus: 'Stock Status',
-    selectStockStatus: '请选择库存状态',
+    selectStockStatus: 'Please select stock status',
-    productStatus: '物料状态',
+    productStatus: 'Material Status',
-    selectProductStatus: '请选择物料状态',
+    selectProductStatus: 'Please select material status',
-    lotNo: '批次号',
+    lotNo: 'Lot Number',
-    inputLotNo: '请输入批次号',
+    inputLotNo: 'Please enter lot number',
-    inDate: '入库时间',
+    inDate: 'Inbound Date',
-    inputInDate: '请输入入库时间',
+    inputInDate: 'Please enter inbound date',
-    backDate: '回流时间',
+    backDate: 'Return Date',
-    inputBackDate: '请输入回流时间',
+    inputBackDate: 'Please enter return date',
-    quantity: '库存数量',
+    productGuid: 'Material GUID',
-    inputQuantity: '请输入库存数量',
+    inputProductGuid: 'Please enter material GUID',
-    jobId: '作业ID',
+    quantity: 'Stock Quantity',
-    inputJobId: '请输入作业ID',
+    inputQuantity: 'Please enter stock quantity',
-    trayCode: '托盘条码',
+    jobId: 'Job ID',
-    inputTrayCode: '请输入托盘条码',
+    inputJobId: 'Please enter job ID',
-    outQuantity: '出库数量',
+    trayCode: 'Tray Code',
-    inputOutQuantity: '请输入出库数量',
+    inputTrayCode: 'Please enter tray code',
-    stockinId: '入库主单',
+    outQuantity: 'Outbound Quantity',
-    inputStockinId: '请输入入库主单',
+    inputOutQuantity: 'Please enter outbound quantity',
-    inType: '入库类型',
+    stockinDetailId: 'Inbound Detail ID',
-    selectInType: '请选择入库类型',
+    inputStockinDetailId: 'Please enter inbound detail ID',
-    warehouseId: '仓库ID',
+    stockinId: 'Inbound Order',
-    inputWarehouseId: '请输入仓库ID',
+    inputStockinId: 'Please enter inbound order',
-    stackingId: '垛型ID',
+    inType: 'Inbound Type',
-    inputStackingId: '请输入垛型ID',
+    selectInType: 'Please select inbound type',
-    productId: '物料ID',
+    inClassId: 'Inbound Class ID',
-    inputProductId: '请输入物料ID',
+    inputInClassId: 'Please enter inbound class ID',
-    warehouseName: '仓库名称',
+    warehouse: 'Warehouse',
-    inputWarehouseName: '请输入仓库名称',
+    selectWarehouse: 'Please select warehouse',
-    warehouseType: '仓库类型',
+    warehouseId: 'Warehouse ID',
-    inputWarehouseType: '请输入仓库类型',
+    inputWarehouseId: 'Please enter warehouse ID',
-    isCurrent: '是否可用',
+    stackingId: 'Stacking ID',
-    inputIsCurrent: '请输入是否可用',
+    inputStackingId: 'Please enter stacking ID',
-    productName: '物料名称',
+    spare1: 'Stock Warning Flag',
-    inputProductName: '请输入物料名称',
+    inputSpare1: 'Please enter stock warning flag',
-    spec: '规格',
+    productId: 'Material ID',
-    inputSpec: '请输入规格',
+    inputProductId: 'Please enter material ID',
-    cargoNo: '品牌',
+    warehouseName: 'Warehouse Name',
-    inputCargoNo: '请输入品牌',
+    inputWarehouseName: 'Please enter warehouse name',
-    unit: '单位',
+    address: 'Warehouse Address',
-    inputUnit: '请输入单位',
+    inputAddress: 'Please enter warehouse address',
-    price: '价格',
+    cDesc: 'Warehouse Description',
-    inputPrice: '请输入价格',
+    inputCDesc: 'Please enter warehouse description',
-    cargoSpaceName: '货位名称',
+    warehouseKind: 'Warehouse Level',
-    inputCargoSpaceName: '请输入货位名称',
+    inputWarehouseKind: 'Please enter warehouse level',
-    cargoAreaId: '货区ID',
+    warehouseType: 'Warehouse Type',
-    inputCargoAreaId: '请输入货区ID',
+    inputWarehouseType: 'Please enter warehouse type',
-    theType: '货位类型',
+    isCurrent: 'Available',
-    inputTheType: '请输入货位类型',
+    inputIsCurrent: 'Please enter availability',
-    cargoStatus: '货位状态',
+    productName: 'Material Name',
-    inputCargoStatus: '请输入货位状态',
+    inputProductName: 'Please enter material name',
-    locked: '是否锁定',
+    spec: 'Specification',
-    inputLocked: '请输入是否锁定',
+    inputSpec: 'Please enter specification',
-    cargoHight: '货位高度',
+    enName: 'English Name',
-    inputCargoHight: '请输入货位高度',
+    inputEnName: 'Please enter English name',
-    issDouble: '是否双伸',
+    weight: 'Net Weight per Unit',
-    inputIssDouble: '请输入是否双伸',
+    inputWeight: 'Please enter net weight per unit',
-    thePlatoon: '排',
+    longMM: 'Length MM',
-    inputThePlatoon: '请输入排',
+    inputLongMM: 'Please enter length MM',
-    theColumn: '列',
+    wide: 'Width MM',
-    inputTheColumn: '请输入列',
+    inputWide: 'Please enter width MM',
-    theFloor: '层',
+    hight: 'Height MM',
-    inputTheFloor: '请输入层',
+    inputHight: 'Please enter height MM',
-    search: '搜索',
+    volume: 'Volume m³',
-    reset: '重置',
+    inputVolume: 'Please enter volume m³',
-    export: '导出',
+    cargoNo: 'Brand',
-    confirm: '确 定',
+    inputCargoNo: 'Please enter brand',
-    cancel: '取 消'
+    unit: 'Unit',
+    inputUnit: 'Please enter unit',
+    price: 'Price',
+    inputPrice: 'Please enter price',
+    cargoSpaceName: 'Cargo Space Name',
+    inputCargoSpaceName: 'Please enter cargo space name',
+    roadwayId: 'Roadway ID',
+    inputRoadwayId: 'Please enter roadway ID',
+    cargoAreaId: 'Cargo Area ID',
+    inputCargoAreaId: 'Please enter cargo area ID',
+    theType: 'Cargo Space Type',
+    inputTheType: 'Please enter cargo space type',
+    theTypeName: 'Cargo Space Type Name',
+    inputTheTypeName: 'Please enter cargo space type name',
+    cargoStatus: 'Cargo Space Status',
+    inputCargoStatus: 'Please enter cargo space status',
+    locked: 'Locked',
+    inputLocked: 'Please enter locked status',
+    cargoHight: 'Cargo Space Height',
+    inputCargoHight: 'Please enter cargo space height',
+    issDouble: 'Double Extension',
+    inputIssDouble: 'Please enter double extension',
+    groupCodingNo: 'Double Cargo Space Group Code',
+    inputGroupCodingNo: 'Please enter double cargo space group code',
+    groupCoding: 'Double Cargo Space Group Code',
+    inputGroupCoding: 'Please enter double cargo space group code',
+    cargoSpaceLogo: 'Double Cargo Space Logo',
+    inputCargoSpaceLogo: 'Please enter double cargo space logo',
+    thisCargoArea: 'This Warehouse Area',
+    inputThisCargoArea: 'Please enter this warehouse area',
+    thePlatoon: 'Row',
+    inputThePlatoon: 'Please enter row',
+    theColumn: 'Column',
+    inputTheColumn: 'Please enter column',
+    theFloor: 'Floor',
+    inputTheFloor: 'Please enter floor',
+    search: 'Search',
+    reset: 'Reset',
+    export: 'Export',
+    addTitle: 'Add Stock Warning Report',
+    editTitle: 'Edit Stock Warning Report',
+    stockIdRequired: 'Stock ID cannot be empty',
+    confirm: 'Confirm',
+    cancel: 'Cancel'
   },
 // ***************Product Basic Fields**************
   basproduct1: {

ruoyi-ui/src/lang/hu.js

@@ -682,47 +682,93 @@ export default {
 
 
   searchViewStockSecure: {
-    stockId: '库存ID',
+    stockId: 'Készlet ID',
-    cargoSpaceId: '货位ID',
+    cargoSpaceId: 'Raktárhely ID',
-    stockStatus: '库存状态',
+    stockStatus: 'Készlet állapot',
-    productStatus: '物料状态',
+    productStatus: 'Termék állapot',
-    lotNo: '批次号',
+    lotNo: 'Tételszám',
-    inDate: '入库时间',
+    inDate: 'Beérkezés dátuma',
-    backDate: '回流时间',
+    backDate: 'Visszaáramlás dátuma',
-    productGuid: '物料GUID',
+    productGuid: 'Termék GUID',
-    quantity: '库存数量',
+    quantity: 'Készlet mennyiség',
-    jobId: '作业ID',
+    jobId: 'Munka ID',
-    trayCode: '托盘条码',
+    trayCode: 'Tálca vonalkód',
-    outQuantity: '出库数量',
+    outQuantity: 'Kimenő mennyiség',
-    stockinDetailId: '入库子单ID',
+    stockinDetailId: 'Beérkezés részlet ID',
-    stockinId: '入库主单',
+    stockinId: 'Beérkezés fő ID',
-    inType: '入库类型',
+    inType: 'Beérkezés típus',
-    inputStockId: '请输入库存ID',
+    inClassId: 'Beérkezés csoport ID',
-    inputCargoSpaceId: '请输入货位ID',
+    warehouseId: 'Raktár ID',
-    selectStockStatus: '请选择库存状态',
+    stackingId: 'Rakodás ID',
-    selectProductStatus: '请选择物料状态',
+    spare1: 'Készlet riasztás jelző',
-    inputLotNo: '请输入批次号',
+    productId: 'Termék ID',
-    inputInDate: '请输入入库时间',
+    warehouseName: 'Raktár neve',
-    inputBackDate: '请输入回流时间',
+    address: 'Raktár címe',
-    inputProductGuid: '请输入物料GUID',
+    cDesc: 'Raktár leírás',
-    inputContent: '请输入内容',
+    warehouseKind: 'Raktár szint',
-    inputJobId: '请输入作业ID',
+    warehouseType: 'Raktár típus',
-    inputTrayCode: '请输入托盘条码',
+    isCurrent: 'Elérhető-e',
-    inputStockinDetailId: '请输入入库子单ID',
+    price: 'Ár',
-    inputStockinId: '请输入入库主单',
+    unit: 'Egység',
-    selectInType: '请选择入库类型',
+    spec: 'Specifikáció',
-    confirm: '确定',
+    enName: 'Angol név',
-    cancel: '取消',
+    weight: 'Nettó súly',
-    stockIdRequired: '库存ID不能为空',
+    longMM: 'Hossz MM',
-    addTitle: '添加安全库存查询',
+    wide: 'Szélesség MM',
-    editTitle: '修改安全库存查询',
+    hight: 'Magasság MM',
-    addSuccess: '新增成功',
+    volume: 'Térfogat m³',
-    editSuccess: '修改成功',
+    productName: 'Termék neve',
-    deleteSuccess: '删除成功',
+    cargoSpaceName: 'Raktárhely neve',
-    deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？',
+    roadwayId: 'Folyosó ID',
-    search:'搜索',
+    cargoAreaId: 'Raktárterület ID',
-    reset:'重置',
+    theType: 'Raktárhely típus',
-    export:'导出'
+    theTypeName: 'Raktárhely típus neve',
+    thePlatoon: 'Sor',
+    theColumn: 'Oszlop',
+    theFloor: 'Emelet',
+    cargoStatus: 'Raktárhely állapot',
+    locked: 'Zárolt-e',
+    cargoHight: 'Raktárhely magasság',
+    issDouble: 'Dupla-e',
+    groupCodingNo: 'Dupla raktárhely csoport kód',
+    groupCoding: 'Dupla raktárhely csoport kód',
+    cargoSpaceLogo: 'Dupla raktárhely jelző',
+    thisCargoArea: 'Ez a raktárterület',
+    warehouse: 'Raktár',
+    selectWarehouse: 'Kérjük válasszon raktárt',
+    inputStockId: 'Kérjük adja meg a készlet ID-t',
+    inputCargoSpaceId: 'Kérjük adja meg a raktárhely ID-t',
+    selectStockStatus: 'Kérjük válassza ki a készlet állapotot',
+    selectProductStatus: 'Kérjük válassza ki a termék állapotot',
+    inputLotNo: 'Kérjük adja meg a tételszámot',
+    inputInDate: 'Kérjük adja meg a beérkezés dátumát',
+    inputBackDate: 'Kérjük adja meg a visszaáramlás dátumát',
+    inputProductGuid: 'Kérjük adja meg a termék GUID-ot',
+    inputContent: 'Kérjük adja meg a tartalmat',
+    inputJobId: 'Kérjük adja meg a munka ID-t',
+    inputTrayCode: 'Kérjük adja meg a tálca vonalkódot',
+    inputStockinDetailId: 'Kérjük adja meg a beérkezés részlet ID-t',
+    inputStockinId: 'Kérjük adja meg a beérkezés fő ID-t',
+    selectInType: 'Kérjük válassza ki a beérkezés típust',
+    inputInClassId: 'Kérjük adja meg a beérkezés csoport ID-t',
+    inputWarehouseId: 'Kérjük adja meg a raktár ID-t',
+    inputStackingId: 'Kérjük adja meg a rakodás ID-t',
+    inputSpare1: 'Kérjük adja meg a készlet riasztás jelzőt',
+    inputProductId: 'Kérjük adja meg a termék ID-t',
+    inputProductName: 'Kérjük adja meg a termék nevét',
+    confirm: 'Megerősítés',
+    cancel: 'Mégse',
+    stockIdRequired: 'A készlet ID megadása kötelező',
+    addTitle: 'Biztonságos készlet lekérdezés hozzáadása',
+    editTitle: 'Biztonságos készlet lekérdezés módosítása',
+    addSuccess: 'Sikeresen hozzáadva',
+    updateSuccess: 'Sikeresen frissítve',
+    editSuccess: 'Sikeresen módosítva',
+    deleteSuccess: 'Sikeresen törölve',
+    deleteConfirm: 'Biztosan törölni szeretné a(z) "{stockIds}" azonosítójú biztonságos készlet lekérdezést?',
+    search: 'Keresés',
+    reset: 'Visszaállítás',
+    export: 'Exportálás'
   },
   // *************供应商管理***************
   BasSupplier: {
@@ -3063,79 +3109,116 @@ export default {
   },
 // ***************预警库存查询*************
   searchViewStockWarning: {
-    stockId: '库存ID',
+    productId: 'Anyag azonosító',
-    inputStockId: '请输入库存ID',
+    inputProductId: 'Kérjük adja meg az anyag azonosítót',
-    cargoSpaceId: '货位ID',
+    productName: 'Anyag neve',
-    inputCargoSpaceId: '请输入货位ID',
+    inputProductName: 'Kérjük adja meg az anyag nevét',
-    stockStatus: '库存状态',
+    stockId: 'Készlet azonosító',
-    selectStockStatus: '请选择库存状态',
+    inputStockId: 'Kérjük adja meg a készlet azonosítót',
-    productStatus: '物料状态',
+    cargoSpaceId: 'Raktárhely azonosító',
-    selectProductStatus: '请选择物料状态',
+    inputCargoSpaceId: 'Kérjük adja meg a raktárhely azonosítót',
-    lotNo: '批次号',
+    lotNo: 'Tételszám',
-    inputLotNo: '请输入批次号',
+    inputLotNo: 'Kérjük adja meg a tételszámot',
-    inDate: '入库时间',
+    inDate: 'Beérkezési idő',
-    inputInDate: '请输入入库时间',
+    inputInDate: 'Kérjük adja meg a beérkezési időt',
-    backDate: '回流时间',
+    backDate: 'Visszaáramlási idő',
-    inputBackDate: '请输入回流时间',
+    inputBackDate: 'Kérjük adja meg a visszaáramlási időt',
-    quantity: '库存数量',
+    productGuid: 'Anyag GUID',
-    inputQuantity: '请输入库存数量',
+    inputProductGuid: 'Kérjük adja meg az anyag GUID-ot',
-    jobId: '作业ID',
+    quantity: 'Készlet mennyiség',
-    inputJobId: '请输入作业ID',
+    inputQuantity: 'Kérjük adja meg a készlet mennyiséget',
-    trayCode: '托盘条码',
+    jobId: 'Feladat azonosító',
-    inputTrayCode: '请输入托盘条码',
+    inputJobId: 'Kérjük adja meg a feladat azonosítót',
-    outQuantity: '出库数量',
+    trayCode: 'Tálca vonalkód',
-    inputOutQuantity: '请输入出库数量',
+    inputTrayCode: 'Kérjük adja meg a tálca vonalkódot',
-    stockinId: '入库主单',
+    outQuantity: 'Kiadási mennyiség',
-    inputStockinId: '请输入入库主单',
+    inputOutQuantity: 'Kérjük adja meg a kiadási mennyiséget',
-    inType: '入库类型',
+    stockinDetailId: 'Beérkezési részlet azonosító',
-    selectInType: '请选择入库类型',
+    inputStockinDetailId: 'Kérjük adja meg a beérkezési részlet azonosítót',
-    warehouseId: '仓库ID',
+    stockinId: 'Beérkezési főbizonylat',
-    inputWarehouseId: '请输入仓库ID',
+    inputStockinId: 'Kérjük adja meg a beérkezési főbizonylatot',
-    stackingId: '垛型ID',
+    inType: 'Beérkezési típus',
-    inputStackingId: '请输入垛型ID',
+    selectInType: 'Kérjük válassza ki a beérkezési típust',
-    productId: '物料ID',
+    inClassId: 'Beérkezési műszak azonosító',
-    inputProductId: '请输入物料ID',
+    inputInClassId: 'Kérjük adja meg a beérkezési műszak azonosítót',
-    warehouseName: '仓库名称',
+    warehouse: 'Raktár',
-    inputWarehouseName: '请输入仓库名称',
+    selectWarehouse: 'Kérjük válassza ki a raktárt',
-    warehouseType: '仓库类型',
+    warehouseId: 'Raktár azonosító',
-    inputWarehouseType: '请输入仓库类型',
+    inputWarehouseId: 'Kérjük adja meg a raktár azonosítót',
-    isCurrent: '是否可用',
+    stackingId: 'Rakodási típus azonosító',
-    inputIsCurrent: '请输入是否可用',
+    inputStackingId: 'Kérjük adja meg a rakodási típus azonosítót',
-    productName: '物料名称',
+    spare1: 'Tartalék mező 1',
-    inputProductName: '请输入物料名称',
+    inputSpare1: 'Kérjük adja meg a tartalék mező 1-et',
-    spec: '规格',
+    warehouseName: 'Raktár neve',
-    inputSpec: '请输入规格',
+    inputWarehouseName: 'Kérjük adja meg a raktár nevét',
-    cargoNo: '品牌',
+    address: 'Raktár címe',
-    inputCargoNo: '请输入品牌',
+    inputAddress: 'Kérjük adja meg a raktár címét',
-    unit: '单位',
+    cDesc: 'Raktár leírása',
-    inputUnit: '请输入单位',
+    inputCDesc: 'Kérjük adja meg a raktár leírását',
-    price: '价格',
+    warehouseKind: 'Raktár szintje',
-    inputPrice: '请输入价格',
+    inputWarehouseKind: 'Kérjük adja meg a raktár szintjét',
-    cargoSpaceName: '货位名称',
+    warehouseType: 'Raktár típusa',
-    inputCargoSpaceName: '请输入货位名称',
+    inputWarehouseType: 'Kérjük adja meg a raktár típusát',
-    cargoAreaId: '货区ID',
+    isCurrent: 'Elérhető-e',
-    inputCargoAreaId: '请输入货区ID',
+    inputIsCurrent: 'Kérjük adja meg, hogy elérhető-e',
-    theType: '货位类型',
+    price: 'Ár',
-    inputTheType: '请输入货位类型',
+    inputPrice: 'Kérjük adja meg az árat',
-    cargoStatus: '货位状态',
+    unit: 'Egység',
-    inputCargoStatus: '请输入货位状态',
+    inputUnit: 'Kérjük adja meg az egységet',
-    locked: '是否锁定',
+    spec: 'Specifikáció',
-    inputLocked: '请输入是否锁定',
+    inputSpec: 'Kérjük adja meg a specifikációt',
-    cargoHight: '货位高度',
+    enName: 'Angol név',
-    inputCargoHight: '请输入货位高度',
+    inputEnName: 'Kérjük adja meg az angol nevet',
-    issDouble: '是否双伸',
+    weight: 'Egységnyi nettó súly',
-    inputIssDouble: '请输入是否双伸',
+    inputWeight: 'Kérjük adja meg az egységnyi nettó súlyt',
-    thePlatoon: '排',
+    longMM: 'Hossz MM',
-    inputThePlatoon: '请输入排',
+    inputLongMM: 'Kérjük adja meg a hosszt MM-ben',
-    theColumn: '列',
+    wide: 'Szélesség MM',
-    inputTheColumn: '请输入列',
+    inputWide: 'Kérjük adja meg a szélességet MM-ben',
-    theFloor: '层',
+    hight: 'Magasság MM',
-    inputTheFloor: '请输入层',
+    inputHight: 'Kérjük adja meg a magasságot MM-ben',
-    search: '搜索',
+    volume: 'Térfogat m³',
-    reset: '重置',
+    inputVolume: 'Kérjük adja meg a térfogatot m³-ben',
-    export: '导出',
+    cargoSpaceName: 'Raktárhely neve',
-    confirm: '确 定',
+    inputCargoSpaceName: 'Kérjük adja meg a raktárhely nevét',
-    cancel: '取 消'
+    roadwayId: 'Folyosó azonosító',
+    inputRoadwayId: 'Kérjük adja meg a folyosó azonosítót',
+    cargoAreaId: 'Raktárterület azonosító',
+    inputCargoAreaId: 'Kérjük adja meg a raktárterület azonosítót',
+    theType: 'Raktárhely típusa',
+    inputTheType: 'Kérjük adja meg a raktárhely típusát',
+    theTypeName: 'Raktárhely típus neve',
+    inputTheTypeName: 'Kérjük adja meg a raktárhely típus nevét',
+    thePlatoon: 'Sor',
+    inputThePlatoon: 'Kérjük adja meg a sort',
+    theColumn: 'Oszlop',
+    inputTheColumn: 'Kérjük adja meg az oszlopot',
+    theFloor: 'Szint',
+    inputTheFloor: 'Kérjük adja meg a szintet',
+    cargoStatus: 'Raktárhely állapota',
+    inputCargoStatus: 'Kérjük adja meg a raktárhely állapotát',
+    locked: 'Zárolva van-e',
+    inputLocked: 'Kérjük adja meg, hogy zárolva van-e',
+    cargoHight: 'Raktárhely magassága',
+    inputCargoHight: 'Kérjük adja meg a raktárhely magasságát',
+    issDouble: 'Dupla nyújtású-e',
+    inputIssDouble: 'Kérjük adja meg, hogy dupla nyújtású-e',
+    groupCodingNo: 'Dupla raktárhely csoport kódolási szám',
+    inputGroupCodingNo: 'Kérjük adja meg a dupla raktárhely csoport kódolási számot',
+    groupCoding: 'Dupla raktárhely csoport kódolás',
+    inputGroupCoding: 'Kérjük adja meg a dupla raktárhely csoport kódolást',
+    cargoSpaceLogo: 'Dupla raktárhely jelölő',
+    inputCargoSpaceLogo: 'Kérjük adja meg a dupla raktárhely jelölőt',
+    thisCargoArea: 'Ezen raktár területe',
+    inputThisCargoArea: 'Kérjük adja meg ezen raktár területét',
+    search: 'Keresés',
+    reset: 'Visszaállítás',
+    export: 'Exportálás',
+    confirm: 'Megerősítés',
+    cancel: 'Mégse',
+    stockIdRequired: 'A készlet azonosító megadása kötelező',
+    addTitle: 'Készletriasztás hozzáadása',
+    editTitle: 'Készletriasztás módosítása'
   },
 // ***************产品基础表添加字段**************
   basproduct1:{

ruoyi-ui/src/lang/zh.js

@@ -839,6 +839,45 @@ export default {
     stockinDetailId: '入库子单ID',
     stockinId: '入库主单',
     inType: '入库类型',
+    inClassId: '入库班组ID', // 入库班组ID
+    warehouseId: '仓库ID', // 仓库ID
+    stackingId: '垛型ID', // 垛型ID
+    spare1: '库存预警标识', // 库存预警标识
+    productId: '物料ID', // 物料ID
+    warehouseName: '仓库名称', // 仓库名称
+    address: '仓库地址', // 仓库地址
+    cDesc: '仓库描述', // 仓库描述
+    warehouseKind: '仓库级别', // 仓库级别
+    warehouseType: '仓库类型', // 仓库类型
+    isCurrent: '是否可用', // 是否可用
+    price: '价格', // 价格
+    unit: '单位', // 单位
+    spec: '规格', // 规格
+    enName: '英文名称', // 英文名称
+    weight: '单件净重', // 单件净重
+    longMM: '长MM', // 长MM
+    wide: '宽MM', // 宽MM
+    hight: '高MM', // 高MM
+    volume: '体积m³', // 体积m³
+    productName: '物料名称', // 物料名称
+    cargoSpaceName: '货位名称', // 货位名称
+    roadwayId: '巷道ID', // 巷道ID
+    cargoAreaId: '货区ID', // 货区ID
+    theType: '货位类型', // 货位类型
+    theTypeName: '货位类型名称', // 货位类型名称
+    thePlatoon: '排', // 排
+    theColumn: '列', // 列
+    theFloor: '层', // 层
+    cargoStatus: '货位状态', // 货位状态
+    locked: '是否锁定', // 是否锁定
+    cargoHight: '货位高度', // 货位高度
+    issDouble: '是否双伸', // 是否双伸
+    groupCodingNo: '双货位分组编码', // 双货位分组编码
+    groupCoding: '双货位分组编码', // 双货位分组编码
+    cargoSpaceLogo: '双货位标识', // 双货位标识
+    thisCargoArea: '本仓库区域', // 本仓库区域
+    warehouse: '仓库', // 仓库
+    selectWarehouse: '请选择仓库', // 请选择仓库
     inputStockId: '请输入库存ID',
     inputCargoSpaceId: '请输入货位ID',
     selectStockStatus: '请选择库存状态',
@@ -853,12 +892,45 @@ export default {
     inputStockinDetailId: '请输入入库子单ID',
     inputStockinId: '请输入入库主单',
     selectInType: '请选择入库类型',
+    inputInClassId: '请输入入库班组ID', // 请输入入库班组ID
+    inputWarehouseId: '请输入仓库ID', // 请输入仓库ID
+    inputStackingId: '请输入垛型ID', // 请输入垛型ID
+    inputSpare1: '请输入库存预警标识', // 请输入库存预警标识
+    inputProductId: '请输入物料ID', // 请输入物料ID
+    inputProductName: '请输入物料名称', // 请输入物料名称
+    inputAddress: '请输入仓库地址', // 请输入仓库地址
+    inputCDesc: '请输入仓库描述', // 请输入仓库描述
+    inputWarehouseKind: '请输入仓库级别', // 请输入仓库级别
+    inputIsCurrent: '请输入是否可用', // 请输入是否可用
+    inputPrice: '请输入价格', // 请输入价格
+    inputUnit: '请输入单位', // 请输入单位
+    inputSpec: '请输入规格', // 请输入规格
+    inputEnName: '请输入英文名称', // 请输入英文名称
+    inputWeight: '请输入单件净重', // 请输入单件净重
+    inputLongMM: '请输入长MM', // 请输入长MM
+    inputWide: '请输入宽MM', // 请输入宽MM
+    inputHight: '请输入高MM', // 请输入高MM
+    inputVolume: '请输入体积m³', // 请输入体积m³
+    inputCargoSpaceName: '请输入货位名称', // 请输入货位名称
+    inputRoadwayId: '请输入巷道ID', // 请输入巷道ID
+    inputCargoAreaId: '请输入货区ID', // 请输入货区ID
+    inputTheTypeName: '请输入货位类型名称', // 请输入货位类型名称
+    inputThePlatoon: '请输入排', // 请输入排
+    inputTheColumn: '请输入列', // 请输入列
+    inputTheFloor: '请输入层', // 请输入层
+    inputLocked: '请输入是否锁定', // 请输入是否锁定
+    inputIssDouble: '请输入是否双伸', // 请输入是否双伸
+    inputGroupCodingNo: '请输入双货位分组编码', // 请输入双货位分组编码
+    inputGroupCoding: '请输入双货位分组编码', // 请输入双货位分组编码
+    inputCargoSpaceLogo: '请输入双货位标识', // 请输入双货位标识
+    inputThisCargoArea: '请输入本仓库区域', // 请输入本仓库区域
     confirm: '确定',
     cancel: '取消',
     stockIdRequired: '库存ID不能为空',
     addTitle: '添加安全库存查询',
     editTitle: '修改安全库存查询',
     addSuccess: '新增成功',
+    updateSuccess: '修改成功',
     editSuccess: '修改成功',
     deleteSuccess: '删除成功',
     deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？',
@@ -3151,6 +3223,8 @@ export default {
     selectStartTime: '请选择开始时间',
     finishTime: '结束时间',
     selectFinishTime: '请选择结束时间',
+    warehouse: '仓库',
+    selectWarehouse: '请选择仓库',
     warehouseId: '仓库ID',
     inputWarehouseId: '请输入仓库ID',
     spec: '规格',
@@ -3549,6 +3623,7 @@ export default {
   },
 // ***************预警库存查询*************
   searchViewStockWarning: {
+    warehouse:'仓库',
     stockId: '库存ID',
     inputStockId: '请输入库存ID',
     cargoSpaceId: '货位ID',
@@ -3563,6 +3638,8 @@ export default {
     inputInDate: '请输入入库时间',
     backDate: '回流时间',
     inputBackDate: '请输入回流时间',
+    productGuid: '物料GUID',
+    inputProductGuid: '请输入物料GUID',
     quantity: '库存数量',
     inputQuantity: '请输入库存数量',
     jobId: '作业ID',
@@ -3571,18 +3648,30 @@ export default {
     inputTrayCode: '请输入托盘条码',
     outQuantity: '出库数量',
     inputOutQuantity: '请输入出库数量',
+    stockinDetailId: '入库子单ID',
+    inputStockinDetailId: '请输入入库子单ID',
     stockinId: '入库主单',
     inputStockinId: '请输入入库主单',
     inType: '入库类型',
     selectInType: '请选择入库类型',
+    inClassId: '入库班组ID',
+    inputInClassId: '请输入入库班组ID',
     warehouseId: '仓库ID',
     inputWarehouseId: '请输入仓库ID',
     stackingId: '垛型ID',
     inputStackingId: '请输入垛型ID',
+    spare1: '库存预警标识',
+    inputSpare1: '请输入库存预警标识',
     productId: '物料ID',
     inputProductId: '请输入物料ID',
     warehouseName: '仓库名称',
     inputWarehouseName: '请输入仓库名称',
+    address: '仓库地址',
+    inputAddress: '请输入仓库地址',
+    cDesc: '仓库描述',
+    inputCDesc: '请输入仓库描述',
+    warehouseKind: '仓库级别',
+    inputWarehouseKind: '请输入仓库级别',
     warehouseType: '仓库类型',
     inputWarehouseType: '请输入仓库类型',
     isCurrent: '是否可用',
@@ -3591,6 +3680,18 @@ export default {
     inputProductName: '请输入物料名称',
     spec: '规格',
     inputSpec: '请输入规格',
+    enName: '英文名称',
+    inputEnName: '请输入英文名称',
+    weight: '单件净重',
+    inputWeight: '请输入单件净重',
+    longMM: '长MM',
+    inputLongMM: '请输入长MM',
+    wide: '宽MM',
+    inputWide: '请输入宽MM',
+    hight: '高MM',
+    inputHight: '请输入高MM',
+    volume: '体积m³',
+    inputVolume: '请输入体积m³',
     cargoNo: '品牌',
     inputCargoNo: '请输入品牌',
     unit: '单位',
@@ -3599,10 +3700,14 @@ export default {
     inputPrice: '请输入价格',
     cargoSpaceName: '货位名称',
     inputCargoSpaceName: '请输入货位名称',
+    roadwayId: '巷道ID',
+    inputRoadwayId: '请输入巷道ID',
     cargoAreaId: '货区ID',
     inputCargoAreaId: '请输入货区ID',
     theType: '货位类型',
     inputTheType: '请输入货位类型',
+    theTypeName: '货位类型名称',
+    inputTheTypeName: '请输入货位类型名称',
     cargoStatus: '货位状态',
     inputCargoStatus: '请输入货位状态',
     locked: '是否锁定',
@@ -3611,6 +3716,14 @@ export default {
     inputCargoHight: '请输入货位高度',
     issDouble: '是否双伸',
     inputIssDouble: '请输入是否双伸',
+    groupCodingNo: '双货位分组编码',
+    inputGroupCodingNo: '请输入双货位分组编码',
+    groupCoding: '双货位分组编码',
+    inputGroupCoding: '请输入双货位分组编码',
+    cargoSpaceLogo: '双货位标识',
+    inputCargoSpaceLogo: '请输入双货位标识',
+    thisCargoArea: '本仓库区域',
+    inputThisCargoArea: '请输入本仓库区域',
     thePlatoon: '排',
     inputThePlatoon: '请输入排',
     theColumn: '列',
@@ -3620,6 +3733,9 @@ export default {
     search: '搜索',
     reset: '重置',
     export: '导出',
+    addTitle: '添加库存预警报表',
+    editTitle: '修改库存预警报表',
+    stockIdRequired: '库存ID不能为空',
     confirm: '确 定',
     cancel: '取 消'
   },

ruoyi-ui/src/views/search/ViewStockSecure/index.vue

@@ -1,8 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+<!--      <el-form-item label="库存ID" prop="stockId">-->
-        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+<!--        <el-input-->
+<!--          v-model="queryParams.stockId"-->
+<!--          placeholder="请输入库存ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+      <el-form-item :label="$t('searchViewStockSecure.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewStockSecure.selectWarehouse')" clearable>
           <el-option
             v-for="dict in warehouseOptions"
             :key="dict.warehouseId"
@@ -11,139 +20,64 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.stockId')" prop="stockId"> <!-- 库存ID -->
+
+      <el-form-item :label="$t('searchViewStockSecure.productId')" prop="productId"> <!-- 物料ID -->
         <el-input
-          v-model="queryParams.stockId"
+          v-model="queryParams.productId"
-          :placeholder="$t('searchViewStockSecure.inputStockId')"
+          :placeholder="$t('searchViewStockSecure.inputProductId')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
+
+      <el-form-item :label="$t('searchViewStockSecure.productName')" prop="productName"> <!-- 物料名称 -->
         <el-input
-          v-model="queryParams.cargoSpaceId"
+          v-model="queryParams.productName"
-          :placeholder="$t('searchViewStockSecure.inputCargoSpaceId')"
+          :placeholder="$t('searchViewStockSecure.inputProductName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
+
-        <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockSecure.selectStockStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.stock_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.productStatus')" prop="productStatus"> <!-- 物料状态 -->
-        <el-select v-model="queryParams.productStatus" :placeholder="$t('searchViewStockSecure.selectProductStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.product_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.lotNo')" prop="lotNo"> <!-- 批次号 -->
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewStockSecure.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.inDate')" prop="inDate"><!-- 入库时间 -->
-        <el-date-picker clearable
-                        v-model="queryParams.inDate"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        :placeholder="$t('searchViewStockSecure.inputInDate')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.backDate')" prop="backDate"> <!-- 回流时间 -->
-        <el-input
-          v-model="queryParams.backDate"
-          :placeholder="$t('searchViewStockSecure.inputBackDate')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.productGuid')" prop="productGuid"> <!-- 物料GUID -->
-        <el-input
-          v-model="queryParams.productGuid"
-          :placeholder="$t('searchViewStockSecure.inputProductGuid')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.quantity')" prop="quantity"> <!-- 库存数量 -->
-        <el-input
-          v-model="queryParams.quantity"
-          :placeholder="$t('searchViewStockSecure.inputContent')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.jobId')" prop="jobId"> <!-- 作业ID -->
-        <el-input
-          v-model="queryParams.jobId"
-          :placeholder="$t('searchViewStockSecure.inputJobId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
-        <el-input
-          v-model="queryParams.trayCode"
-          :placeholder="$t('searchViewStockSecure.inputTrayCode')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
-        <el-input
-          v-model="queryParams.outQuantity"
-          :placeholder="$t('searchViewStockSecure.inputContent')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单ID -->
-        <el-input
-          v-model="queryParams.stockinDetailId"
-          :placeholder="$t('searchViewStockSecure.inputStockinDetailId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.stockinId')" prop="stockinId"> <!-- 入库主单 -->
-        <el-input
-          v-model="queryParams.stockinId"
-          :placeholder="$t('searchViewStockSecure.inputStockinId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockSecure.inType')" prop="inType"> <!-- 入库类型 -->
-        <el-select v-model="queryParams.inType" :placeholder="$t('searchViewStockSecure.selectInType')" clearable>
-          <el-option
-            v-for="dict in dict.type.in_bill_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('searchViewStockSecure.search')}}</el-button> <!-- 搜索 -->
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('searchViewStockSecure.search') }}</el-button> <!-- 搜索 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockSecure.reset')}}</el-button> <!-- 重置 -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('searchViewStockSecure.reset') }}</el-button> <!-- 重置 -->
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['search:ViewStockSecure:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['search:ViewStockSecure:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['search:ViewStockSecure:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -152,50 +86,71 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewStockSecure:export']"
-        >{{$t('searchViewStockSecure.export')}}</el-button> <!-- 导出 -->
+        >{{ $t('searchViewStockSecure.export') }}</el-button> <!-- 导出 -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('searchViewStockSecure.stockId')" align="left" prop="stockId" />
+      <el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
-      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" />
+      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
-      <el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="left" prop="stockStatus">
+      <el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
-        <template slot-scope="scope">
+      <el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 -->
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+      <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
-        </template>
+      <el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
-      </el-table-column>
+      <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
-      <el-table-column :label="$t('searchViewStockSecure.productStatus')" align="left" prop="productStatus">
+      <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
-        <template slot-scope="scope">
+      <el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
-          <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
+      <el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
-        </template>
+      <el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
-      </el-table-column>
+      <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
-      <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="left" prop="lotNo" />
+      <el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
-      <el-table-column :label="$t('searchViewStockSecure.inDate')" align="left" prop="inDate" />
+      <el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
-      <el-table-column :label="$t('searchViewStockSecure.backDate')" align="left" prop="backDate" />
+      <el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
-      <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="left" prop="productGuid" />
+      <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
-      <el-table-column :label="$t('searchViewStockSecure.quantity')" align="right" prop="quantity" />
+      <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
-      <el-table-column :label="$t('searchViewStockSecure.jobId')" align="left" prop="jobId" />
+      <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
-      <el-table-column :label="$t('searchViewStockSecure.trayCode')" align="left" prop="trayCode" />
+      <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 -->
-      <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="right" prop="outQuantity" />
+<!--      <el-table-column label="备用字段2" align="center" prop="spare2" />-->
-      <el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="left" prop="stockinDetailId" />
+<!--      <el-table-column label="备用字段3" align="center" prop="spare3" />-->
-      <el-table-column :label="$t('searchViewStockSecure.stockinId')" align="left" prop="stockinId" />
+<!--      <el-table-column label="备用字段4" align="center" prop="spare4" />-->
-      <el-table-column :label="$t('searchViewStockSecure.inType')" align="left" prop="inType">
+<!--      <el-table-column label="备用字段5" align="center" prop="spare5" />-->
-        <template slot-scope="scope">
+<!--      <el-table-column label="备用字段6" align="center" prop="spare6" />-->
-          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
+      <el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
-        </template>
+      <el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
-      </el-table-column>
+      <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> <!-- 仓库地址 -->
-
+      <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
-      <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
+      <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
-      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
+      <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
-      <el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
+      <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
-      <el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
+      <el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
-      <el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
+      <el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
-      <el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
+      <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> <!-- 规格 -->
-      <el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
+      <el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
-      <el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
+      <el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
-<!--      <el-table-column :label="$t('searchViewStockSecure.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
+      <el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
+      <el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
+      <el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
+      <el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
+      <el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
+      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
+      <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
+      <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
+      <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
+      <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 -->
+      <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 -->
+      <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> <!-- 列 -->
+      <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> <!-- 层 -->
+      <el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 -->
+      <el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
+      <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
+      <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
+      <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 -->
+      <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 -->
+      <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 -->
+      <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 -->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
 <!--            size="mini"-->
@@ -203,14 +158,14 @@
 <!--            icon="el-icon-edit"-->
 <!--            @click="handleUpdate(scope.row)"-->
 <!--            v-hasPermi="['search:ViewStockSecure:edit']"-->
-<!--          >{{$t('searchViewStockSecure.modify')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;-->
+<!--          >修改</el-button>-->
 <!--          <el-button-->
 <!--            size="mini"-->
 <!--            type="text"-->
 <!--            icon="el-icon-delete"-->
 <!--            @click="handleDelete(scope.row)"-->
 <!--            v-hasPermi="['search:ViewStockSecure:remove']"-->
-<!--          >{{$t('searchViewStockSecure.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;-->
+<!--          >删除</el-button>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
@@ -232,26 +187,6 @@
         <el-form-item :label="$t('searchViewStockSecure.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
           <el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockSecure.inputCargoSpaceId')" />
         </el-form-item>
-        <el-form-item :label="$t('searchViewStockSecure.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
-          <el-select v-model="form.stockStatus" :placeholder="$t('searchViewStockSecure.selectStockStatus')">
-            <el-option
-              v-for="dict in dict.type.stock_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('searchViewStockSecure.productStatus')" prop="productStatus"> <!-- 物料状态 -->
-          <el-select v-model="form.productStatus" :placeholder="$t('searchViewStockSecure.selectProductStatus')">
-            <el-option
-              v-for="dict in dict.type.product_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item :label="$t('searchViewStockSecure.lotNo')" prop="lotNo"> <!-- 批次号 -->
           <el-input v-model="form.lotNo" :placeholder="$t('searchViewStockSecure.inputLotNo')" />
         </el-form-item>
@@ -264,38 +199,133 @@
         <el-form-item :label="$t('searchViewStockSecure.productGuid')" prop="productGuid"> <!-- 物料GUID -->
           <el-input v-model="form.productGuid" :placeholder="$t('searchViewStockSecure.inputProductGuid')" />
         </el-form-item>
-        <el-form-item :label="$t('searchViewStockSecure.quantity')" prop="quantity"> <!-- 库存数量 -->
-          <el-input v-model="form.quantity" type="textarea" :placeholder="$t('searchViewStockSecure.inputContent')" />
-        </el-form-item>
         <el-form-item :label="$t('searchViewStockSecure.jobId')" prop="jobId"> <!-- 作业ID -->
           <el-input v-model="form.jobId" :placeholder="$t('searchViewStockSecure.inputJobId')" />
         </el-form-item>
         <el-form-item :label="$t('searchViewStockSecure.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
           <el-input v-model="form.trayCode" :placeholder="$t('searchViewStockSecure.inputTrayCode')" />
         </el-form-item>
-        <el-form-item :label="$t('searchViewStockSecure.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
-          <el-input v-model="form.outQuantity" type="textarea" :placeholder="$t('searchViewStockSecure.inputContent')" />
-        </el-form-item>
         <el-form-item :label="$t('searchViewStockSecure.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单ID -->
           <el-input v-model="form.stockinDetailId" :placeholder="$t('searchViewStockSecure.inputStockinDetailId')" />
         </el-form-item>
         <el-form-item :label="$t('searchViewStockSecure.stockinId')" prop="stockinId"> <!-- 入库主单 -->
           <el-input v-model="form.stockinId" :placeholder="$t('searchViewStockSecure.inputStockinId')" />
         </el-form-item>
-        <el-form-item :label="$t('searchViewStockSecure.inType')" prop="inType"> <!-- 入库类型 -->
+        <el-form-item :label="$t('searchViewStockSecure.inClassId')" prop="inClassId"> <!-- 入库班组ID -->
-          <el-select v-model="form.inType" :placeholder="$t('searchViewStockSecure.selectInType')">
+          <el-input v-model="form.inClassId" :placeholder="$t('searchViewStockSecure.inputInClassId')" />
-            <el-option
+        </el-form-item>
-              v-for="dict in dict.type.in_bill_type"
+        <el-form-item :label="$t('searchViewStockSecure.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
-              :key="dict.value"
+          <el-input v-model="form.warehouseId" :placeholder="$t('searchViewStockSecure.inputWarehouseId')" />
-              :label="dict.label"
+        </el-form-item>
-              :value="dict.value"
+        <el-form-item :label="$t('searchViewStockSecure.stackingId')" prop="stackingId"> <!-- 垛型ID -->
-            ></el-option>
+          <el-input v-model="form.stackingId" :placeholder="$t('searchViewStockSecure.inputStackingId')" />
-          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockSecure.spare1')" prop="spare1"> <!-- 库存预警标识 -->
+          <el-input v-model="form.spare1" :placeholder="$t('searchViewStockSecure.inputSpare1')" />
+        </el-form-item>
+<!--        <el-form-item label="备用字段2" prop="spare2">-->
+<!--          <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用字段3" prop="spare3">-->
+<!--          <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用字段4" prop="spare4">-->
+<!--          <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用字段5" prop="spare5">-->
+<!--          <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备用字段6" prop="spare6">-->
+<!--          <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="物料ID" prop="productId">
+          <el-input v-model="form.productId" placeholder="请输入物料ID" />
+        </el-form-item>
+        <el-form-item label="仓库地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入仓库地址" />
+        </el-form-item>
+        <el-form-item label="仓库描述" prop="cDesc">
+          <el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
+        </el-form-item>
+        <el-form-item label="仓库级别" prop="warehouseKind">
+          <el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
+        </el-form-item>
+        <el-form-item label="是否可用" prop="isCurrent">
+          <el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
+        </el-form-item>
+        <el-form-item label="价格" prop="price">
+          <el-input v-model="form.price" placeholder="请输入价格" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="规格" prop="spec">
+          <el-input v-model="form.spec" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="英文名称" prop="enName">
+          <el-input v-model="form.enName" placeholder="请输入英文名称" />
+        </el-form-item>
+        <el-form-item label="单件净重" prop="weight">
+          <el-input v-model="form.weight" placeholder="请输入单件净重" />
+        </el-form-item>
+        <el-form-item label="长MM" prop="longMM">
+          <el-input v-model="form.longMM" placeholder="请输入长MM" />
+        </el-form-item>
+        <el-form-item label="宽MM" prop="wide">
+          <el-input v-model="form.wide" placeholder="请输入宽MM" />
+        </el-form-item>
+        <el-form-item label="高MM" prop="hight">
+          <el-input v-model="form.hight" placeholder="请输入高MM" />
+        </el-form-item>
+        <el-form-item label="体积m³" prop="volume">
+          <el-input v-model="form.volume" placeholder="请输入体积m³" />
+        </el-form-item>
+        <el-form-item label="物料名称" prop="productName">
+          <el-input v-model="form.productName" placeholder="请输入物料名称" />
+        </el-form-item>
+        <el-form-item label="货位名称" prop="cargoSpaceName">
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
+        </el-form-item>
+        <el-form-item label="巷道ID" prop="roadwayId">
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
+        </el-form-item>
+        <el-form-item label="货区ID" prop="cargoAreaId">
+          <el-input v-model="form.cargoAreaId" placeholder="请输入货区ID" />
+        </el-form-item>
+        <el-form-item label="货位类型名称" prop="theTypeName">
+          <el-input v-model="form.theTypeName" placeholder="请输入货位类型名称" />
+        </el-form-item>
+        <el-form-item label="排" prop="thePlatoon">
+          <el-input v-model="form.thePlatoon" placeholder="请输入排" />
+        </el-form-item>
+        <el-form-item label="列" prop="theColumn">
+          <el-input v-model="form.theColumn" placeholder="请输入列" />
+        </el-form-item>
+        <el-form-item label="层" prop="theFloor">
+          <el-input v-model="form.theFloor" placeholder="请输入层" />
+        </el-form-item>
+        <el-form-item label="是否锁定" prop="locked">
+          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
+        </el-form-item>
+        <el-form-item label="是否双伸" prop="issDouble">
+          <el-input v-model="form.issDouble" placeholder="请输入是否双伸" />
+        </el-form-item>
+        <el-form-item label="双货位分组编码" prop="groupCodingNo">
+          <el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
+        </el-form-item>
+        <el-form-item label="双货位分组编码" prop="groupCoding">
+          <el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码" />
+        </el-form-item>
+        <el-form-item label="双货位标识" prop="cargoSpaceLogo">
+          <el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识" />
+        </el-form-item>
+        <el-form-item label="本仓库区域" prop="thisCargoArea">
+          <el-input v-model="form.thisCargoArea" placeholder="请输入本仓库区域" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{$t('searchViewStockSecure.confirm')}}</el-button> <!-- 确定 -->
+        <el-button type="primary" @click="submitForm">{{ $t('searchViewStockSecure.confirm') }}</el-button> <!-- 确 定 -->
-        <el-button @click="cancel">{{$t('searchViewStockSecure.cancel')}}</el-button> <!-- 取消 -->
+        <el-button @click="cancel">{{ $t('searchViewStockSecure.cancel') }}</el-button> <!-- 取 消 -->
       </div>
     </el-dialog>
   </div>
@@ -307,19 +337,18 @@ import { listWarehouse } from "@/api/bas/warehouse"
 
 export default {
   name: "ViewStockSecure",
-  dicts: ['product_status', 'in_bill_type', 'stock_status'],
   data() {
     return {
       // 遮罩层
       loading: true,
+      // 仓库选项
+      warehouseOptions: [],
       // 选中数组
       ids: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
       multiple: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -365,11 +394,16 @@ export default {
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
-        productName: null,
-        spec: null,
-        cargoNo: null,
-        unit: null,
         price: null,
+        unit: null,
+        spec: null,
+        enName: null,
+        weight: null,
+        longMM: null,
+        wide: null,
+        hight: null,
+        volume: null,
+        productName: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -392,7 +426,7 @@ export default {
       // 表单校验
       rules: {
         stockId: [
-          { required: true, message: this.$t('searchViewStockSecure.stockIdRequired'), trigger: "blur" }
+          { required: true, message: this.$t('searchViewStockSecure.stockIdRequired'), trigger: "blur" } // 库存ID不能为空
         ],
       }
     }
@@ -461,12 +495,16 @@ export default {
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
-        productName: null,
-        spec: null,
-        cargoNo: null,
-        unit: null,
         price: null,
-        remark: null,
+        unit: null,
+        spec: null,
+        enName: null,
+        weight: null,
+        longMM: null,
+        wide: null,
+        hight: null,
+        volume: null,
+        productName: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -506,7 +544,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = this.$t('searchViewStockSecure.addTitle')
+      this.title = this.$t('searchViewStockSecure.addTitle') // 添加安全库存查询
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -515,7 +553,7 @@ export default {
       getViewStockSecure(stockId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = this.$t('searchViewStockSecure.editTitle')
+        this.title = this.$t('searchViewStockSecure.editTitle') // 修改安全库存查询
       })
     },
     /** 提交按钮 */
@@ -524,13 +562,13 @@ export default {
         if (valid) {
           if (this.form.stockId != null) {
             updateViewStockSecure(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('searchViewStockSecure.editSuccess'))
+              this.$modal.msgSuccess(this.$t('searchViewStockSecure.updateSuccess')) // 修改成功
               this.open = false
               this.getList()
             })
           } else {
             addViewStockSecure(this.form).then(response => {
-              this.$modal.msgSuccess(this.$t('searchViewStockSecure.addSuccess'))
+              this.$modal.msgSuccess(this.$t('searchViewStockSecure.addSuccess')) // 新增成功
               this.open = false
               this.getList()
             })
@@ -541,11 +579,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm(this.$t('searchViewStockSecure.deleteConfirm', { stockIds: stockIds })).then(function() {
+      this.$modal.confirm(this.$t('searchViewStockSecure.deleteConfirm', { stockIds })).then(function() { // 是否确认删除安全库存查询编号为"' + stockIds + '"的数据项？
         return delViewStockSecure(stockIds)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess(this.$t('searchViewStockSecure.deleteSuccess'))
+        this.$modal.msgSuccess(this.$t('searchViewStockSecure.deleteSuccess')) // 删除成功
       }).catch(() => {})
     },
     /** 导出按钮操作 */

ruoyi-ui/src/views/search/ViewStockWarning/index.vue

@@ -1,8 +1,17 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+<!--      <el-form-item label="库存ID" prop="stockId">-->
-        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
+<!--        <el-input-->
+<!--          v-model="queryParams.stockId"-->
+<!--          placeholder="请输入库存ID"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
+      <el-form-item :label="$t('searchViewStockWarning.warehouse')" prop="warehouseId"> <!-- 仓库 -->
+        <el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewStockWarning.selectWarehouse')" clearable>
           <el-option
             v-for="dict in warehouseOptions"
             :key="dict.warehouseId"
@@ -11,88 +20,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.stockId')" prop="stockId"> <!-- 库存ID -->
-        <el-input
-          v-model="queryParams.stockId"
-          :placeholder="$t('searchViewStockWarning.inputStockId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
-        <el-input
-          v-model="queryParams.cargoSpaceId"
-          :placeholder="$t('searchViewStockWarning.inputCargoSpaceId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
-        <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockWarning.selectStockStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.stock_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.productStatus')" prop="productStatus"> <!-- 物料状态 -->
-        <el-select v-model="queryParams.productStatus" :placeholder="$t('searchViewStockWarning.selectProductStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.product_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewStockWarning.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
-        <el-date-picker
-          v-model="queryParams.inDate"
-          :placeholder="$t('searchViewStockWarning.inputInDate')"
-          clearable
-          type="date"
-          value-format="yyyy-MM-dd"
-          @keyup.enter.native="handleQuery">
-        </el-date-picker>
-      </el-form-item>
 
-
-<!--      <el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;
-        <el-input
-          v-model="queryParams.backDate"
-          :placeholder="$t('searchViewStockWarning.inputBackDate')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
-        <el-input
-          v-model="queryParams.trayCode"
-          :placeholder="$t('searchViewStockWarning.inputTrayCode')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.inType')" prop="inType"> <!-- 入库类型 -->
-        <el-select v-model="queryParams.inType" :placeholder="$t('searchViewStockWarning.selectInType')" clearable>
-          <el-option
-            v-for="dict in dict.type.in_bill_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       <el-form-item :label="$t('searchViewStockWarning.productId')" prop="productId"> <!-- 物料ID -->
         <el-input
           v-model="queryParams.productId"
@@ -101,6 +29,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item :label="$t('searchViewStockWarning.productName')" prop="productName"> <!-- 物料名称 -->
         <el-input
           v-model="queryParams.productName"
@@ -109,45 +38,46 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item :label="$t('searchViewStockWarning.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;
+
-        <el-input
-          v-model="queryParams.spec"
-          :placeholder="$t('searchViewStockWarning.inputSpec')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockWarning.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
-        <el-input
-          v-model="queryParams.thePlatoon"
-          :placeholder="$t('searchViewStockWarning.inputThePlatoon')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.theColumn')" prop="theColumn"> <!-- 列 -->
-        <el-input
-          v-model="queryParams.theColumn"
-          :placeholder="$t('searchViewStockWarning.inputTheColumn')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockWarning.theFloor')" prop="theFloor"> <!-- 层 -->
-        <el-input
-          v-model="queryParams.theFloor"
-          :placeholder="$t('searchViewStockWarning.inputTheFloor')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('searchViewStockWarning.search')}}</el-button> <!-- 搜索 -->
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('searchViewStockWarning.search') }}</el-button> <!-- 搜索 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockWarning.reset')}}</el-button> <!-- 重置 -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('searchViewStockWarning.reset') }}</el-button> <!-- 重置 -->
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['search:ViewStockWarning:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['search:ViewStockWarning:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['search:ViewStockWarning:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -156,65 +86,88 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['search:ViewStockWarning:export']"
-        >{{$t('searchViewStockWarning.export')}}</el-button> <!-- 导出 -->
+        >{{ $t('searchViewStockWarning.export') }}</el-button> <!-- 导出 -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('searchViewStockWarning.stockId')" align="left" prop="stockId" />
+      <el-table-column :label="$t('searchViewStockWarning.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
-      <el-table-column :label="$t('searchViewStockWarning.cargoSpaceId')" align="left" prop="cargoSpaceId" />
+      <el-table-column :label="$t('searchViewStockWarning.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
-      <el-table-column :label="$t('searchViewStockWarning.stockStatus')" align="left" prop="stockStatus">
+      <el-table-column :label="$t('searchViewStockWarning.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
-        <template slot-scope="scope">
+      <el-table-column :label="$t('searchViewStockWarning.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 -->
-          <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
+      <el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
-        </template>
+      <el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
-      </el-table-column>
+      <el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
-      <el-table-column :label="$t('searchViewStockWarning.productStatus')" align="left" prop="productStatus">
+      <el-table-column :label="$t('searchViewStockWarning.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
-        <template slot-scope="scope">
+      <el-table-column :label="$t('searchViewStockWarning.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
-          <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
+      <el-table-column :label="$t('searchViewStockWarning.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
-        </template>
+      <el-table-column :label="$t('searchViewStockWarning.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
-      </el-table-column>
+      <el-table-column :label="$t('searchViewStockWarning.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
-      <el-table-column :label="$t('searchViewStockWarning.inDate')" align="left" prop="inDate" />
+      <el-table-column :label="$t('searchViewStockWarning.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
-      <el-table-column :label="$t('searchViewStockWarning.backDate')" align="left" prop="backDate" />
+      <el-table-column :label="$t('searchViewStockWarning.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
-      <el-table-column :label="$t('searchViewStockWarning.quantity')" align="right" prop="quantity" />
+      <el-table-column :label="$t('searchViewStockWarning.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
-      <el-table-column :label="$t('searchViewStockWarning.jobId')" align="left" prop="jobId" />
+      <el-table-column :label="$t('searchViewStockWarning.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
-      <el-table-column :label="$t('searchViewStockWarning.trayCode')" align="left" prop="trayCode" />
+      <el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
-      <el-table-column :label="$t('searchViewStockWarning.outQuantity')" align="right" prop="outQuantity" />
+      <el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
-      <el-table-column :label="$t('searchViewStockWarning.stockinId')" align="left" prop="stockinId" />
+      <el-table-column :label="$t('searchViewStockWarning.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 -->
-      <el-table-column :label="$t('searchViewStockWarning.inType')" align="left" prop="inType">
+<!--      <el-table-column label="${comment}" align="center" prop="spare2" />-->
-        <template slot-scope="scope">
+<!--      <el-table-column label="${comment}" align="center" prop="spare3" />-->
-          <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
+<!--      <el-table-column label="${comment}" align="center" prop="spare4" />-->
-        </template>
+<!--      <el-table-column label="${comment}" align="center" prop="spare5" />-->
-      </el-table-column>
+<!--      <el-table-column label="${comment}" align="center" prop="spare6" />-->
-      <el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="left" prop="warehouseId" />
+      <el-table-column :label="$t('searchViewStockWarning.productId')" align="center" prop="productId" /> <!-- 物料ID -->
-      <el-table-column :label="$t('searchViewStockWarning.productId')" align="left" prop="productId" />
+      <el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
-      <el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="left" prop="warehouseName" />
+      <el-table-column :label="$t('searchViewStockWarning.address')" align="center" prop="address" /> <!-- 仓库地址 -->
-      <el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="left" prop="warehouseType" />
+      <el-table-column :label="$t('searchViewStockWarning.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
-      <el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="left" prop="isCurrent" />
+      <el-table-column :label="$t('searchViewStockWarning.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
-      <el-table-column :label="$t('searchViewStockWarning.productName')" align="left" prop="productName" />
+      <el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
-      <el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="left" prop="cargoSpaceName" />
+      <el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
-      <el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="left" prop="cargoStatus" >
+      <el-table-column :label="$t('searchViewStockWarning.price')" align="center" prop="price" /> <!-- 价格 -->
-        <template slot-scope="scope">
+      <el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
-          <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
+      <el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> <!-- 规格 -->
-        </template>
+      <el-table-column :label="$t('searchViewStockWarning.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
-      </el-table-column>
+       <el-table-column :label="$t('searchViewStockWarning.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
-      <el-table-column :label="$t('searchViewStockWarning.locked')" align="left" prop="locked" >
+       <el-table-column :label="$t('searchViewStockWarning.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
-        <template slot-scope="scope">
+       <el-table-column :label="$t('searchViewStockWarning.wide')" align="center" prop="wide" /> <!-- 宽MM -->
-          <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
+       <el-table-column :label="$t('searchViewStockWarning.hight')" align="center" prop="hight" /> <!-- 高MM -->
-        </template>
+       <el-table-column :label="$t('searchViewStockWarning.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
-      </el-table-column>
+       <el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
-      <el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="right" prop="cargoHight" />
+       <el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
-      <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
+       <el-table-column :label="$t('searchViewStockWarning.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
-      <el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
+       <el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
-      <el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="left" prop="cargoNo" />
+      <el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
-      <el-table-column :label="$t('searchViewStockWarning.unit')" align="left" prop="unit" />
+      <el-table-column :label="$t('searchViewStockWarning.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 -->
-      <el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
+      <el-table-column :label="$t('searchViewStockWarning.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 -->
-      <el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
+      <el-table-column :label="$t('searchViewStockWarning.theColumn')" align="center" prop="theColumn" /> <!-- 列 -->
-      <el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
+      <el-table-column :label="$t('searchViewStockWarning.theFloor')" align="center" prop="theFloor" /> <!-- 层 -->
-      <el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
+      <el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 -->
-      <el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
+      <el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
-      <el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
+      <el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
+      <el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
+      <el-table-column :label="$t('searchViewStockWarning.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 -->
+      <el-table-column :label="$t('searchViewStockWarning.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 -->
+      <el-table-column :label="$t('searchViewStockWarning.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 -->
+      <el-table-column :label="$t('searchViewStockWarning.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 -->
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['search:ViewStockWarning:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['search:ViewStockWarning:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -225,63 +178,157 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改预警库存查询对话框 -->
+    <!-- 添加或修改库存预警报表对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item :label="$t('searchViewStockWarning.stockId')" prop="stockId"> <!-- 库存ID -->
-          <el-input v-model="form.stockId" :placeholder="$t('searchViewStockWarning.inputStockId')" />
+          <el-input v-model="form.stockId" :placeholder="$t('searchViewStockWarning.stockIdRequired')" /> <!-- 请输入库存ID -->
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
-          <el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockWarning.inputCargoSpaceId')" />
+          <el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockWarning.inputCargoSpaceId')" /> <!-- 请输入货位ID -->
-        </el-form-item>
-        <el-form-item :label="$t('searchViewStockWarning.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
-          <el-select v-model="form.stockStatus" :placeholder="$t('searchViewStockWarning.selectStockStatus')">
-            <el-option
-              v-for="dict in dict.type.stock_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('searchViewStockWarning.productStatus')" prop="productStatus"> <!-- 物料状态 -->
-          <el-select v-model="form.productStatus" :placeholder="$t('searchViewStockWarning.selectProductStatus')">
-            <el-option
-              v-for="dict in dict.type.product_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> <!-- 批次号 -->
-          <el-input v-model="form.lotNo" :placeholder="$t('searchViewStockWarning.inputLotNo')" />
+          <el-input v-model="form.lotNo" :placeholder="$t('searchViewStockWarning.inputLotNo')" /> <!-- 请输入批次号 -->
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
-          <el-input v-model="form.inDate" :placeholder="$t('searchViewStockWarning.inputInDate')" />
+          <el-input v-model="form.inDate" :placeholder="$t('searchViewStockWarning.inputInDate')" /> <!-- 请输入入库时间 -->
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> <!-- 回流时间 -->
-          <el-input v-model="form.backDate" :placeholder="$t('searchViewStockWarning.inputBackDate')" />
+          <el-input v-model="form.backDate" :placeholder="$t('searchViewStockWarning.inputBackDate')" /> <!-- 请输入回流时间 -->
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.productGuid')" prop="productGuid"> <!-- 物料GUID -->
-          <el-input v-model="form.productGuid" :placeholder="$t('searchViewStockWarning.inputProductGuid')" />
+          <el-input v-model="form.productGuid" :placeholder="$t('searchViewStockWarning.inputProductGuid')" /> <!-- 请输入物料GUID -->
-        </el-form-item>
-        <el-form-item :label="$t('searchViewStockWarning.quantity')" prop="quantity"> <!-- 库存数量 -->
-          <el-input v-model="form.quantity" :placeholder="$t('searchViewStockWarning.inputQuantity')" />
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.jobId')" prop="jobId"> <!-- 作业ID -->
-          <el-input v-model="form.jobId" :placeholder="$t('searchViewStockWarning.inputJobId')" />
+          <el-input v-model="form.jobId" :placeholder="$t('searchViewStockWarning.inputJobId')" /> <!-- 请输入作业ID -->
         </el-form-item>
         <el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
-          <el-input v-model="form.trayCode" :placeholder="$t('searchViewStockWarning.inputTrayCode')" />
+          <el-input v-model="form.trayCode" :placeholder="$t('searchViewStockWarning.inputTrayCode')" /> <!-- 请输入托盘条码 -->
         </el-form-item>
-        <el-form-item :label="$t('searchViewStockWarning.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
+        <el-form-item :label="$t('searchViewStockWarning.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单ID -->
-          <el-input v-model="form.outQuantity" :placeholder="$t('searchViewStockWarning.inputOutQuantity')" />
+          <el-input v-model="form.stockinDetailId" :placeholder="$t('searchViewStockWarning.inputStockinDetailId')" /> <!-- 请输入入库子单ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.stockinId')" prop="stockinId"> <!-- 入库主单 -->
+          <el-input v-model="form.stockinId" :placeholder="$t('searchViewStockWarning.inputStockinId')" /> <!-- 请输入入库主单 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.inClassId')" prop="inClassId"> <!-- 入库班组ID -->
+          <el-input v-model="form.inClassId" :placeholder="$t('searchViewStockWarning.inputInClassId')" /> <!-- 请输入入库班组ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
+          <el-input v-model="form.warehouseId" :placeholder="$t('searchViewStockWarning.inputWarehouseId')" /> <!-- 请输入仓库ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.stackingId')" prop="stackingId"> <!-- 垛型ID -->
+          <el-input v-model="form.stackingId" :placeholder="$t('searchViewStockWarning.inputStackingId')" /> <!-- 请输入垛型ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.spare1')" prop="spare1"> <!-- 库存预警标识 -->
+          <el-input v-model="form.spare1" :placeholder="$t('searchViewStockWarning.inputSpare1')" /> <!-- 请输入库存预警标识 -->
+        </el-form-item>
+<!--        <el-form-item label="${comment}" prop="spare2">-->
+<!--          <el-input v-model="form.spare2" placeholder="请输入${comment}" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="${comment}" prop="spare3">-->
+<!--          <el-input v-model="form.spare3" placeholder="请输入${comment}" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="${comment}" prop="spare4">-->
+<!--          <el-input v-model="form.spare4" placeholder="请输入${comment}" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="${comment}" prop="spare5">-->
+<!--          <el-input v-model="form.spare5" placeholder="请输入${comment}" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="${comment}" prop="spare6">-->
+<!--          <el-input v-model="form.spare6" placeholder="请输入${comment}" />-->
+<!--        </el-form-item>-->
+        <el-form-item :label="$t('searchViewStockWarning.productId')" prop="productId"> <!-- 物料ID -->
+          <el-input v-model="form.productId" :placeholder="$t('searchViewStockWarning.inputProductId')" /> <!-- 请输入物料ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.warehouseName')" prop="warehouseName"> <!-- 仓库名称 -->
+          <el-input v-model="form.warehouseName" :placeholder="$t('searchViewStockWarning.inputWarehouseName')" /> <!-- 请输入仓库名称 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.address')" prop="address"> <!-- 仓库地址 -->
+          <el-input v-model="form.address" :placeholder="$t('searchViewStockWarning.inputAddress')" /> <!-- 请输入仓库地址 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.cDesc')" prop="cDesc"> <!-- 仓库描述 -->
+          <el-input v-model="form.cDesc" :placeholder="$t('searchViewStockWarning.inputCDesc')" /> <!-- 请输入仓库描述 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.warehouseKind')" prop="warehouseKind"> <!-- 仓库级别 -->
+          <el-input v-model="form.warehouseKind" :placeholder="$t('searchViewStockWarning.inputWarehouseKind')" /> <!-- 请输入仓库级别 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
+          <el-input v-model="form.isCurrent" :placeholder="$t('searchViewStockWarning.inputIsCurrent')" /> <!-- 请输入是否可用 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.price')" prop="price"> <!-- 价格 -->
+          <el-input v-model="form.price" :placeholder="$t('searchViewStockWarning.inputPrice')" /> <!-- 请输入价格 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.unit')" prop="unit"> <!-- 单位 -->
+          <el-input v-model="form.unit" :placeholder="$t('searchViewStockWarning.inputUnit')" /> <!-- 请输入单位 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.spec')" prop="spec"> <!-- 规格 -->
+          <el-input v-model="form.spec" :placeholder="$t('searchViewStockWarning.inputSpec')" /> <!-- 请输入规格 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.enName')" prop="enName"> <!-- 英文名称 -->
+          <el-input v-model="form.enName" :placeholder="$t('searchViewStockWarning.inputEnName')" /> <!-- 请输入英文名称 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.weight')" prop="weight"> <!-- 单件净重 -->
+          <el-input v-model="form.weight" :placeholder="$t('searchViewStockWarning.inputWeight')" /> <!-- 请输入单件净重 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.longMM')" prop="longMM"> <!-- 长MM -->
+          <el-input v-model="form.longMM" :placeholder="$t('searchViewStockWarning.inputLongMM')" /> <!-- 请输入长MM -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.wide')" prop="wide"> <!-- 宽MM -->
+          <el-input v-model="form.wide" :placeholder="$t('searchViewStockWarning.inputWide')" /> <!-- 请输入宽MM -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.hight')" prop="hight"> <!-- 高MM -->
+          <el-input v-model="form.hight" :placeholder="$t('searchViewStockWarning.inputHight')" /> <!-- 请输入高MM -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.volume')" prop="volume"> <!-- 体积m³ -->
+          <el-input v-model="form.volume" :placeholder="$t('searchViewStockWarning.inputVolume')" /> <!-- 请输入体积m³ -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.productName')" prop="productName"> <!-- 物料名称 -->
+          <el-input v-model="form.productName" :placeholder="$t('searchViewStockWarning.inputProductName')" /> <!-- 请输入物料名称 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.cargoSpaceName')" prop="cargoSpaceName"> <!-- 货位名称 -->
+          <el-input v-model="form.cargoSpaceName" :placeholder="$t('searchViewStockWarning.inputCargoSpaceName')" /> <!-- 请输入货位名称 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.roadwayId')" prop="roadwayId"> <!-- 巷道ID -->
+          <el-input v-model="form.roadwayId" :placeholder="$t('searchViewStockWarning.inputRoadwayId')" /> <!-- 请输入巷道ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.cargoAreaId')" prop="cargoAreaId"> <!-- 货区ID -->
+          <el-input v-model="form.cargoAreaId" :placeholder="$t('searchViewStockWarning.inputCargoAreaId')" /> <!-- 请输入货区ID -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.theTypeName')" prop="theTypeName"> <!-- 货位类型名称 -->
+          <el-input v-model="form.theTypeName" :placeholder="$t('searchViewStockWarning.inputTheTypeName')" /> <!-- 请输入货位类型名称 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
+          <el-input v-model="form.thePlatoon" :placeholder="$t('searchViewStockWarning.inputThePlatoon')" /> <!-- 请输入排 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.theColumn')" prop="theColumn"> <!-- 列 -->
+          <el-input v-model="form.theColumn" :placeholder="$t('searchViewStockWarning.inputTheColumn')" /> <!-- 请输入列 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.theFloor')" prop="theFloor"> <!-- 层 -->
+          <el-input v-model="form.theFloor" :placeholder="$t('searchViewStockWarning.inputTheFloor')" /> <!-- 请输入层 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.locked')" prop="locked"> <!-- 是否锁定 -->
+          <el-input v-model="form.locked" :placeholder="$t('searchViewStockWarning.inputLocked')" /> <!-- 请输入是否锁定 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.issDouble')" prop="issDouble"> <!-- 是否双伸 -->
+          <el-input v-model="form.issDouble" :placeholder="$t('searchViewStockWarning.inputIssDouble')" /> <!-- 请输入是否双伸 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.groupCodingNo')" prop="groupCodingNo"> <!-- 双货位分组编码 -->
+          <el-input v-model="form.groupCodingNo" :placeholder="$t('searchViewStockWarning.inputGroupCodingNo')" /> <!-- 请输入双货位分组编码 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.groupCoding')" prop="groupCoding"> <!-- 双货位分组编码 -->
+          <el-input v-model="form.groupCoding" :placeholder="$t('searchViewStockWarning.inputGroupCoding')" /> <!-- 请输入双货位分组编码 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.cargoSpaceLogo')" prop="cargoSpaceLogo"> <!-- 双货位标识 -->
+          <el-input v-model="form.cargoSpaceLogo" :placeholder="$t('searchViewStockWarning.inputCargoSpaceLogo')" /> <!-- 请输入双货位标识 -->
+        </el-form-item>
+        <el-form-item :label="$t('searchViewStockWarning.thisCargoArea')" prop="thisCargoArea"> <!-- 本仓库区域 -->
+          <el-input v-model="form.thisCargoArea" :placeholder="$t('searchViewStockWarning.inputThisCargoArea')" /> <!-- 请输入本仓库区域 -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">{{$t('searchViewStockWarning.confirm')}}</el-button> <!-- 确定 -->
+        <el-button type="primary" @click="submitForm">{{ $t('searchViewStockWarning.confirm') }}</el-button> <!-- 确 定 -->
-        <el-button @click="cancel">{{$t('searchViewStockWarning.cancel')}}</el-button> <!-- 取消 -->
+        <el-button @click="cancel">{{ $t('searchViewStockWarning.cancel') }}</el-button> <!-- 取 消 -->
       </div>
     </el-dialog>
   </div>
@@ -289,19 +336,17 @@
 
 <script>
 import { listViewStockWarning, getViewStockWarning, delViewStockWarning, addViewStockWarning, updateViewStockWarning } from "@/api/search/ViewStockWarning"
-import { listWarehouse } from "@/api/bas/warehouse"
+import {listWarehouse} from "@/api/bas/warehouse";
 
 export default {
   name: "ViewStockWarning",
-  dicts: ['product_status', 'in_bill_type', 'stock_status','cargo_space_status','cargo_space_lock_status'],
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 仓库选项
-      warehouseOptions: [],
       // 选中数组
       ids: [],
+      warehouseOptions:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -310,7 +355,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 预警库存查询表格数据
+      // 库存预警报表表格数据
       ViewStockWarningList: [],
       // 弹出层标题
       title: "",
@@ -351,11 +396,16 @@ export default {
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
-        productName: null,
-        spec: null,
-        cargoNo: null,
-        unit: null,
         price: null,
+        unit: null,
+        spec: null,
+        enName: null,
+        weight: null,
+        longMM: null,
+        wide: null,
+        hight: null,
+        volume: null,
+        productName: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -378,7 +428,7 @@ export default {
       // 表单校验
       rules: {
         stockId: [
-          { required: true, message: "库存ID不能为空", trigger: "blur" }
+          { required: true, message: this.$t('searchViewStockWarning.stockIdRequired'), trigger: "blur" } // 库存ID不能为空
         ],
       }
     }
@@ -399,7 +449,7 @@ export default {
       });
       // this.warehouseOptions = [{warehouseId: "01", warehouseName: "仓库1"}, {warehouseId: "02", warehouseName: "仓库2"}];
     },
-    /** 查询预警库存查询列表 */
+    /** 查询库存预警报表列表 */
     getList() {
       this.loading = true
       listViewStockWarning(this.queryParams).then(response => {
@@ -447,12 +497,16 @@ export default {
         warehouseKind: null,
         warehouseType: null,
         isCurrent: null,
-        productName: null,
-        spec: null,
-        cargoNo: null,
-        unit: null,
         price: null,
-        remark: null,
+        unit: null,
+        spec: null,
+        enName: null,
+        weight: null,
+        longMM: null,
+        wide: null,
+        hight: null,
+        volume: null,
+        productName: null,
         cargoSpaceName: null,
         roadwayId: null,
         cargoAreaId: null,
@@ -492,7 +546,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加预警库存查询"
+      this.title = this.$t('searchViewStockWarning.addTitle') // 添加库存预警报表
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -501,7 +555,7 @@ export default {
       getViewStockWarning(stockId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改预警库存查询"
+        this.title = this.$t('searchViewStockWarning.editTitle') // 修改库存预警报表
       })
     },
     /** 提交按钮 */
@@ -510,13 +564,13 @@ export default {
         if (valid) {
           if (this.form.stockId != null) {
             updateViewStockWarning(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
+              this.$modal.msgSuccess(this.$t('common.editSuccess')) // 修改成功
               this.open = false
               this.getList()
             })
           } else {
             addViewStockWarning(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
+              this.$modal.msgSuccess(this.$t('common.addSuccess')) // 新增成功
               this.open = false
               this.getList()
             })
@@ -527,11 +581,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const stockIds = row.stockId || this.ids
-      this.$modal.confirm('是否确认删除预警库存查询编号为"' + stockIds + '"的数据项？').then(function() {
+      this.$modal.confirm(this.$t('common.deleteConfirm', { ids: stockIds })).then(function() { // 是否确认删除库存预警报表编号为"' + stockIds + '"的数据项？
         return delViewStockWarning(stockIds)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess("删除成功")
+        this.$modal.msgSuccess(this.$t('common.deleteSuccess')) // 删除成功
       }).catch(() => {})
     },
     /** 导出按钮操作 */