From 37e026adb78df94ce09f16b36e1ff4df1645367f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8C=AB=E7=8C=ABguowen?= <9290821+guowen-the-cat@user.noreply.gitee.com> Date: Wed, 6 Aug 2025 17:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=AE=89=E5=85=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E3=80=82=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockSummary/domain/StockSummary.java | 32 +- .../domain/ViewFlatWarehouseInFlow.java | 50 +- .../domain/ViewFlatWarehouseOutFlow.java | 50 +- .../ViewInJobFlow/domain/ViewInJobFlow.java | 72 +-- .../ViewOutJobFlow/domain/ViewOutJobFlow.java | 76 +-- .../domain/ViewStockDetail.java | 58 +- .../controller/ViewStockSecureController.java | 4 +- .../domain/ViewStockSecure.java | 609 ++++++++++-------- .../mapper/ViewStockSecureMapper.java | 4 +- .../service/IViewStockSecureService.java | 4 +- .../impl/ViewStockSecureServiceImpl.java | 23 +- .../ViewStockWarningController.java | 26 +- .../domain/ViewStockWarning.java | 418 +++++++----- .../mapper/ViewStockWarningMapper.java | 30 +- .../service/IViewStockWarningService.java | 32 +- .../impl/ViewStockWarningServiceImpl.java | 51 +- .../domain/ViewStockinHistory.java | 87 ++- .../domain/ViewStockoutHistory.java | 56 +- .../resources/i18n/messages_en_US.properties | 364 +++++++++++ .../resources/i18n/messages_zh_CN.properties | 364 +++++++++++ .../CheckDifferenceRecordFinishMapper.xml | 163 ----- .../mapper/search/ViewStockSecureMapper.xml | 183 +++--- .../mapper/search/ViewStockWarningMapper.xml | 179 ++--- .../com/ruoyi/common/utils/poi/ExcelUtil.java | 9 +- ruoyi-ui/src/api/search/ViewStockWarning.js | 10 +- ruoyi-ui/src/lang/en.js | 243 ++++--- ruoyi-ui/src/lang/hu.js | 311 +++++---- ruoyi-ui/src/lang/zh.js | 116 ++++ .../views/search/ViewStockSecure/index.vue | 470 +++++++------- .../views/search/ViewStockWarning/index.vue | 510 ++++++++------- 30 files changed, 2879 insertions(+), 1725 deletions(-) delete mode 100644 ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java index 82bf6a4..ba9fe9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java @@ -20,71 +20,71 @@ public class StockSummary extends BaseEntity private Long onlyIdentity; /** 物料编码 */ - @Excel(name = "物料编码") + @Excel(name = "${search.StockSummary.productId}") private String productId; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.StockSummary.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.StockSummary.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.StockSummary.unit}") private String unit; /** 批号 */ - @Excel(name = "批号") + @Excel(name = "${search.StockSummary.lotNo}") private String lotNo; /** 仓库 */ private String warehouseId; - @Excel(name = "仓库") + @Excel(name = "${search.StockSummary.warehouseName}") private String warehouseName; /** 巷道 */ private String roadwayId; /** 库存数量 */ - @Excel(name = "库存数量") + @Excel(name = "${search.StockSummary.quantity}") private Double quantity; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.StockSummary.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.StockSummary.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.StockSummary.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.StockSummary.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.StockSummary.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.StockSummary.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.StockSummary.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.StockSummary.remark}") private String remark; private String cargoSpaceId; - @Excel(name = "货位名称") + @Excel(name = "${search.StockSummary.cargoSpaceName}") private String cargoSpaceName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java index c08f147..6f606fe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java @@ -19,103 +19,103 @@ public class ViewFlatWarehouseInFlow extends BaseEntity private Long id; /** 入出库类型 */ - @Excel(name = "入出库类型") + @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOut}") private String inOrOut; /** 入出库主单据ID */ - @Excel(name = "入出库主单据ID") + @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckId}") private String inOrOutSotckId; /** 入出库主子单据ID */ - @Excel(name = "入出库主子单据ID") + @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckDetailId}") private String inOrOutSotckDetailId; /** 物料GUID */ - @Excel(name = "物料GUID") + @Excel(name = "${search.ViewFlatWarehouseInFlow.productGuid}") private String productGuid; /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewFlatWarehouseInFlow.productId}") private String productId; /** 数量 */ - @Excel(name = "数量") + @Excel(name = "${search.ViewFlatWarehouseInFlow.quantity}") private String quantity; /** 创建人 */ - @Excel(name = "创建人") + @Excel(name = "${search.ViewFlatWarehouseInFlow.createMan}") private String createMan; /** 仓库id */ - @Excel(name = "仓库id") + @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseId}") private String warehouseId; /** 仓库名称 */ - @Excel(name = "仓库名称") + @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseName}") private String warehouseName; /** 仓库地址 */ - @Excel(name = "仓库地址") + @Excel(name = "${search.ViewFlatWarehouseInFlow.address}") private String address; /** 仓库描述 */ - @Excel(name = "仓库描述") + @Excel(name = "${search.ViewFlatWarehouseInFlow.cDesc}") private String cDesc; /** 仓库级别 */ - @Excel(name = "仓库级别") + @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseKind}") private String warehouseKind; /** 仓库类型 */ - @Excel(name = "仓库类型") + @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseType}") private String warehouseType; /** 是否可用 */ - @Excel(name = "是否可用") + @Excel(name = "${search.ViewFlatWarehouseInFlow.isCurrent}") private String isCurrent; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewFlatWarehouseInFlow.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewFlatWarehouseInFlow.unit}") private String unit; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewFlatWarehouseInFlow.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewFlatWarehouseInFlow.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewFlatWarehouseInFlow.remark}") private String remark; @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java index 6ed5839..998eee4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java @@ -19,104 +19,104 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity private Long id; /** 入出库类型 */ - @Excel(name = "入出库类型") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOut}") private String inOrOut; /** 入出库主单据ID */ - @Excel(name = "入出库主单据ID") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOutSotckId}") private String inOrOutSotckId; /** 入出库主子单据ID */ - @Excel(name = "入出库主子单据ID") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId}") private String inOrOutSotckDetailId; /** 物料GUID */ - @Excel(name = "物料GUID") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.productGuid}") private String productGuid; /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.productId}") private String productId; /** 入出库数量 */ - @Excel(name = "入出库数量") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.quantity}") private String quantity; /** 创建人 */ - @Excel(name = "创建人") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.createMan}") private String createMan; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseId}") private String warehouseId; /** 仓库名称 */ - @Excel(name = "仓库名称") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseName}") private String warehouseName; /** 仓库地址 */ - @Excel(name = "仓库地址") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.address}") private String address; /** 仓库描述 */ - @Excel(name = "仓库描述") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.cDesc}") private String cDesc; /** 仓库级别 */ - @Excel(name = "仓库级别") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseKind}") private String warehouseKind; /** 仓库类型 */ - @Excel(name = "仓库类型") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseType}") private String warehouseType; /** 是否可用 */ - @Excel(name = "是否可用") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.isCurrent}") private String isCurrent; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.unit}") private String unit; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewFlatWarehouseOutFlow.remark}") private String remark; @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java index 0c415f0..8d33f47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java @@ -16,147 +16,147 @@ public class ViewInJobFlow extends BaseEntity private static final long serialVersionUID = 1L; /** 作业ID */ - @Excel(name = "作业ID") + @Excel(name = "${search.ViewInJobFlow.jobId}") private String jobId; /** 子作业ID */ - @Excel(name = "子作业ID") + @Excel(name = "${search.ViewInJobFlow.jobDetailId}") private String jobDetailId; /** 状态 */ - @Excel(name = "状态") + @Excel(name = "${search.ViewInJobFlow.status}") private String status; /** 任务号 */ - @Excel(name = "任务号") + @Excel(name = "${search.ViewInJobFlow.taskNo}") private String taskNo; /** 托盘号 */ - @Excel(name = "托盘号") + @Excel(name = "${search.ViewInJobFlow.trayCode}") private String trayCode; /** 巷道ID */ - @Excel(name = "巷道ID") + @Excel(name = "${search.ViewInJobFlow.roadwayId}") private String roadwayId; /** 货位ID */ - @Excel(name = "货位ID") + @Excel(name = "${search.ViewInJobFlow.cargoSpaceId}") private String cargoSpaceId; /** 货位名称 */ - @Excel(name = "货位名称") + @Excel(name = "${search.ViewInJobFlow.cargoSpaceName}") private String cargoSpaceName; /** 排 */ - @Excel(name = "排") + @Excel(name = "${search.ViewInJobFlow.thePlatoon}") private Long thePlatoon; /** 列 */ - @Excel(name = "列") + @Excel(name = "${search.ViewInJobFlow.theColumn}") private Long theColumn; /** 层 */ - @Excel(name = "层") + @Excel(name = "${search.ViewInJobFlow.theFloor}") private Long theFloor; /** 优先级 */ - @Excel(name = "优先级") + @Excel(name = "${search.ViewInJobFlow.priority}") private Long priority; /** 执行阶段 */ - @Excel(name = "执行阶段") + @Excel(name = "${search.ViewInJobFlow.executionPhase}") private String executionPhase; /** 作业类型 */ - @Excel(name = "作业类型") + @Excel(name = "${search.ViewInJobFlow.inOrOut}") private String inOrOut; /** 入口ID */ - @Excel(name = "入口ID") + @Excel(name = "${search.ViewInJobFlow.entranceId}") private String entranceId; /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewInJobFlow.productId}") private String productId; /** 批号 */ - @Excel(name = "批号") + @Excel(name = "${search.ViewInJobFlow.lotNo}") private String lotNo; /** 垛型ID */ - @Excel(name = "垛型ID") + @Excel(name = "${search.ViewInJobFlow.stackingId}") private String stackingId; /** 库存状态 */ - @Excel(name = "库存状态") + @Excel(name = "${search.ViewInJobFlow.stockStatus}") private String stockStatus; /** 入库数量 */ - @Excel(name = "入库数量") + @Excel(name = "${search.ViewInJobFlow.inQuantity}") private String inQuantity; /** 单据ID */ - @Excel(name = "单据ID") + @Excel(name = "${search.ViewInJobFlow.inOrOutId}") private String inOrOutId; /** 子单据ID */ - @Excel(name = "子单据ID") + @Excel(name = "${search.ViewInJobFlow.inOrOutDId}") private String inOrOutDId; /** 开始时间 */ - @Excel(name = "开始时间") + @Excel(name = "${search.ViewInJobFlow.startTime}") private String startTime; /** 结束时间 */ - @Excel(name = "结束时间") + @Excel(name = "${search.ViewInJobFlow.finishTime}") private String finishTime; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewInJobFlow.warehouseId}") private String warehouseId; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewInJobFlow.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewInJobFlow.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewInJobFlow.unit}") private String unit; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewInJobFlow.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewInJobFlow.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewInJobFlow.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewInJobFlow.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewInJobFlow.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewInJobFlow.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewInJobFlow.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewInJobFlow.remark}") private String remark; @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java index 1b7972b..644e753 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java @@ -16,155 +16,155 @@ public class ViewOutJobFlow extends BaseEntity private static final long serialVersionUID = 1L; /** 作业ID */ - @Excel(name = "作业ID") + @Excel(name = "${search.ViewOutJobFlow.jobId}") private String jobId; /** 子作业ID */ - @Excel(name = "子作业ID") + @Excel(name = "${search.ViewOutJobFlow.jobDetailId}") private String jobDetailId; /** 状态 */ - @Excel(name = "状态") + @Excel(name = "${search.ViewOutJobFlow.status}") private String status; /** 任务号 */ - @Excel(name = "任务号") + @Excel(name = "${search.ViewOutJobFlow.taskNo}") private String taskNo; /** 托盘码 */ - @Excel(name = "托盘码") + @Excel(name = "${search.ViewOutJobFlow.trayCode}") private String trayCode; /** 巷道ID */ - @Excel(name = "巷道ID") + @Excel(name = "${search.ViewOutJobFlow.roadwayId}") private String roadwayId; /** 货位ID */ - @Excel(name = "货位ID") + @Excel(name = "${search.ViewOutJobFlow.cargoSpaceId}") private String cargoSpaceId; /** 货位名称 */ - @Excel(name = "货位名称") + @Excel(name = "${search.ViewOutJobFlow.cargoSpaceName}") private String cargoSpaceName; /** 排 */ - @Excel(name = "排") + @Excel(name = "${search.ViewOutJobFlow.thePlatoon}") private Long thePlatoon; /** 列 */ - @Excel(name = "列") + @Excel(name = "${search.ViewOutJobFlow.theColumn}") private Long theColumn; /** 层 */ - @Excel(name = "层") + @Excel(name = "${search.ViewOutJobFlow.theFloor}") private Long theFloor; /** 优先级 */ - @Excel(name = "优先级") + @Excel(name = "${search.ViewOutJobFlow.priority}") private Long priority; /** 执行阶段 */ - @Excel(name = "执行阶段") + @Excel(name = "${search.ViewOutJobFlow.executionPhase}") private String executionPhase; /** 作业类型 */ - @Excel(name = "作业类型") + @Excel(name = "${search.ViewOutJobFlow.inOrOut}") private String inOrOut; /** 出口ID */ - @Excel(name = "出口ID") + @Excel(name = "${search.ViewOutJobFlow.exitId}") private String exitId; /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewOutJobFlow.productId}") private String productId; /** 批号 */ - @Excel(name = "批号") + @Excel(name = "${search.ViewOutJobFlow.lotNo}") private String lotNo; /** 剁型ID */ - @Excel(name = "剁型ID") + @Excel(name = "${search.ViewOutJobFlow.stackingId}") private String stackingId; /** 库存状态 */ - @Excel(name = "库存状态") + @Excel(name = "${search.ViewOutJobFlow.stockStatus}") private String stockStatus; /** 出库数量 */ - @Excel(name = "出库数量") + @Excel(name = "${search.ViewOutJobFlow.outQuantity}") private String outQuantity; /** 回流数量 */ - @Excel(name = "回流数量") + @Excel(name = "${search.ViewOutJobFlow.giveNum}") private String giveNum; /** 单据ID */ - @Excel(name = "单据ID") + @Excel(name = "${search.ViewOutJobFlow.inOrOutId}") private String inOrOutId; /** 子单据ID */ - @Excel(name = "子单据ID") + @Excel(name = "${search.ViewOutJobFlow.inOrOutDId}") private String inOrOutDId; /** 开始时间 */ - @Excel(name = "开始时间") + @Excel(name = "${search.ViewOutJobFlow.startTime}") private String startTime; /** 结束时间 */ - @Excel(name = "结束时间") + @Excel(name = "${search.ViewOutJobFlow.finishTime}") private String finishTime; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewOutJobFlow.warehouseId}") private String warehouseId; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewOutJobFlow.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewOutJobFlow.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewOutJobFlow.unit}") private String unit; /** 客户名称 */ - @Excel(name = "客户名称") + @Excel(name = "${search.ViewOutJobFlow.customerName}") private String customerName; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewOutJobFlow.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewOutJobFlow.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewOutJobFlow.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewOutJobFlow.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewOutJobFlow.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewOutJobFlow.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewOutJobFlow.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewOutJobFlow.remark}") private String remark; @Override diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java index d71831e..d385b4d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java @@ -16,116 +16,116 @@ public class ViewStockDetail extends BaseEntity private static final long serialVersionUID = 1L; /** id */ - @Excel(name = "id") + @Excel(name = "${search.ViewStockDetail.onlyIdentity}") private Long onlyIdentity; /** 库存ID */ - @Excel(name = "库存ID") + @Excel(name = "${search.ViewStockDetail.stockId}") private String stockId; /** 货位ID */ - @Excel(name = "货位ID") + @Excel(name = "${search.ViewStockDetail.cargoSpaceId}") private String cargoSpaceId; /** 托盘条码 */ - @Excel(name = "托盘条码") + @Excel(name = "${search.ViewStockDetail.trayCode}") private String trayCode; /** 数量 */ - @Excel(name = "数量") + @Excel(name = "${search.ViewStockDetail.quantity}") private String quantity; /** 作业ID */ - @Excel(name = "作业ID") + @Excel(name = "${search.ViewStockDetail.jobId}") private String jobId; /** 批号 */ - @Excel(name = "批号") + @Excel(name = "${search.ViewStockDetail.lotNo}") private String lotNo; /** 入库子单ID */ - @Excel(name = "入库子单ID") + @Excel(name = "${search.ViewStockDetail.stockinDetailId}") private String stockinDetailId; /** 入库时间 */ - @Excel(name = "入库时间") + @Excel(name = "${search.ViewStockDetail.inDate}") private String inDate; /** 仓库 */ - @Excel(name = "仓库") + @Excel(name = "${search.ViewStockDetail.warehouseId}") private String warehouseId; private String warehouseName; /** 剁型ID */ - @Excel(name = "剁型ID") + @Excel(name = "${search.ViewStockDetail.stackingId}") private String stackingId; /** 货位名称 */ - @Excel(name = "货位名称") + @Excel(name = "${search.ViewStockDetail.cargoSpaceName}") private String cargoSpaceName; /** 巷道ID */ - @Excel(name = "巷道ID") + @Excel(name = "${search.ViewStockDetail.roadwayId}") private String roadwayId; /** 货位状态 */ - @Excel(name = "货位状态") + @Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}") private String cargoSpaceStatus; /** 是否锁定 */ - @Excel(name = "是否锁定") + @Excel(name = "${search.ViewStockDetail.locked}") private String locked; /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewStockDetail.productId}") private String productId; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewStockDetail.productName}") private String productName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewStockDetail.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewStockDetail.unit}") private String unit; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewStockDetail.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewStockDetail.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewStockDetail.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewStockDetail.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewStockDetail.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewStockDetail.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewStockDetail.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewStockDetail.remark}") private String remark; - @Excel(name = "库存状态") + @Excel(name = "${search.ViewStockDetail.stockStatus}") private String stockStatus; - @Excel(name = "物料状态") + @Excel(name = "${search.ViewStockDetail.productStatus}") private String productStatus; public String getStockStatus() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java index faa427a..e9daebf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/controller/ViewStockSecureController.java @@ -24,8 +24,8 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 安全库存查询Controller * - * @author gw - * @date 2025-05-30 + * @author ruoyi + * @date 2025-08-06 */ @RestController @RequestMapping("/search/ViewStockSecure") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java index fc430b0..ceca90c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java @@ -7,556 +7,560 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 安全库存查询对象 view_stock_secure - * - * @author gw - * @date 2025-05-30 + * + * @author ruoyi + * @date 2025-08-06 */ public class ViewStockSecure extends BaseEntity { private static final long serialVersionUID = 1L; - /** 库存ID */ - @Excel(name = "库存ID") +// @Excel(name = "库存ID") + @Excel(name = "${search.ViewStockSecure.stockId}") private String stockId; /** 货位ID */ - @Excel(name = "货位ID") + @Excel(name = "${search.ViewStockSecure.cargoSpaceId}") private String cargoSpaceId; /** 库存状态 */ - @Excel(name = "库存状态") + @Excel(name = "${search.ViewStockSecure.stockStatus}") private String stockStatus; /** 物料状态 */ - @Excel(name = "物料状态") + @Excel(name = "${search.ViewStockSecure.productStatus}") private String productStatus; /** 批次号 */ - @Excel(name = "批次号") + @Excel(name = "${search.ViewStockSecure.lotNo}") private String lotNo; /** 入库时间 */ - @Excel(name = "入库时间") + @Excel(name = "${search.ViewStockSecure.inDate}") private String inDate; /** 回流时间 */ - @Excel(name = "回流时间") + @Excel(name = "${search.ViewStockSecure.backDate}") private String backDate; /** 物料GUID */ - @Excel(name = "物料GUID") + @Excel(name = "${search.ViewStockSecure.productGuid}") private String productGuid; /** 库存数量 */ - @Excel(name = "库存数量") + @Excel(name = "${search.ViewStockSecure.quantity}") private String quantity; /** 作业ID */ - @Excel(name = "作业ID") + @Excel(name = "${search.ViewStockSecure.jobId}") private String jobId; /** 托盘条码 */ - @Excel(name = "托盘条码") + @Excel(name = "${search.ViewStockSecure.trayCode}") private String trayCode; /** 出库数量 */ - @Excel(name = "出库数量") + @Excel(name = "${search.ViewStockSecure.outQuantity}") private String outQuantity; /** 入库子单ID */ - @Excel(name = "入库子单ID") + @Excel(name = "${search.ViewStockSecure.stockinDetailId}") private String stockinDetailId; /** 入库主单 */ - @Excel(name = "入库主单") + @Excel(name = "${search.ViewStockSecure.stockinId}") private String stockinId; /** 入库类型 */ - @Excel(name = "入库类型") + @Excel(name = "${search.ViewStockSecure.inType}") private String inType; /** 入库班组ID */ - @Excel(name = "入库班组ID") + @Excel(name = "${search.ViewStockSecure.inClassId}") private String inClassId; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewStockSecure.warehouseId}") private String warehouseId; /** 垛型ID */ - @Excel(name = "垛型ID") + @Excel(name = "${search.ViewStockSecure.stackingId}") private String stackingId; - /** 价格 */ - @Excel(name = "价格") - private String price; - - /** 英文名称 */ - @Excel(name = "英文名称") + /** 库存预警标识 */ + @Excel(name = "${search.ViewStockSecure.spare1}") private String spare1; - /** 单件净重 */ - @Excel(name = "单件净重") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare2; - /** 长MM */ - @Excel(name = "长MM") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare3; + + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare4; + + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare5; - /** 宽MM */ - @Excel(name = "宽MM") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare6; - /** 高MM */ - @Excel(name = "高MM") - private String spare7; - - /** 体积m³ */ - @Excel(name = "体积m³") - private String spare8; - - /** 备注 */ - @Excel(name = "备注") - private String remark; - /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewStockSecure.productId}") private String productId; /** 仓库名称 */ - @Excel(name = "仓库名称") + @Excel(name = "${search.ViewStockSecure.warehouseName}") private String warehouseName; /** 仓库地址 */ - @Excel(name = "仓库地址") + @Excel(name = "${search.ViewStockSecure.address}") private String address; /** 仓库描述 */ - @Excel(name = "仓库描述") + @Excel(name = "${search.ViewStockSecure.cDesc}") private String cDesc; /** 仓库级别 */ - @Excel(name = "仓库级别") + @Excel(name = "${search.ViewStockSecure.warehouseKind}") private String warehouseKind; /** 仓库类型 */ - @Excel(name = "仓库类型") + @Excel(name = "${search.ViewStockSecure.warehouseType}") private String warehouseType; /** 是否可用 */ - @Excel(name = "是否可用") + @Excel(name = "${search.ViewStockSecure.isCurrent}") private String isCurrent; - /** 物料名称 */ - @Excel(name = "物料名称") - private String productName; - - /** 规格 */ - @Excel(name = "规格") - private String spec; + /** 价格 */ + @Excel(name = "${search.ViewStockSecure.price}") + private String price; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewStockSecure.unit}") private String unit; + /** 规格 */ + @Excel(name = "${search.ViewStockSecure.spec}") + private String spec; + + /** 英文名称 */ + @Excel(name = "${search.ViewStockSecure.enName}") + private String enName; + + /** 单件净重 */ + @Excel(name = "${search.ViewStockSecure.weight}") + private String weight; + + /** 长MM */ + @Excel(name = "${search.ViewStockSecure.longMM}") + private String longMM; + + /** 宽MM */ + @Excel(name = "${search.ViewStockSecure.wide}") + private String wide; + + /** 高MM */ + @Excel(name = "${search.ViewStockSecure.hight}") + private String hight; + + /** 体积m³ */ + @Excel(name = "${search.ViewStockSecure.volume}") + private String volume; + + /** 物料名称 */ + @Excel(name = "${search.ViewStockSecure.productName}") + private String productName; + /** 货位名称 */ - @Excel(name = "货位名称") + @Excel(name = "${search.ViewStockSecure.cargoSpaceName}") private String cargoSpaceName; /** 巷道ID */ - @Excel(name = "巷道ID") + @Excel(name = "${search.ViewStockSecure.roadwayId}") private String roadwayId; /** 货区ID */ - @Excel(name = "货区ID") + @Excel(name = "${search.ViewStockSecure.cargoAreaId}") private String cargoAreaId; /** 货位类型 */ - @Excel(name = "货位类型") + @Excel(name = "${search.ViewStockSecure.theType}") private String theType; /** 货位类型名称 */ - @Excel(name = "货位类型名称") + @Excel(name = "${search.ViewStockSecure.theTypeName}") private String theTypeName; /** 排 */ - @Excel(name = "排") + @Excel(name = "${search.ViewStockSecure.thePlatoon}") private Long thePlatoon; /** 列 */ - @Excel(name = "列") + @Excel(name = "${search.ViewStockSecure.theColumn}") private Long theColumn; /** 层 */ - @Excel(name = "层") + @Excel(name = "${search.ViewStockSecure.theFloor}") private Long theFloor; /** 货位状态 */ - @Excel(name = "货位状态") + @Excel(name = "${search.ViewStockSecure.cargoStatus}") private String cargoStatus; /** 是否锁定 */ - @Excel(name = "是否锁定") + @Excel(name = "${search.ViewStockSecure.locked}") private String locked; /** 货位高度 */ - @Excel(name = "货位高度") + @Excel(name = "${search.ViewStockSecure.cargoHight}") private String cargoHight; /** 是否双伸 */ - @Excel(name = "是否双伸") + @Excel(name = "${search.ViewStockSecure.issDouble}") private String issDouble; /** 双货位分组编码 */ - @Excel(name = "双货位分组编码") + @Excel(name = "${search.ViewStockSecure.groupCodingNo}") private String groupCodingNo; /** 双货位分组编码 */ - @Excel(name = "双货位分组编码") + @Excel(name = "${search.ViewStockSecure.groupCoding}") private String groupCoding; /** 双货位标识 */ - @Excel(name = "双货位标识") + @Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}") private String cargoSpaceLogo; /** 本仓库区域 */ - @Excel(name = "本仓库区域") + @Excel(name = "${search.ViewStockSecure.thisCargoArea}") private String thisCargoArea; - public String getSpare7() { - return spare7; - } - - public void setSpare7(String spare7) { - this.spare7 = spare7; - } - - public String getSpare8() { - return spare8; - } - - public void setSpare8(String spare8) { - this.spare8 = spare8; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - public void setStockId(String stockId) { this.stockId = stockId; } - public String getStockId() + public String getStockId() { return stockId; } - public void setCargoSpaceId(String cargoSpaceId) + public void setCargoSpaceId(String cargoSpaceId) { this.cargoSpaceId = cargoSpaceId; } - public String getCargoSpaceId() + public String getCargoSpaceId() { return cargoSpaceId; } - public void setStockStatus(String stockStatus) + public void setStockStatus(String stockStatus) { this.stockStatus = stockStatus; } - public String getStockStatus() + public String getStockStatus() { return stockStatus; } - public void setProductStatus(String productStatus) + public void setProductStatus(String productStatus) { this.productStatus = productStatus; } - public String getProductStatus() + public String getProductStatus() { return productStatus; } - public void setLotNo(String lotNo) + public void setLotNo(String lotNo) { this.lotNo = lotNo; } - public String getLotNo() + public String getLotNo() { return lotNo; } - public void setInDate(String inDate) + public void setInDate(String inDate) { this.inDate = inDate; } - public String getInDate() + public String getInDate() { return inDate; } - public void setBackDate(String backDate) + public void setBackDate(String backDate) { this.backDate = backDate; } - public String getBackDate() + public String getBackDate() { return backDate; } - public void setProductGuid(String productGuid) + public void setProductGuid(String productGuid) { this.productGuid = productGuid; } - public String getProductGuid() + public String getProductGuid() { return productGuid; } - public void setQuantity(String quantity) + public void setQuantity(String quantity) { this.quantity = quantity; } - public String getQuantity() + public String getQuantity() { return quantity; } - public void setJobId(String jobId) + public void setJobId(String jobId) { this.jobId = jobId; } - public String getJobId() + public String getJobId() { return jobId; } - public void setTrayCode(String trayCode) + public void setTrayCode(String trayCode) { this.trayCode = trayCode; } - public String getTrayCode() + public String getTrayCode() { return trayCode; } - public void setOutQuantity(String outQuantity) + public void setOutQuantity(String outQuantity) { this.outQuantity = outQuantity; } - public String getOutQuantity() + public String getOutQuantity() { return outQuantity; } - public void setStockinDetailId(String stockinDetailId) + public void setStockinDetailId(String stockinDetailId) { this.stockinDetailId = stockinDetailId; } - public String getStockinDetailId() + public String getStockinDetailId() { return stockinDetailId; } - public void setStockinId(String stockinId) + public void setStockinId(String stockinId) { this.stockinId = stockinId; } - public String getStockinId() + public String getStockinId() { return stockinId; } - public void setInType(String inType) + public void setInType(String inType) { this.inType = inType; } - public String getInType() + public String getInType() { return inType; } - public void setInClassId(String inClassId) + public void setInClassId(String inClassId) { this.inClassId = inClassId; } - public String getInClassId() + public String getInClassId() { return inClassId; } - public void setWarehouseId(String warehouseId) + public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setStackingId(String stackingId) + public void setStackingId(String stackingId) { this.stackingId = stackingId; } - public String getStackingId() + public String getStackingId() { return stackingId; } - public void setSpare1(String spare1) + public void setSpare1(String spare1) { this.spare1 = spare1; } - public String getSpare1() + public String getSpare1() { return spare1; } - public void setSpare2(String spare2) + public void setSpare2(String spare2) { this.spare2 = spare2; } - public String getSpare2() + public String getSpare2() { return spare2; } - public void setSpare5(String spare5) + 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; } - public String getSpare5() + public String getSpare5() { return spare5; } - public void setSpare6(String spare6) + public void setSpare6(String spare6) { this.spare6 = spare6; } - public String getSpare6() + public String getSpare6() { return spare6; } - public void setProductId(String productId) + public void setProductId(String productId) { this.productId = productId; } - public String getProductId() + public String getProductId() { return productId; } - public void setWarehouseName(String warehouseName) + public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } - public String getWarehouseName() + public String getWarehouseName() { return warehouseName; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setcDesc(String cDesc) + public void setcDesc(String cDesc) { this.cDesc = cDesc; } - public String getcDesc() + public String getcDesc() { return cDesc; } - public void setWarehouseKind(String warehouseKind) + public void setWarehouseKind(String warehouseKind) { this.warehouseKind = warehouseKind; } - public String getWarehouseKind() + public String getWarehouseKind() { return warehouseKind; } - public void setWarehouseType(String warehouseType) + public void setWarehouseType(String warehouseType) { this.warehouseType = warehouseType; } - public String getWarehouseType() + public String getWarehouseType() { return warehouseType; } - public void setIsCurrent(String isCurrent) + public void setIsCurrent(String isCurrent) { this.isCurrent = isCurrent; } - public String getIsCurrent() + public String getIsCurrent() { 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; - } - - public void setSpec(String spec) - { - this.spec = spec; - } - - public String getSpec() - { - return spec; + return price; } public void setUnit(String unit) @@ -564,236 +568,311 @@ public class ViewStockSecure extends BaseEntity this.unit = unit; } - public String getUnit() + public String getUnit() { return unit; } - public void setPrice(String price) + public void setSpec(String spec) { - this.price = price; + this.spec = spec; } - public String getPrice() + public String getSpec() { - return price; + return spec; } - public void setCargoSpaceName(String cargoSpaceName) + public void setEnName(String enName) + { + this.enName = enName; + } + + public String getEnName() + { + return enName; + } + + public void setWeight(String weight) + { + this.weight = weight; + } + + public String getWeight() + { + 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) { this.cargoSpaceName = cargoSpaceName; } - public String getCargoSpaceName() + public String getCargoSpaceName() { return cargoSpaceName; } - public void setRoadwayId(String roadwayId) + public void setRoadwayId(String roadwayId) { this.roadwayId = roadwayId; } - public String getRoadwayId() + public String getRoadwayId() { return roadwayId; } - public void setCargoAreaId(String cargoAreaId) + public void setCargoAreaId(String cargoAreaId) { this.cargoAreaId = cargoAreaId; } - public String getCargoAreaId() + public String getCargoAreaId() { return cargoAreaId; } - public void setTheType(String theType) + public void setTheType(String theType) { this.theType = theType; } - public String getTheType() + public String getTheType() { return theType; } - public void setTheTypeName(String theTypeName) + public void setTheTypeName(String theTypeName) { this.theTypeName = theTypeName; } - public String getTheTypeName() + public String getTheTypeName() { return theTypeName; } - public void setThePlatoon(Long thePlatoon) + public void setThePlatoon(Long thePlatoon) { this.thePlatoon = thePlatoon; } - public Long getThePlatoon() + public Long getThePlatoon() { return thePlatoon; } - public void setTheColumn(Long theColumn) + public void setTheColumn(Long theColumn) { this.theColumn = theColumn; } - public Long getTheColumn() + public Long getTheColumn() { return theColumn; } - public void setTheFloor(Long theFloor) + public void setTheFloor(Long theFloor) { this.theFloor = theFloor; } - public Long getTheFloor() + public Long getTheFloor() { return theFloor; } - public void setCargoStatus(String cargoStatus) + public void setCargoStatus(String cargoStatus) { this.cargoStatus = cargoStatus; } - public String getCargoStatus() + public String getCargoStatus() { return cargoStatus; } - public void setLocked(String locked) + public void setLocked(String locked) { this.locked = locked; } - public String getLocked() + public String getLocked() { return locked; } - public void setCargoHight(String cargoHight) + public void setCargoHight(String cargoHight) { this.cargoHight = cargoHight; } - public String getCargoHight() + public String getCargoHight() { return cargoHight; } - public void setIssDouble(String issDouble) + public void setIssDouble(String issDouble) { this.issDouble = issDouble; } - public String getIssDouble() + public String getIssDouble() { return issDouble; } - public void setGroupCodingNo(String groupCodingNo) + public void setGroupCodingNo(String groupCodingNo) { this.groupCodingNo = groupCodingNo; } - public String getGroupCodingNo() + public String getGroupCodingNo() { return groupCodingNo; } - public void setGroupCoding(String groupCoding) + public void setGroupCoding(String groupCoding) { this.groupCoding = groupCoding; } - public String getGroupCoding() + public String getGroupCoding() { return groupCoding; } - public void setCargoSpaceLogo(String cargoSpaceLogo) + public void setCargoSpaceLogo(String cargoSpaceLogo) { this.cargoSpaceLogo = cargoSpaceLogo; } - public String getCargoSpaceLogo() + public String getCargoSpaceLogo() { return cargoSpaceLogo; } - public void setThisCargoArea(String thisCargoArea) + public void setThisCargoArea(String thisCargoArea) { this.thisCargoArea = thisCargoArea; } - public String getThisCargoArea() + public String getThisCargoArea() { return thisCargoArea; } @Override public String toString() { - return "ViewStockSecure{" + - "stockId='" + stockId + '\'' + - ", cargoSpaceId='" + cargoSpaceId + '\'' + - ", stockStatus='" + stockStatus + '\'' + - ", productStatus='" + productStatus + '\'' + - ", lotNo='" + lotNo + '\'' + - ", inDate='" + inDate + '\'' + - ", backDate='" + backDate + '\'' + - ", productGuid='" + productGuid + '\'' + - ", quantity='" + quantity + '\'' + - ", jobId='" + jobId + '\'' + - ", trayCode='" + trayCode + '\'' + - ", outQuantity='" + outQuantity + '\'' + - ", stockinDetailId='" + stockinDetailId + '\'' + - ", stockinId='" + stockinId + '\'' + - ", inType='" + inType + '\'' + - ", inClassId='" + inClassId + '\'' + - ", warehouseId='" + warehouseId + '\'' + - ", stackingId='" + stackingId + '\'' + - ", price='" + price + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", spare7='" + spare7 + '\'' + - ", spare8='" + spare8 + '\'' + - ", remark='" + remark + '\'' + - ", productId='" + productId + '\'' + - ", warehouseName='" + warehouseName + '\'' + - ", address='" + address + '\'' + - ", cDesc='" + cDesc + '\'' + - ", warehouseKind='" + warehouseKind + '\'' + - ", warehouseType='" + warehouseType + '\'' + - ", isCurrent='" + isCurrent + '\'' + - ", productName='" + productName + '\'' + - ", spec='" + spec + '\'' + - ", unit='" + unit + '\'' + - ", cargoSpaceName='" + cargoSpaceName + '\'' + - ", roadwayId='" + roadwayId + '\'' + - ", cargoAreaId='" + cargoAreaId + '\'' + - ", theType='" + theType + '\'' + - ", theTypeName='" + theTypeName + '\'' + - ", thePlatoon=" + thePlatoon + - ", theColumn=" + theColumn + - ", theFloor=" + theFloor + - ", cargoStatus='" + cargoStatus + '\'' + - ", locked='" + locked + '\'' + - ", cargoHight='" + cargoHight + '\'' + - ", issDouble='" + issDouble + '\'' + - ", groupCodingNo='" + groupCodingNo + '\'' + - ", groupCoding='" + groupCoding + '\'' + - ", cargoSpaceLogo='" + cargoSpaceLogo + '\'' + - ", thisCargoArea='" + thisCargoArea + '\'' + - '}'; + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockId", getStockId()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("stockStatus", getStockStatus()) + .append("productStatus", getProductStatus()) + .append("lotNo", getLotNo()) + .append("inDate", getInDate()) + .append("backDate", getBackDate()) + .append("productGuid", getProductGuid()) + .append("quantity", getQuantity()) + .append("jobId", getJobId()) + .append("trayCode", getTrayCode()) + .append("outQuantity", getOutQuantity()) + .append("stockinDetailId", getStockinDetailId()) + .append("stockinId", getStockinId()) + .append("inType", getInType()) + .append("inClassId", getInClassId()) + .append("warehouseId", getWarehouseId()) + .append("stackingId", getStackingId()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .append("productId", getProductId()) + .append("warehouseName", getWarehouseName()) + .append("address", getAddress()) + .append("cDesc", getcDesc()) + .append("warehouseKind", getWarehouseKind()) + .append("warehouseType", getWarehouseType()) + .append("isCurrent", getIsCurrent()) + .append("price", getPrice()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("enName", getEnName()) + .append("weight", getWeight()) + .append("longMM", getLongMM()) + .append("wide", getWide()) + .append("hight", getHight()) + .append("volume", getVolume()) + .append("productName", getProductName()) + .append("cargoSpaceName", getCargoSpaceName()) + .append("roadwayId", getRoadwayId()) + .append("cargoAreaId", getCargoAreaId()) + .append("theType", getTheType()) + .append("theTypeName", getTheTypeName()) + .append("thePlatoon", getThePlatoon()) + .append("theColumn", getTheColumn()) + .append("theFloor", getTheFloor()) + .append("cargoStatus", getCargoStatus()) + .append("locked", getLocked()) + .append("cargoHight", getCargoHight()) + .append("issDouble", getIssDouble()) + .append("groupCodingNo", getGroupCodingNo()) + .append("groupCoding", getGroupCoding()) + .append("cargoSpaceLogo", getCargoSpaceLogo()) + .append("thisCargoArea", getThisCargoArea()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java index 93a76da..12237c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/mapper/ViewStockSecureMapper.java @@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure; /** * 安全库存查询Mapper接口 * - * @author gw - * @date 2025-05-30 + * @author ruoyi + * @date 2025-08-06 */ public interface ViewStockSecureMapper { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java index c6977b1..e4d3462 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/IViewStockSecureService.java @@ -6,8 +6,8 @@ import com.ruoyi.search.ViewStockSecure.domain.ViewStockSecure; /** * 安全库存查询Service接口 * - * @author gw - * @date 2025-05-30 + * @author ruoyi + * @date 2025-08-06 */ public interface IViewStockSecureService { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java index 85f2d63..fdf4cd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/service/impl/ViewStockSecureServiceImpl.java @@ -1,8 +1,6 @@ package com.ruoyi.search.ViewStockSecure.service.impl; import java.util.List; - -import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockSecure.mapper.ViewStockSecureMapper; @@ -11,19 +9,19 @@ import com.ruoyi.search.ViewStockSecure.service.IViewStockSecureService; /** * 安全库存查询Service业务层处理 - * - * @author gw - * @date 2025-05-30 + * + * @author ruoyi + * @date 2025-08-06 */ @Service -public class ViewStockSecureServiceImpl implements IViewStockSecureService +public class ViewStockSecureServiceImpl implements IViewStockSecureService { @Autowired private ViewStockSecureMapper viewStockSecureMapper; /** * 查询安全库存查询 - * + * * @param stockId 安全库存查询主键 * @return 安全库存查询 */ @@ -35,12 +33,11 @@ public class ViewStockSecureServiceImpl implements IViewStockSecureService /** * 查询安全库存查询列表 - * + * * @param viewStockSecure 安全库存查询 * @return 安全库存查询 */ @Override - @DataScope(warehouseAlias = "vss") public List 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 结果 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java index d137925..b743246 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/controller/ViewStockWarningController.java @@ -22,10 +22,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 预警库存查询Controller + * 库存预警报表Controller * * @author ruoyi - * @date 2025-05-30 + * @date 2025-08-06 */ @RestController @RequestMapping("/search/ViewStockWarning") @@ -35,7 +35,7 @@ public class ViewStockWarningController extends BaseController private IViewStockWarningService viewStockWarningService; /** - * 查询预警库存查询列表 + * 查询库存预警报表列表 */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:list')") @GetMapping("/list") @@ -47,20 +47,20 @@ public class ViewStockWarningController extends BaseController } /** - * 导出预警库存查询列表 + * 导出库存预警报表列表 */ @PreAuthorize("@ss.hasPermi('search:ViewStockWarning:export')") - @Log(title = "预警库存查询", businessType = BusinessType.EXPORT) + @Log(title = "库存预警报表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ViewStockWarning viewStockWarning) { List list = viewStockWarningService.selectViewStockWarningList(viewStockWarning); ExcelUtil util = new ExcelUtil(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) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java index f851b2a..3152ad3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java @@ -6,250 +6,245 @@ import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; /** - * 预警库存查询对象 view_stock_warning + * 库存预警报表对象 view_stock_warning * * @author ruoyi - * @date 2025-05-30 + * @date 2025-08-06 */ public class ViewStockWarning extends BaseEntity { private static final long serialVersionUID = 1L; /** 库存ID */ - @Excel(name = "库存ID") +// @Excel(name = "库存ID") + @Excel(name = "${search.ViewStockWarning.stockId}") private String stockId; /** 货位ID */ - @Excel(name = "货位ID") + @Excel(name = "${search.ViewStockWarning.cargoSpaceId}") private String cargoSpaceId; /** 库存状态 */ - @Excel(name = "库存状态") + @Excel(name = "${search.ViewStockWarning.stockStatus}") private String stockStatus; /** 物料状态 */ - @Excel(name = "物料状态") + @Excel(name = "${search.ViewStockWarning.productStatus}") private String productStatus; /** 批次号 */ - @Excel(name = "批次号") + @Excel(name = "${search.ViewStockWarning.lotNo}") private String lotNo; /** 入库时间 */ - @Excel(name = "入库时间") + @Excel(name = "${search.ViewStockWarning.inDate}") private String inDate; /** 回流时间 */ - @Excel(name = "回流时间") + @Excel(name = "${search.ViewStockWarning.backDate}") private String backDate; /** 物料GUID */ - @Excel(name = "物料GUID") + @Excel(name = "${search.ViewStockWarning.productGuid}") private String productGuid; /** 库存数量 */ - @Excel(name = "库存数量") + @Excel(name = "${search.ViewStockWarning.quantity}") private String quantity; /** 作业ID */ - @Excel(name = "作业ID") + @Excel(name = "${search.ViewStockWarning.jobId}") private String jobId; /** 托盘条码 */ - @Excel(name = "托盘条码") + @Excel(name = "${search.ViewStockWarning.trayCode}") private String trayCode; /** 出库数量 */ - @Excel(name = "出库数量") + @Excel(name = "${search.ViewStockWarning.outQuantity}") private String outQuantity; /** 入库子单ID */ - @Excel(name = "入库子单ID") + @Excel(name = "${search.ViewStockWarning.stockinDetailId}") private String stockinDetailId; /** 入库主单 */ - @Excel(name = "入库主单") + @Excel(name = "${search.ViewStockWarning.stockinId}") private String stockinId; /** 入库类型 */ - @Excel(name = "入库类型") + @Excel(name = "${search.ViewStockWarning.inType}") private String inType; /** 入库班组ID */ - @Excel(name = "入库班组ID") + @Excel(name = "${search.ViewStockWarning.inClassId}") private String inClassId; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewStockWarning.warehouseId}") private String warehouseId; /** 垛型ID */ - @Excel(name = "垛型ID") + @Excel(name = "${search.ViewStockWarning.stackingId}") private String stackingId; - /** 价格 */ - @Excel(name = "价格") - private String price; - - /** 英文名称 */ - @Excel(name = "英文名称") + /** 库存预警标识 */ + @Excel(name = "${search.ViewStockWarning.spare1}") private String spare1; - /** 单件净重 */ - @Excel(name = "单件净重") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare2; - /** 长MM */ - @Excel(name = "长MM") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare3; + + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String spare4; + + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare5; - /** 宽MM */ - @Excel(name = "宽MM") + /** $column.columnComment */ +// @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") private String spare6; - /** 高MM */ - @Excel(name = "高MM") - private String spare7; - - /** 体积m³ */ - @Excel(name = "体积m³") - private String spare8; - - /** 备注 */ - @Excel(name = "备注") - private String remark; - /** 物料ID */ - @Excel(name = "物料ID") + @Excel(name = "${search.ViewStockWarning.productId}") private String productId; /** 仓库名称 */ - @Excel(name = "仓库名称") + @Excel(name = "${search.ViewStockWarning.warehouseName}") private String warehouseName; /** 仓库地址 */ - @Excel(name = "仓库地址") + @Excel(name = "${search.ViewStockWarning.address}") private String address; /** 仓库描述 */ - @Excel(name = "仓库描述") + @Excel(name = "${search.ViewStockWarning.cDesc}") private String cDesc; /** 仓库级别 */ - @Excel(name = "仓库级别") + @Excel(name = "${search.ViewStockWarning.warehouseKind}") private String warehouseKind; /** 仓库类型 */ - @Excel(name = "仓库类型") + @Excel(name = "${search.ViewStockWarning.warehouseType}") private String warehouseType; /** 是否可用 */ - @Excel(name = "是否可用") + @Excel(name = "${search.ViewStockWarning.isCurrent}") private String isCurrent; - /** 物料名称 */ - @Excel(name = "物料名称") - private String productName; - - /** 规格 */ - @Excel(name = "规格") - private String spec; + /** 价格 */ + @Excel(name = "${search.ViewStockWarning.price}") + private String price; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewStockWarning.unit}") private String unit; + /** 规格 */ + @Excel(name = "${search.ViewStockWarning.spec}") + private String spec; + + /** 英文名称 */ + @Excel(name = "${search.ViewStockWarning.enName}") + private String enName; + + /** 单件净重 */ + @Excel(name = "${search.ViewStockWarning.weight}") + private String weight; + + /** 长MM */ + @Excel(name = "${search.ViewStockWarning.longMM}") + private String longMM; + + /** 宽MM */ + @Excel(name = "${search.ViewStockWarning.wide}") + private String wide; + + /** 高MM */ + @Excel(name = "${search.ViewStockWarning.hight}") + private String hight; + + /** 体积m³ */ + @Excel(name = "${search.ViewStockWarning.volume}") + private String volume; + + /** 物料名称 */ + @Excel(name = "${search.ViewStockWarning.productName}") + private String productName; + /** 货位名称 */ - @Excel(name = "货位名称") + @Excel(name = "${search.ViewStockWarning.cargoSpaceName}") private String cargoSpaceName; /** 巷道ID */ - @Excel(name = "巷道ID") + @Excel(name = "${search.ViewStockWarning.roadwayId}") private String roadwayId; /** 货区ID */ - @Excel(name = "货区ID") + @Excel(name = "${search.ViewStockWarning.cargoAreaId}") private String cargoAreaId; /** 货位类型 */ - @Excel(name = "货位类型") + @Excel(name = "${search.ViewStockWarning.theType}") private String theType; - /** the_type_name： */ - @Excel(name = "the_type_name：") + /** 货位类型名称 */ + @Excel(name = "${search.ViewStockWarning.theTypeName}") private String theTypeName; /** 排 */ - @Excel(name = "排") + @Excel(name = "${search.ViewStockWarning.thePlatoon}") private Long thePlatoon; /** 列 */ - @Excel(name = "列") + @Excel(name = "${search.ViewStockWarning.theColumn}") private Long theColumn; /** 层 */ - @Excel(name = "层") + @Excel(name = "${search.ViewStockWarning.theFloor}") private Long theFloor; /** 货位状态 */ - @Excel(name = "货位状态") + @Excel(name = "${search.ViewStockWarning.cargoStatus}") private String cargoStatus; /** 是否锁定 */ - @Excel(name = "是否锁定") + @Excel(name = "${search.ViewStockWarning.locked}") private String locked; /** 货位高度 */ - @Excel(name = "货位高度") + @Excel(name = "${search.ViewStockWarning.cargoHight}") private String cargoHight; /** 是否双伸 */ - @Excel(name = "是否双伸") + @Excel(name = "${search.ViewStockWarning.issDouble}") private String issDouble; /** 双货位分组编码 */ - @Excel(name = "双货位分组编码") + @Excel(name = "${search.ViewStockWarning.groupCodingNo}") private String groupCodingNo; /** 双货位分组编码 */ - @Excel(name = "双货位分组编码") + @Excel(name = "${search.ViewStockWarning.groupCoding}") private String groupCoding; /** 双货位标识 */ - @Excel(name = "双货位标识") + @Excel(name = "${search.ViewStockWarning.cargoSpaceLogo}") private String cargoSpaceLogo; /** 本仓库区域 */ - @Excel(name = "本仓库区域") + @Excel(name = "${search.ViewStockWarning.thisCargoArea}") private String thisCargoArea; - public String getSpare7() { - return spare7; - } - - public void setSpare7(String spare7) { - this.spare7 = spare7; - } - - public String getSpare8() { - return spare8; - } - - public void setSpare8(String spare8) { - this.spare8 = spare8; - } - - @Override - public String getRemark() { - return remark; - } - - @Override - public void setRemark(String remark) { - this.remark = remark; - } - - public void setStockId(String stockId) + public void setStockId(String stockId) { this.stockId = stockId; } @@ -449,6 +444,26 @@ public class ViewStockWarning extends BaseEntity return spare2; } + public void setSpare3(String spare3) + { + this.spare3 = spare3; + } + + public String getSpare3() + { + return spare3; + } + + public void setSpare4(String spare4) + { + this.spare4 = spare4; + } + + public String getSpare4() + { + return spare4; + } + public void setSpare5(String spare5) { this.spare5 = spare5; @@ -539,14 +554,24 @@ public class ViewStockWarning extends BaseEntity return isCurrent; } - public void setProductName(String productName) + public void setPrice(String price) { - this.productName = productName; + this.price = price; } - public String getProductName() + public String getPrice() { - return productName; + return price; + } + + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; } public void setSpec(String spec) @@ -559,24 +584,74 @@ public class ViewStockWarning extends BaseEntity return spec; } - public void setUnit(String unit) + public void setEnName(String enName) { - this.unit = unit; + this.enName = enName; } - public String getUnit() + public String getEnName() { - return unit; + return enName; } - public void setPrice(String price) + public void setWeight(String weight) { - this.price = price; + this.weight = weight; } - public String getPrice() + public String getWeight() { - return price; + return weight; + } + + public void setLongMM(String longMM) + { + this.longMM = longMM; + } + + public String getLongMM() + { + return longMM; + } + + public void setWide(String wide) + { + this.wide = wide; + } + + public String getWide() + { + return wide; + } + + public void setHight(String hight) + { + this.hight = hight; + } + + public String getHight() + { + return hight; + } + + public void setVolume(String volume) + { + this.volume = volume; + } + + public String getVolume() + { + return volume; + } + + public void setProductName(String productName) + { + this.productName = productName; + } + + public String getProductName() + { + return productName; } public void setCargoSpaceName(String cargoSpaceName) @@ -741,59 +816,64 @@ public class ViewStockWarning extends BaseEntity @Override public String toString() { - return "ViewStockWarning{" + - "stockId='" + stockId + '\'' + - ", cargoSpaceId='" + cargoSpaceId + '\'' + - ", stockStatus='" + stockStatus + '\'' + - ", productStatus='" + productStatus + '\'' + - ", lotNo='" + lotNo + '\'' + - ", inDate='" + inDate + '\'' + - ", backDate='" + backDate + '\'' + - ", productGuid='" + productGuid + '\'' + - ", quantity='" + quantity + '\'' + - ", jobId='" + jobId + '\'' + - ", trayCode='" + trayCode + '\'' + - ", outQuantity='" + outQuantity + '\'' + - ", stockinDetailId='" + stockinDetailId + '\'' + - ", stockinId='" + stockinId + '\'' + - ", inType='" + inType + '\'' + - ", inClassId='" + inClassId + '\'' + - ", warehouseId='" + warehouseId + '\'' + - ", stackingId='" + stackingId + '\'' + - ", price='" + price + '\'' + - ", spare1='" + spare1 + '\'' + - ", spare2='" + spare2 + '\'' + - ", spare5='" + spare5 + '\'' + - ", spare6='" + spare6 + '\'' + - ", spare7='" + spare7 + '\'' + - ", spare8='" + spare8 + '\'' + - ", remark='" + remark + '\'' + - ", productId='" + productId + '\'' + - ", warehouseName='" + warehouseName + '\'' + - ", address='" + address + '\'' + - ", cDesc='" + cDesc + '\'' + - ", warehouseKind='" + warehouseKind + '\'' + - ", warehouseType='" + warehouseType + '\'' + - ", isCurrent='" + isCurrent + '\'' + - ", productName='" + productName + '\'' + - ", spec='" + spec + '\'' + - ", unit='" + unit + '\'' + - ", cargoSpaceName='" + cargoSpaceName + '\'' + - ", roadwayId='" + roadwayId + '\'' + - ", cargoAreaId='" + cargoAreaId + '\'' + - ", theType='" + theType + '\'' + - ", theTypeName='" + theTypeName + '\'' + - ", thePlatoon=" + thePlatoon + - ", theColumn=" + theColumn + - ", theFloor=" + theFloor + - ", cargoStatus='" + cargoStatus + '\'' + - ", locked='" + locked + '\'' + - ", cargoHight='" + cargoHight + '\'' + - ", issDouble='" + issDouble + '\'' + - ", groupCodingNo='" + groupCodingNo + '\'' + - ", groupCoding='" + groupCoding + '\'' + - ", cargoSpaceLogo='" + cargoSpaceLogo + '\'' + - ", thisCargoArea='" + thisCargoArea + '\'' + - '}'; + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("stockId", getStockId()) + .append("cargoSpaceId", getCargoSpaceId()) + .append("stockStatus", getStockStatus()) + .append("productStatus", getProductStatus()) + .append("lotNo", getLotNo()) + .append("inDate", getInDate()) + .append("backDate", getBackDate()) + .append("productGuid", getProductGuid()) + .append("quantity", getQuantity()) + .append("jobId", getJobId()) + .append("trayCode", getTrayCode()) + .append("outQuantity", getOutQuantity()) + .append("stockinDetailId", getStockinDetailId()) + .append("stockinId", getStockinId()) + .append("inType", getInType()) + .append("inClassId", getInClassId()) + .append("warehouseId", getWarehouseId()) + .append("stackingId", getStackingId()) + .append("spare1", getSpare1()) + .append("spare2", getSpare2()) + .append("spare3", getSpare3()) + .append("spare4", getSpare4()) + .append("spare5", getSpare5()) + .append("spare6", getSpare6()) + .append("productId", getProductId()) + .append("warehouseName", getWarehouseName()) + .append("address", getAddress()) + .append("cDesc", getcDesc()) + .append("warehouseKind", getWarehouseKind()) + .append("warehouseType", getWarehouseType()) + .append("isCurrent", getIsCurrent()) + .append("price", getPrice()) + .append("unit", getUnit()) + .append("spec", getSpec()) + .append("enName", getEnName()) + .append("weight", getWeight()) + .append("longMM", getLongMM()) + .append("wide", getWide()) + .append("hight", getHight()) + .append("volume", getVolume()) + .append("productName", getProductName()) + .append("cargoSpaceName", getCargoSpaceName()) + .append("roadwayId", getRoadwayId()) + .append("cargoAreaId", getCargoAreaId()) + .append("theType", getTheType()) + .append("theTypeName", getTheTypeName()) + .append("thePlatoon", getThePlatoon()) + .append("theColumn", getTheColumn()) + .append("theFloor", getTheFloor()) + .append("cargoStatus", getCargoStatus()) + .append("locked", getLocked()) + .append("cargoHight", getCargoHight()) + .append("issDouble", getIssDouble()) + .append("groupCodingNo", getGroupCodingNo()) + .append("groupCoding", getGroupCoding()) + .append("cargoSpaceLogo", getCargoSpaceLogo()) + .append("thisCargoArea", getThisCargoArea()) + .toString(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java index 3f1bddf..3bbba6f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/mapper/ViewStockWarningMapper.java @@ -4,55 +4,55 @@ import java.util.List; import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; /** - * 预警库存查询Mapper接口 + * 库存预警报表Mapper接口 * * @author ruoyi - * @date 2025-05-30 + * @date 2025-08-06 */ public interface ViewStockWarningMapper { /** - * 查询预警库存查询 + * 查询库存预警报表 * - * @param stockId 预警库存查询主键 - * @return 预警库存查询 + * @param stockId 库存预警报表主键 + * @return 库存预警报表 */ public ViewStockWarning selectViewStockWarningByStockId(String stockId); /** - * 查询预警库存查询列表 + * 查询库存预警报表列表 * - * @param viewStockWarning 预警库存查询 - * @return 预警库存查询集合 + * @param viewStockWarning 库存预警报表 + * @return 库存预警报表集合 */ public List 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 结果 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java index 1baedcf..6086161 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/IViewStockWarningService.java @@ -4,57 +4,57 @@ import java.util.List; import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; /** - * 预警库存查询Service接口 + * 库存预警报表Service接口 * * @author ruoyi - * @date 2025-05-30 + * @date 2025-08-06 */ public interface IViewStockWarningService { /** - * 查询预警库存查询 + * 查询库存预警报表 * - * @param stockId 预警库存查询主键 - * @return 预警库存查询 + * @param stockId 库存预警报表主键 + * @return 库存预警报表 */ public ViewStockWarning selectViewStockWarningByStockId(String stockId); /** - * 查询预警库存查询列表 + * 查询库存预警报表列表 * - * @param viewStockWarning 预警库存查询 - * @return 预警库存查询集合 + * @param viewStockWarning 库存预警报表 + * @return 库存预警报表集合 */ public List 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); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java index 04e9515..2224964 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/service/impl/ViewStockWarningServiceImpl.java @@ -1,8 +1,6 @@ package com.ruoyi.search.ViewStockWarning.service.impl; import java.util.List; - -import com.ruoyi.common.annotation.DataScope; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.search.ViewStockWarning.mapper.ViewStockWarningMapper; @@ -10,22 +8,22 @@ import com.ruoyi.search.ViewStockWarning.domain.ViewStockWarning; import com.ruoyi.search.ViewStockWarning.service.IViewStockWarningService; /** - * 预警库存查询Service业务层处理 - * + * 库存预警报表Service业务层处理 + * * @author ruoyi - * @date 2025-05-30 + * @date 2025-08-06 */ @Service -public class ViewStockWarningServiceImpl implements IViewStockWarningService +public class ViewStockWarningServiceImpl implements IViewStockWarningService { @Autowired private ViewStockWarningMapper viewStockWarningMapper; /** - * 查询预警库存查询 - * - * @param stockId 预警库存查询主键 - * @return 预警库存查询 + * 查询库存预警报表 + * + * @param stockId 库存预警报表主键 + * @return 库存预警报表 */ @Override public ViewStockWarning selectViewStockWarningByStockId(String stockId) @@ -34,22 +32,21 @@ public class ViewStockWarningServiceImpl implements IViewStockWarningService } /** - * 查询预警库存查询列表 - * - * @param viewStockWarning 预警库存查询 - * @return 预警库存查询 + * 查询库存预警报表列表 + * + * @param viewStockWarning 库存预警报表 + * @return 库存预警报表 */ @Override - @DataScope(warehouseAlias = "vsw") public List 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 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java index 1155272..0a264a1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java @@ -16,175 +16,174 @@ public class ViewStockinHistory extends BaseEntity private static final long serialVersionUID = 1L; /** 入库单guid */ - @Excel(name = "入库单guid") + @Excel(name = "${search.ViewStockinHistory.stockinGuid}") private String stockinGuid; /** 入库单号 */ - @Excel(name = "入库单号") + @Excel(name = "${search.ViewStockinHistory.stockinId}") private String stockinId; /** 入库类型 */ - @Excel(name = "入库类型") + @Excel(name = "${search.ViewStockinHistory.inType}") private String inType; /** 创建时间 */ - @Excel(name = "创建时间") + @Excel(name = "${search.ViewStockinHistory.createDate}") private String createDate; /** 创建人 */ - @Excel(name = "创建人") + @Excel(name = "${search.ViewStockinHistory.createManId}") private String createManId; /** 单据状态 */ - @Excel(name = "单据状态") + @Excel(name = "${search.ViewStockinHistory.status}") private String status; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewStockinHistory.warehouseId}") private String warehouseId; /** 完成时间 */ - @Excel(name = "完成时间") + @Excel(name = "${search.ViewStockinHistory.finishDate}") private String finishDate; /** ERP单号 */ - @Excel(name = "ERP单号") + @Excel(name = "${search.ViewStockinHistory.erpBill}") private String erpBill; /** 单据来源 */ - @Excel(name = "单据来源") + @Excel(name = "${search.ViewStockinHistory.stockSource}") private String stockSource; /** 部门编码 */ - @Excel(name = "部门编码") + @Excel(name = "${search.ViewStockinHistory.departmentNo}") private String departmentNo; /** 班组编码 */ - @Excel(name = "班组编码") + @Excel(name = "${search.ViewStockinHistory.classNo}") private String classNo; /** 供应商编号 */ - @Excel(name = "供应商编号") + @Excel(name = "${search.ViewStockinHistory.supplierNo}") private String supplierNo; /** 供应商名称 */ - @Excel(name = "供应商名称") + @Excel(name = "${search.ViewStockinHistory.supplierName}") private String supplierName; /** 供应商简称 */ - @Excel(name = "供应商简称") + @Excel(name = "${search.ViewStockinHistory.simpleName}") private String simpleName; - /** 联系人 */ - @Excel(name = "联系人") + @Excel(name = "${search.ViewStockinHistory.contactName}") private String contactName; /** 联系电话 */ - @Excel(name = "联系电话") + @Excel(name = "${search.ViewStockinHistory.contactNumber}") private String contactNumber; /** 供应商地址 */ - @Excel(name = "供应商地址") + @Excel(name = "${search.ViewStockinHistory.address}") private String address; /** 入库明细ID */ - @Excel(name = "入库明细ID") + @Excel(name = "${search.ViewStockinHistory.stockinDetailId}") private String stockinDetailId; /** 批次号 */ - @Excel(name = "批次号") + @Excel(name = "${search.ViewStockinHistory.lotNo}") private String lotNo; /** 计划数量 */ - @Excel(name = "计划数量") + @Excel(name = "${search.ViewStockinHistory.quantity}") private String quantity; /** 计划箱数 */ - @Excel(name = "计划箱数") + @Excel(name = "${search.ViewStockinHistory.quantityX}") private String quantityX; /** 计划件数 */ - @Excel(name = "计划件数") + @Excel(name = "${search.ViewStockinHistory.quantityJ}") private String quantityJ; /** 实际数量 */ - @Excel(name = "实际数量") + @Excel(name = "${search.ViewStockinHistory.assignNum}") private String assignNum; /** 实际箱数 */ - @Excel(name = "实际箱数") + @Excel(name = "${search.ViewStockinHistory.assignNumX}") private String assignNumX; /** 实际件数 */ - @Excel(name = "实际件数") + @Excel(name = "${search.ViewStockinHistory.assignNumJ}") private String assignNumJ; /** 扫码数量 */ - @Excel(name = "扫码数量") + @Excel(name = "${search.ViewStockinHistory.scanNum}") private String scanNum; /** 扫码箱数 */ - @Excel(name = "扫码箱数") + @Excel(name = "${search.ViewStockinHistory.scanNumX}") private String scanNumX; /** 扫码件数 */ - @Excel(name = "扫码件数") + @Excel(name = "${search.ViewStockinHistory.scanNumJ}") private String scanNumJ; /** 入库日期 */ - @Excel(name = "入库日期") + @Excel(name = "${search.ViewStockinHistory.printDate}") private String printDate; /** 库存状态 */ - @Excel(name = "库存状态") + @Excel(name = "${search.ViewStockinHistory.stockStatus}") private String stockStatus; /** 单价 */ - @Excel(name = "单价") + @Excel(name = "${search.ViewStockinHistory.price}") private String price; /** 物料编码 */ - @Excel(name = "物料编码") + @Excel(name = "${search.ViewStockinHistory.productId}") private String productId; /** 物料名称 */ - @Excel(name = "物料名称") + @Excel(name = "${search.ViewStockinHistory.productName}") private String productName; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewStockinHistory.unit}") private String unit; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewStockinHistory.spec}") private String spec; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewStockinHistory.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewStockinHistory.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewStockinHistory.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewStockinHistory.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewStockinHistory.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewStockinHistory.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewStockinHistory.remark}") private String remark; public String getSpare1() { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java index 695000d..4635741 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java @@ -17,115 +17,115 @@ public class ViewStockoutHistory extends BaseEntity private static final long serialVersionUID = 1L; /** 出库单号 */ - @Excel(name = "出库单号") + @Excel(name = "${search.ViewStockoutHistory.stockoutId}") private String stockoutId; /** 仓库ID */ - @Excel(name = "仓库ID") + @Excel(name = "${search.ViewStockoutHistory.warehouseId}") private String warehouseId; /** 出库类型 */ - @Excel(name = "出库类型") + @Excel(name = "${search.ViewStockoutHistory.outType}") private String outType; /** 创建日期 */ - @Excel(name = "创建日期") + @Excel(name = "${search.ViewStockoutHistory.createDate}") private String createDate; /** 创建人ID */ - @Excel(name = "创建人ID") + @Excel(name = "${search.ViewStockoutHistory.createManId}") private String createManId; /** 出库状态 */ - @Excel(name = "出库状态") + @Excel(name = "${search.ViewStockoutHistory.status}") private String status; /** 出库来源 */ - @Excel(name = "出库来源") + @Excel(name = "${search.ViewStockoutHistory.stockoutSource}") private String stockoutSource; /** 出口类型 */ - @Excel(name = "出口类型") + @Excel(name = "${search.ViewStockoutHistory.exitId}") private String exitId; /** 出库明细ID */ - @Excel(name = "出库明细ID") + @Excel(name = "${search.ViewStockoutHistory.stockoutDetailId}") private String stockoutDetailId; /** 产品ID */ - @Excel(name = "产品ID") + @Excel(name = "${search.ViewStockoutHistory.productId}") private String productId; /** 产品名称 */ - @Excel(name = "产品名称") + @Excel(name = "${search.ViewStockoutHistory.productName}") private String productName; /** 批次号 */ - @Excel(name = "批次号") + @Excel(name = "${search.ViewStockoutHistory.lotNo}") private String lotNo; /** 出库数量 */ - @Excel(name = "出库数量") + @Excel(name = "${search.ViewStockoutHistory.quantity}") private BigDecimal quantity; /** 分配数量 */ - @Excel(name = "分配数量") + @Excel(name = "${search.ViewStockoutHistory.allotQuantity}") private BigDecimal allotQuantity; /** 分配编号 */ - @Excel(name = "分配编号") + @Excel(name = "${search.ViewStockoutHistory.assignNum}") private BigDecimal assignNum; /** ERP出库单ID */ - @Excel(name = "ERP出库单ID") + @Excel(name = "${search.ViewStockoutHistory.erpStockoutId}") private String erpStockoutId; /** 客户编号 */ - @Excel(name = "客户编号") + @Excel(name = "${search.ViewStockoutHistory.entryid}") private String entryid; /** 客户名称 */ - @Excel(name = "客户名称") + @Excel(name = "${search.ViewStockoutHistory.customerName}") private String customerName; /** 规格 */ - @Excel(name = "规格") + @Excel(name = "${search.ViewStockoutHistory.spec}") private String spec; /** 单位 */ - @Excel(name = "单位") + @Excel(name = "${search.ViewStockoutHistory.unit}") private String unit; /** 价格 */ - @Excel(name = "价格") + @Excel(name = "${search.ViewStockoutHistory.price}") private String price; /** 英文名称 */ - @Excel(name = "英文名称") + @Excel(name = "${search.ViewStockoutHistory.spare1}") private String spare1; /** 单件净重 */ - @Excel(name = "单件净重") + @Excel(name = "${search.ViewStockoutHistory.spare2}") private String spare2; /** 长MM */ - @Excel(name = "长MM") + @Excel(name = "${search.ViewStockoutHistory.spare5}") private String spare5; /** 宽MM */ - @Excel(name = "宽MM") + @Excel(name = "${search.ViewStockoutHistory.spare6}") private String spare6; /** 高MM */ - @Excel(name = "高MM") + @Excel(name = "${search.ViewStockoutHistory.spare7}") private String spare7; /** 体积m³ */ - @Excel(name = "体积m³") + @Excel(name = "${search.ViewStockoutHistory.spare8}") private String spare8; /** 备注 */ - @Excel(name = "备注") + @Excel(name = "${search.ViewStockoutHistory.remark}") private String remark; public String getWarehouseId() { diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index 9e81bb5..67675e4 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/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 diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index 5fd7670..1e0ddf0 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/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=物料状态 \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml deleted file mode 100644 index 5eb4ac6..0000000 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckDifferenceRecordFinishMapper.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - insert into check_difference_record_finish - - check_guid, - stock_id, - tray_code, - cargo_space_id, - product_id, - lot_no, - supplier, - customer, - old_quantity, - new_quantity, - record_type, - create_time, - product_guid, - check_stock_detail_id, - status, - - - #{checkGuid}, - #{stockId}, - #{trayCode}, - #{cargoSpaceId}, - #{productId}, - #{lotNo}, - #{supplier}, - #{customer}, - #{oldQuantity}, - #{newQuantity}, - #{recordType}, - #{createTime}, - #{productGuid}, - #{checkStockDetailId}, - #{status}, - - - - - update check_difference_record_finish - - stock_id = #{stockId}, - tray_code = #{trayCode}, - cargo_space_id = #{cargoSpaceId}, - product_id = #{productId}, - lot_no = #{lotNo}, - supplier = #{supplier}, - customer = #{customer}, - old_quantity = #{oldQuantity}, - new_quantity = #{newQuantity}, - record_type = #{recordType}, - create_time = #{createTime}, - product_guid = #{productGuid}, - check_stock_detail_id = #{checkStockDetailId}, - status = #{status}, - - where check_guid = #{checkGuid} - - - - delete from check_difference_record_finish where check_guid = #{checkGuid} - - - - delete from check_difference_record_finish where check_guid in - - #{checkGuid} - - - diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml index 0afab87..8c2fd14 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml +++ b/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"> - + @@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -34,10 +36,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + + + + + + + @@ -54,74 +62,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - 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 - + - + and stock_id = #{stockId} - and cargo_space_id like concat('%', #{cargoSpaceId}, '%') - and stock_status like concat('%', #{stockStatus}, '%') - and product_status like concat('%', #{productStatus}, '%') - and lot_no like concat('%', #{lotNo}, '%') - and in_date like concat('%', #{inDate}, '%') - and back_date like concat('%', #{backDate}, '%') - and product_guid like concat('%', #{productGuid}, '%') - and quantity like concat('%', #{quantity}, '%') - and job_id like concat('%', #{jobId}, '%') - and tray_code like concat('%', #{trayCode}, '%') - and out_quantity like concat('%', #{outQuantity}, '%') - and stockin_detail_id like concat('%', #{stockinDetailId}, '%') - and stockin_id like concat('%', #{stockinId}, '%') - and in_type like concat('%', #{inType}, '%') - and in_class_id like concat('%', #{inClassId}, '%') - and warehouse_id like concat('%', #{warehouseId}, '%') - and stacking_id like concat('%', #{stackingId}, '%') - and spare1 like concat('%', #{spare1}, '%') - and spare2 like concat('%', #{spare2}, '%') - and spare5 like concat('%', #{spare5}, '%') - and spare6 like concat('%', #{spare6}, '%') + and cargo_space_id = #{cargoSpaceId} + and stock_status = #{stockStatus} + and product_status = #{productStatus} + and lot_no = #{lotNo} + and in_date = #{inDate} + and back_date = #{backDate} + and product_guid = #{productGuid} + and quantity = #{quantity} + and job_id = #{jobId} + and tray_code = #{trayCode} + and out_quantity = #{outQuantity} + and stockin_detail_id = #{stockinDetailId} + and stockin_id = #{stockinId} + and in_type = #{inType} + and in_class_id = #{inClassId} + and warehouse_id = #{warehouseId} + and stacking_id = #{stackingId} + and spare1 = #{spare1} + and spare2 = #{spare2} + and spare3 = #{spare3} + and spare4 = #{spare4} + and spare5 = #{spare5} + and spare6 = #{spare6} and product_id like concat('%', #{productId}, '%') and warehouse_name like concat('%', #{warehouseName}, '%') - and address like concat('%', #{address}, '%') - and c_desc like concat('%', #{cDesc}, '%') - and warehouse_kind like concat('%', #{warehouseKind}, '%') - and warehouse_type like concat('%', #{warehouseType}, '%') - and is_current like concat('%', #{isCurrent}, '%') + and address = #{address} + and c_desc = #{cDesc} + and warehouse_kind = #{warehouseKind} + and warehouse_type = #{warehouseType} + and is_current = #{isCurrent} + and price = #{price} + and unit = #{unit} + and spec = #{spec} + and enName like concat('%', #{enName}, '%') + and weight = #{weight} + and longMM = #{longMM} + and wide = #{wide} + and hight = #{hight} + and volume = #{volume} and product_name like concat('%', #{productName}, '%') - and spec like concat('%', #{spec}, '%') - and unit like concat('%', #{unit}, '%') - and price like concat('%', #{price}, '%') and cargo_space_name like concat('%', #{cargoSpaceName}, '%') - and roadway_id like concat('%', #{roadwayId}, '%') - and cargo_area_id like concat('%', #{cargoAreaId}, '%') - and the_type like concat('%', #{theType}, '%') + and roadway_id = #{roadwayId} + and cargo_area_id = #{cargoAreaId} + and the_type = #{theType} and the_type_name like concat('%', #{theTypeName}, '%') - and the_platoon like concat('%', #{thePlatoon}, '%') - and the_column like concat('%', #{theColumn}, '%') - and the_floor like concat('%', #{theFloor}, '%') - and cargo_status like concat('%', #{cargoStatus}, '%') - and locked like concat('%', #{locked}, '%') - and cargo_hight like concat('%', #{cargoHight}, '%') - and iss_double like concat('%', #{issDouble}, '%') - and group_coding_no like concat('%', #{groupCodingNo}, '%') - and group_coding like concat('%', #{groupCoding}, '%') - and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%') - and this_cargo_area like concat('%', #{thisCargoArea}, '%') - and spare7 like concat('%', #{spare7}, '%') - and spare8 like concat('%', #{spare8}, '%') - - ${params.warehouseDataScope} - + and the_platoon = #{thePlatoon} + and the_column = #{theColumn} + and the_floor = #{theFloor} + and cargo_status = #{cargoStatus} + and locked = #{locked} + and cargo_hight = #{cargoHight} + and iss_double = #{issDouble} + and group_coding_no = #{groupCodingNo} + and group_coding = #{groupCoding} + and cargo_space_logo = #{cargoSpaceLogo} + and this_cargo_area = #{thisCargoArea} - +