lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导出的字段修改为与页面的一致

Browse Source
This commit is contained in:
猫猫guowen
2025-08-22 14:44:45 +08:00
parent 05ce4b6080
commit 853acbc9a3
31 changed files with 683 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ public class BasCustomer extends BaseEntity
private String simpleName; private String simpleName;
/** 是否可用 */ /** 是否可用 */
@Excel(name = "${bas.Customer.useable}") @Excel(name = "${bas.Customer.useable}",dictType = "is_available")
private String useable; private String useable;
/** 业务部门 */ /** 业务部门 */

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

@@ -26,63 +26,70 @@ public class BasProduct extends BaseEntity
@Excel(name = "${bas.Product.productId}") @Excel(name = "${bas.Product.productId}")
private String productId; private String productId;
/** 父节点id */ /** 物料名称 */
@Excel(name = "${bas.Product.parentId}") @Excel(name = "${bas.Product.productName}")
private String parentId; private String productName;
/** 价格 */ /** 英文描述 */
@Excel(name = "${bas.Product.price}") @Excel(name = "${bas.Product.spare1}")
private String price; private String spare1;
/** 品牌 */
@Excel(name = "${bas.Product.cargoNo}")
private String cargoNo;
/** 单位 */ /** 单位 */
@Excel(name = "${bas.Product.unit}") @Excel(name = "${bas.Product.unit}")
private String unit; private String unit;
/** 规格 */ /** 单件净重KG */
@Excel(name = "${bas.Product.spec}")
private String spec;
/** 备用字段1 */
@Excel(name = "${bas.Product.spare1}")
private String spare1;
/** 备用字段2 */
@Excel(name = "${bas.Product.spare2}") @Excel(name = "${bas.Product.spare2}")
private String spare2; private String spare2;
/** 备用字段3 */ /** 长MM */
@Excel(name = "${bas.Product.spare3}")
private String spare3;
/** 备用字段4 */
@Excel(name = "${bas.Product.spare4}")
private String spare4;
/** 备用字段5 */
@Excel(name = "${bas.Product.spare5}") @Excel(name = "${bas.Product.spare5}")
private String spare5; private String spare5;
/** 备用字段6 */ /** 宽MM */
@Excel(name = "${bas.Product.spare6}") @Excel(name = "${bas.Product.spare6}")
private String spare6; private String spare6;
/** 备用字段6 */ /** 高MM */
@Excel(name = "${bas.Product.spare7}") @Excel(name = "${bas.Product.spare7}")
private String spare7; private String spare7;
/** 备用字段6 */
/** 体积m³ */
@Excel(name = "${bas.Product.spare8}") @Excel(name = "${bas.Product.spare8}")
private String spare8; private String spare8;
/** 备用字段6 */
@Excel(name = "${bas.Product.spare9}")
private String spare9;
/** 物料名称 */ /** 价格 */
@Excel(name = "${bas.Product.productName}") @Excel(name = "${bas.Product.price}")
private String productName; private String price;
/** 描述 */
@Excel(name = "${bas.Product.remark}")
private String remark;
/** 父节点id */
// @Excel(name = "${bas.Product.parentId}")
private String parentId;
/** 品牌 */
// @Excel(name = "${bas.Product.cargoNo}")
private String cargoNo;
/** 规格 */
// @Excel(name = "${bas.Product.spec}")
private String spec;
/** 备用字段3 */
// @Excel(name = "${bas.Product.spare3}")
private String spare3;
/** 备用字段4 */
// @Excel(name = "${bas.Product.spare4}")
private String spare4;
/** 备用字段6 */
// @Excel(name = "${bas.Product.spare9}")
private String spare9;
/** /**
* 数量 * 数量

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

@@ -35,7 +35,7 @@ public class BasSupplier extends BaseEntity
private String simpleName; private String simpleName;
/** 是否可用 */ /** 是否可用 */
@Excel(name = "${bas.Supplier.useable}") @Excel(name = "${bas.Supplier.useable}",dictType = "is_available")
private String useable; private String useable;
/** 地区分类 */ /** 地区分类 */

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

@@ -23,27 +23,29 @@ public class BasCargoSpace extends BaseEntity {
/** 货位id 主键 */ /** 货位id 主键 */
@TableId @TableId
/** 货位编码 */
@Excel(name = "${bas.CargoSpace.cargoSpaceId}")
private String cargoSpaceId; private String cargoSpaceId;
/** 仓库id（不允许为空） */
@Excel(name = "${bas.CargoSpace.warehouseId}")
private String warehouseId; private String warehouseId;
/** 仓库名称（不允许为空） */
@Excel(name = "${bas.CargoSpace.warehouseId}")
private String warehouseName; private String warehouseName;
/** 巷道id（允许为空） */ /** 巷道id（允许为空） */
@Excel(name = "${bas.CargoSpace.roadwayId}") // @Excel(name = "${bas.CargoSpace.roadwayId}")
private String roadwayId; private String roadwayId;
/** 货区id（允许为空） */ /** 货区id（允许为空） */
@Excel(name = "${bas.CargoSpace.cargoAreaId}") // @Excel(name = "${bas.CargoSpace.cargoAreaId}")
private String cargoAreaId; private String cargoAreaId;
/** 货位类型（允许为空） */ /** 货位类型（允许为空） */
@Excel(name = "${bas.CargoSpace.theType}") // @Excel(name = "${bas.CargoSpace.theType}")
private String theType; private String theType;
/** 货位类型名称 */ /** 货位类型名称 */
@Excel(name = "${bas.CargoSpace.theTypeName}") // @Excel(name = "${bas.CargoSpace.theTypeName}")
private String theTypeName; private String theTypeName;
/** 货位名称（不允许为空） */ /** 货位名称（不允许为空） */
@@ -63,12 +65,12 @@ public class BasCargoSpace extends BaseEntity {
private Long theFloor; private Long theFloor;
/** 货位状态1空2满 */ /** 货位状态1空2满 */
@Excel(name = "${bas.CargoSpace.status}") @Excel(name = "${bas.CargoSpace.status}",dictType = "cargo_space_status")
private String status; private String status;
/** 是否锁定（不允许为空） /** 是否锁定（不允许为空）
Y锁、N开 */ Y锁、N开 */
@Excel(name = "${bas.CargoSpace.locked}") @Excel(name = "${bas.CargoSpace.locked}",dictType = "cargo_space_lock_status")
private String locked; private String locked;
/** 托盘条码（允许为空） */ /** 托盘条码（允许为空） */
@@ -80,23 +82,23 @@ Y锁、N开 */
private String cargoHight; private String cargoHight;
/** 是否双伸 Y N */ /** 是否双伸 Y N */
@Excel(name = "${bas.CargoSpace.issDouble}") // @Excel(name = "${bas.CargoSpace.issDouble}")
private String issDouble; private String issDouble;
/** 双货位分组编码（标识区分） */ /** 双货位分组编码（标识区分） */
@Excel(name = "${bas.CargoSpace.groupCodingNo}") // @Excel(name = "${bas.CargoSpace.groupCodingNo}")
private String groupCodingNo; private String groupCodingNo;
/** 双货位分组编码1、2… */ /** 双货位分组编码1、2… */
@Excel(name = "${bas.CargoSpace.groupCoding}") // @Excel(name = "${bas.CargoSpace.groupCoding}")
private String groupCoding; private String groupCoding;
/** 双货位标识 0 外1内 */ /** 双货位标识 0 外1内 */
@Excel(name = "${bas.CargoSpace.cargoSpaceLogo}") // @Excel(name = "${bas.CargoSpace.cargoSpaceLogo}")
private String cargoSpaceLogo; private String cargoSpaceLogo;
/** 本仓库区域 1--8 A9--15 B */ /** 本仓库区域 1--8 A9--15 B */
@Excel(name = "${bas.CargoSpace.thisCargoArea}") // @Excel(name = "${bas.CargoSpace.thisCargoArea}")
private String thisCargoArea; private String thisCargoArea;
// @Override // @Override

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

@@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@@ -25,7 +26,7 @@ public class BasProductPort extends BaseEntity
private String portName; private String portName;
/** 点位分类 */ /** 点位分类 */
@Excel(name = "${bas.ProductPort.portType}") @Excel(name = "${bas.ProductPort.portType}",dictType = "port_type")
private String portType; private String portType;
/** 点位描述 */ /** 点位描述 */
@@ -35,6 +36,20 @@ public class BasProductPort extends BaseEntity
/** 创建人 */ /** 创建人 */
@Excel(name = "${bas.ProductPort.createMan}") @Excel(name = "${bas.ProductPort.createMan}")
private String createMan; private String createMan;
/** 创建时间 */
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
private String warehouseId; private String warehouseId;
public String getWarehouseId() { public String getWarehouseId() {

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

@@ -29,15 +29,15 @@ public class BasTraycode extends BaseEntity
private String trayCode; private String trayCode;
/** 备用字段1 */ /** 备用字段1 */
@Excel(name = "${bas.Traycode.spare1}") // @Excel(name = "${bas.Traycode.spare1}")
private String spare1; private String spare1;
/** 备用字段2 */ /** 备用字段2 */
@Excel(name = "${bas.Traycode.spare2}") // @Excel(name = "${bas.Traycode.spare2}")
private String spare2; private String spare2;
/** 备用字段3 */ /** 备用字段3 */
@Excel(name = "${bas.Traycode.spare3}") // @Excel(name = "${bas.Traycode.spare3}")
private String spare3; private String spare3;
public String getFormatName() { public String getFormatName() {

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

@@ -47,11 +47,11 @@ public class BasTraycodeFormat extends BaseEntity
private String spare1; private String spare1;
/** 备用字段2 */ /** 备用字段2 */
@Excel(name = "${bas.TraycodeFormat.spare2}") // @Excel(name = "${bas.TraycodeFormat.spare2}")
private String spare2; private String spare2;
/** 备用字段3 */ /** 备用字段3 */
@Excel(name = "${bas.TraycodeFormat.spare3}") // @Excel(name = "${bas.TraycodeFormat.spare3}")
private String spare3; private String spare3;
public void setId(Long id) public void setId(Long id)

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

@@ -46,11 +46,11 @@ public class BasWarehouse extends BaseEntity
private String warehouseKind; private String warehouseKind;
/** 仓库类型 */ /** 仓库类型 */
@Excel(name = "${bas.Warehouse.warehouseType}") @Excel(name = "${bas.Warehouse.warehouseType}",dictType = "warehouse_type")
private String warehouseType; private String warehouseType;
/** 是否可用（不允许为空）Y、N */ /** 是否可用（不允许为空）Y、N */
@Excel(name = "${bas.Warehouse.isCurrent}") @Excel(name = "${bas.Warehouse.isCurrent}",dictType = "sys_yes_no")
private String isCurrent; private String isCurrent;
/*仓库数据权限*/ /*仓库数据权限*/

12
ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java
View File

@@ -28,7 +28,7 @@ public class StockSummary extends BaseEntity
private String productName; private String productName;
/** 规格 */ /** 规格 */
@Excel(name = "${search.StockSummary.spec}") // @Excel(name = "${search.StockSummary.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */
@@ -36,7 +36,7 @@ public class StockSummary extends BaseEntity
private String unit; private String unit;
/** 批号 */ /** 批号 */
@Excel(name = "${search.StockSummary.lotNo}") // @Excel(name = "${search.StockSummary.lotNo}")
private String lotNo; private String lotNo;
/** 仓库 */ /** 仓库 */
@@ -44,6 +44,9 @@ public class StockSummary extends BaseEntity
@Excel(name = "${search.StockSummary.warehouseName}") @Excel(name = "${search.StockSummary.warehouseName}")
private String warehouseName; private String warehouseName;
@Excel(name = "${search.StockSummary.cargoSpaceName}")
private String cargoSpaceName;
/** 巷道 */ /** 巷道 */
private String roadwayId; private String roadwayId;
@@ -53,7 +56,7 @@ public class StockSummary extends BaseEntity
/** 价格 */ /** 价格 */
@Excel(name = "${search.StockSummary.price}") // @Excel(name = "${search.StockSummary.price}")
private String price; private String price;
/** 英文名称 */ /** 英文名称 */
@@ -84,8 +87,7 @@ public class StockSummary extends BaseEntity
@Excel(name = "${search.StockSummary.remark}") @Excel(name = "${search.StockSummary.remark}")
private String remark; private String remark;
private String cargoSpaceId; private String cargoSpaceId;
@Excel(name = "${search.StockSummary.cargoSpaceName}")
private String cargoSpaceName;
/** 分组字段控制 */ /** 分组字段控制 */

82
ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java
View File

@@ -19,9 +19,13 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
private Long id; private Long id;
/** 入出库类型 */ /** 入出库类型 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOut}") // @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOut}")
private String inOrOut; private String inOrOut;
/** 仓库名称 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseName}")
private String warehouseName;
/** 入出库主单据ID */ /** 入出库主单据ID */
@Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckId}") @Excel(name = "${search.ViewFlatWarehouseInFlow.inOrOutSotckId}")
private String inOrOutSotckId; private String inOrOutSotckId;
@@ -31,63 +35,55 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
private String inOrOutSotckDetailId; private String inOrOutSotckDetailId;
/** 物料GUID */ /** 物料GUID */
@Excel(name = "${search.ViewFlatWarehouseInFlow.productGuid}") // @Excel(name = "${search.ViewFlatWarehouseInFlow.productGuid}")
private String productGuid; private String productGuid;
/** 物料ID */ /** 物料ID */
@Excel(name = "${search.ViewFlatWarehouseInFlow.productId}") @Excel(name = "${search.ViewFlatWarehouseInFlow.productId}")
private String productId; private String productId;
/** 数量 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.quantity}")
private String quantity;
/** 创建人 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.createMan}")
private String createMan;
/** 仓库id */
@Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseId}")
private String warehouseId;
/** 仓库名称 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseName}")
private String warehouseName;
/** 仓库地址 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.address}")
private String address;
/** 仓库描述 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.cDesc}")
private String cDesc;
/** 仓库级别 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseKind}")
private String warehouseKind;
/** 仓库类型 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseType}")
private String warehouseType;
/** 是否可用 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.isCurrent}")
private String isCurrent;
/** 物料名称 */ /** 物料名称 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.productName}") @Excel(name = "${search.ViewFlatWarehouseInFlow.productName}")
private String productName; private String productName;
/** 创建人 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.createMan}")
private String createMan;
/** 仓库id */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseId}")
private String warehouseId;
/** 仓库地址 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.address}")
private String address;
/** 仓库描述 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.cDesc}")
private String cDesc;
/** 仓库级别 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseKind}")
private String warehouseKind;
/** 仓库类型 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.warehouseType}")
private String warehouseType;
/** 是否可用 */
// @Excel(name = "${search.ViewFlatWarehouseInFlow.isCurrent}")
private String isCurrent;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.spec}") // @Excel(name = "${search.ViewFlatWarehouseInFlow.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.unit}") // @Excel(name = "${search.ViewFlatWarehouseInFlow.unit}")
private String unit; private String unit;
/** 价格 */ /** 价格 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.price}") // @Excel(name = "${search.ViewFlatWarehouseInFlow.price}")
private String price; private String price;
/** 英文名称 */ /** 英文名称 */
@@ -118,6 +114,10 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
@Excel(name = "${search.ViewFlatWarehouseInFlow.remark}") @Excel(name = "${search.ViewFlatWarehouseInFlow.remark}")
private String remark; private String remark;
/** 数量 */
@Excel(name = "${search.ViewFlatWarehouseInFlow.quantity}")
private String quantity;
@Override @Override
public String getRemark() { public String getRemark() {
return remark; return remark;

105
ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java
View File

@@ -18,8 +18,12 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
/** $column.columnComment */ /** $column.columnComment */
private Long id; private Long id;
/** 仓库名称 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseName}")
private String warehouseName;
/** 入出库类型 */ /** 入出库类型 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOut}") // @Excel(name = "${search.ViewFlatWarehouseOutFlow.inOrOut}")
private String inOrOut; private String inOrOut;
/** 入出库主单据ID */ /** 入出库主单据ID */
@@ -31,66 +35,17 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
private String inOrOutSotckDetailId; private String inOrOutSotckDetailId;
/** 物料GUID */ /** 物料GUID */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.productGuid}") // @Excel(name = "${search.ViewFlatWarehouseOutFlow.productGuid}")
private String productGuid; private String productGuid;
/** 物料ID */ /** 物料ID */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.productId}") @Excel(name = "${search.ViewFlatWarehouseOutFlow.productId}")
private String productId; private String productId;
/** 入出库数量 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.quantity}")
private String quantity;
/** 创建人 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.createMan}")
private String createMan;
/** 仓库ID */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseId}")
private String warehouseId;
/** 仓库名称 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseName}")
private String warehouseName;
/** 仓库地址 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.address}")
private String address;
/** 仓库描述 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.cDesc}")
private String cDesc;
/** 仓库级别 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseKind}")
private String warehouseKind;
/** 仓库类型 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseType}")
private String warehouseType;
/** 是否可用 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.isCurrent}")
private String isCurrent;
/** 物料名称 */ /** 物料名称 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.productName}") @Excel(name = "${search.ViewFlatWarehouseOutFlow.productName}")
private String productName; private String productName;
/** 规格 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.spec}")
private String spec;
/** 单位 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.unit}")
private String unit;
/** 价格 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.price}")
private String price;
/** 英文名称 */ /** 英文名称 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.spare1}") @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare1}")
private String spare1; private String spare1;
@@ -115,10 +70,58 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
@Excel(name = "${search.ViewFlatWarehouseOutFlow.spare8}") @Excel(name = "${search.ViewFlatWarehouseOutFlow.spare8}")
private String spare8; private String spare8;
/** 价格 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.price}")
private String price;
/** 备注 */ /** 备注 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.remark}") @Excel(name = "${search.ViewFlatWarehouseOutFlow.remark}")
private String remark; private String remark;
/** 入出库数量 */
@Excel(name = "${search.ViewFlatWarehouseOutFlow.quantity}")
private String quantity;
/** 创建人 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.createMan}")
private String createMan;
/** 仓库ID */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseId}")
private String warehouseId;
/** 仓库地址 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.address}")
private String address;
/** 仓库描述 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.cDesc}")
private String cDesc;
/** 仓库级别 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseKind}")
private String warehouseKind;
/** 仓库类型 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.warehouseType}")
private String warehouseType;
/** 是否可用 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.isCurrent}")
private String isCurrent;
/** 规格 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.spec}")
private String spec;
/** 单位 */
// @Excel(name = "${search.ViewFlatWarehouseOutFlow.unit}")
private String unit;
@Override @Override
public String getRemark() { public String getRemark() {
return remark; return remark;

48
ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java
View File

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/** /**
* 入库作业流水对象 view_in_job_flow * 入库作业流水对象 view_in_job_flow
* *
@@ -24,7 +26,7 @@ public class ViewInJobFlow extends BaseEntity
private String jobDetailId; private String jobDetailId;
/** 状态 */ /** 状态 */
@Excel(name = "${search.ViewInJobFlow.status}") @Excel(name = "${search.ViewInJobFlow.status}",dictType = "mydo_job_status")
private String status; private String status;
/** 任务号 */ /** 任务号 */
@@ -36,11 +38,11 @@ public class ViewInJobFlow extends BaseEntity
private String trayCode; private String trayCode;
/** 巷道ID */ /** 巷道ID */
@Excel(name = "${search.ViewInJobFlow.roadwayId}") // @Excel(name = "${search.ViewInJobFlow.roadwayId}")
private String roadwayId; private String roadwayId;
/** 货位ID */ /** 货位ID */
@Excel(name = "${search.ViewInJobFlow.cargoSpaceId}") // @Excel(name = "${search.ViewInJobFlow.cargoSpaceId}")
private String cargoSpaceId; private String cargoSpaceId;
/** 货位名称 */ /** 货位名称 */
@@ -48,15 +50,15 @@ public class ViewInJobFlow extends BaseEntity
private String cargoSpaceName; private String cargoSpaceName;
/** 排 */ /** 排 */
@Excel(name = "${search.ViewInJobFlow.thePlatoon}") // @Excel(name = "${search.ViewInJobFlow.thePlatoon}")
private Long thePlatoon; private Long thePlatoon;
/** 列 */ /** 列 */
@Excel(name = "${search.ViewInJobFlow.theColumn}") // @Excel(name = "${search.ViewInJobFlow.theColumn}")
private Long theColumn; private Long theColumn;
/** 层 */ /** 层 */
@Excel(name = "${search.ViewInJobFlow.theFloor}") // @Excel(name = "${search.ViewInJobFlow.theFloor}")
private Long theFloor; private Long theFloor;
/** 优先级 */ /** 优先级 */
@@ -64,11 +66,11 @@ public class ViewInJobFlow extends BaseEntity
private Long priority; private Long priority;
/** 执行阶段 */ /** 执行阶段 */
@Excel(name = "${search.ViewInJobFlow.executionPhase}") // @Excel(name = "${search.ViewInJobFlow.executionPhase}",dictType = "execution_phase_type")
private String executionPhase; private String executionPhase;
/** 作业类型 */ /** 作业类型 */
@Excel(name = "${search.ViewInJobFlow.inOrOut}") @Excel(name = "${search.ViewInJobFlow.inOrOut}",dictType = "in_job_type")
private String inOrOut; private String inOrOut;
/** 入口ID */ /** 入口ID */
@@ -80,15 +82,15 @@ public class ViewInJobFlow extends BaseEntity
private String productId; private String productId;
/** 批号 */ /** 批号 */
@Excel(name = "${search.ViewInJobFlow.lotNo}") // @Excel(name = "${search.ViewInJobFlow.lotNo}")
private String lotNo; private String lotNo;
/** 垛型ID */ /** 垛型ID */
@Excel(name = "${search.ViewInJobFlow.stackingId}") // @Excel(name = "${search.ViewInJobFlow.stackingId}")
private String stackingId; private String stackingId;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "${search.ViewInJobFlow.stockStatus}") // @Excel(name = "${search.ViewInJobFlow.stockStatus}")
private String stockStatus; private String stockStatus;
/** 入库数量 */ /** 入库数量 */
@@ -103,8 +105,10 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "${search.ViewInJobFlow.inOrOutDId}") @Excel(name = "${search.ViewInJobFlow.inOrOutDId}")
private String inOrOutDId; private String inOrOutDId;
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 开始时间 */ /** 开始时间 */
@Excel(name = "${search.ViewInJobFlow.startTime}") // @Excel(name = "${search.ViewInJobFlow.startTime}")
private String startTime; private String startTime;
/** 结束时间 */ /** 结束时间 */
@@ -120,17 +124,13 @@ public class ViewInJobFlow extends BaseEntity
private String productName; private String productName;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewInJobFlow.spec}") // @Excel(name = "${search.ViewInJobFlow.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */
@Excel(name = "${search.ViewInJobFlow.unit}") @Excel(name = "${search.ViewInJobFlow.unit}")
private String unit; private String unit;
/** 价格 */
@Excel(name = "${search.ViewInJobFlow.price}")
private String price;
/** 英文名称 */ /** 英文名称 */
@Excel(name = "${search.ViewInJobFlow.spare1}") @Excel(name = "${search.ViewInJobFlow.spare1}")
private String spare1; private String spare1;
@@ -155,10 +155,24 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "${search.ViewInJobFlow.spare8}") @Excel(name = "${search.ViewInJobFlow.spare8}")
private String spare8; private String spare8;
/** 价格 */
@Excel(name = "${search.ViewInJobFlow.price}")
private String price;
/** 备注 */ /** 备注 */
@Excel(name = "${search.ViewInJobFlow.remark}") @Excel(name = "${search.ViewInJobFlow.remark}")
private String remark; private String remark;
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override @Override
public String getRemark() { public String getRemark() {
return remark; return remark;

33
ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java
View File

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/** /**
* 出库做业务流水对象 view_out_job_flow * 出库做业务流水对象 view_out_job_flow
* *
@@ -24,7 +26,7 @@ public class ViewOutJobFlow extends BaseEntity
private String jobDetailId; private String jobDetailId;
/** 状态 */ /** 状态 */
@Excel(name = "${search.ViewOutJobFlow.status}") @Excel(name = "${search.ViewOutJobFlow.status}",dictType = "mydo_job_status")
private String status; private String status;
/** 任务号 */ /** 任务号 */
@@ -36,7 +38,7 @@ public class ViewOutJobFlow extends BaseEntity
private String trayCode; private String trayCode;
/** 巷道ID */ /** 巷道ID */
@Excel(name = "${search.ViewOutJobFlow.roadwayId}") // @Excel(name = "${search.ViewOutJobFlow.roadwayId}")
private String roadwayId; private String roadwayId;
/** 货位ID */ /** 货位ID */
@@ -64,11 +66,11 @@ public class ViewOutJobFlow extends BaseEntity
private Long priority; private Long priority;
/** 执行阶段 */ /** 执行阶段 */
@Excel(name = "${search.ViewOutJobFlow.executionPhase}") // @Excel(name = "${search.ViewOutJobFlow.executionPhase}")
private String executionPhase; private String executionPhase;
/** 作业类型 */ /** 作业类型 */
@Excel(name = "${search.ViewOutJobFlow.inOrOut}") @Excel(name = "${search.ViewOutJobFlow.inOrOut}",dictType = "out_job_type")
private String inOrOut; private String inOrOut;
/** 出口ID */ /** 出口ID */
@@ -80,15 +82,15 @@ public class ViewOutJobFlow extends BaseEntity
private String productId; private String productId;
/** 批号 */ /** 批号 */
@Excel(name = "${search.ViewOutJobFlow.lotNo}") // @Excel(name = "${search.ViewOutJobFlow.lotNo}")
private String lotNo; private String lotNo;
/** 剁型ID */ /** 剁型ID */
@Excel(name = "${search.ViewOutJobFlow.stackingId}") // @Excel(name = "${search.ViewOutJobFlow.stackingId}")
private String stackingId; private String stackingId;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "${search.ViewOutJobFlow.stockStatus}") // @Excel(name = "${search.ViewOutJobFlow.stockStatus}")
private String stockStatus; private String stockStatus;
/** 出库数量 */ /** 出库数量 */
@@ -96,7 +98,7 @@ public class ViewOutJobFlow extends BaseEntity
private String outQuantity; private String outQuantity;
/** 回流数量 */ /** 回流数量 */
@Excel(name = "${search.ViewOutJobFlow.giveNum}") // @Excel(name = "${search.ViewOutJobFlow.giveNum}")
private String giveNum; private String giveNum;
/** 单据ID */ /** 单据ID */
@@ -106,6 +108,19 @@ public class ViewOutJobFlow extends BaseEntity
/** 子单据ID */ /** 子单据ID */
@Excel(name = "${search.ViewOutJobFlow.inOrOutDId}") @Excel(name = "${search.ViewOutJobFlow.inOrOutDId}")
private String inOrOutDId; private String inOrOutDId;
/** 创建时间 */
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/** 开始时间 */ /** 开始时间 */
@Excel(name = "${search.ViewOutJobFlow.startTime}") @Excel(name = "${search.ViewOutJobFlow.startTime}")
@@ -124,7 +139,7 @@ public class ViewOutJobFlow extends BaseEntity
private String productName; private String productName;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewOutJobFlow.spec}") // @Excel(name = "${search.ViewOutJobFlow.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */

28
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java
View File

@@ -16,7 +16,7 @@ public class ViewStockDetail extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */ /** id */
@Excel(name = "${search.ViewStockDetail.onlyIdentity}") // @Excel(name = "${search.ViewStockDetail.onlyIdentity}")
private Long onlyIdentity; private Long onlyIdentity;
/** 库存ID */ /** 库存ID */
@@ -40,7 +40,7 @@ public class ViewStockDetail extends BaseEntity
private String jobId; private String jobId;
/** 批号 */ /** 批号 */
@Excel(name = "${search.ViewStockDetail.lotNo}") // @Excel(name = "${search.ViewStockDetail.lotNo}")
private String lotNo; private String lotNo;
/** 入库子单ID */ /** 入库子单ID */
@@ -51,13 +51,13 @@ public class ViewStockDetail extends BaseEntity
@Excel(name = "${search.ViewStockDetail.inDate}") @Excel(name = "${search.ViewStockDetail.inDate}")
private String inDate; private String inDate;
private String warehouseId;
/** 仓库 */ /** 仓库 */
@Excel(name = "${search.ViewStockDetail.warehouseId}") @Excel(name = "${search.ViewStockDetail.warehouseId}")
private String warehouseId;
private String warehouseName; private String warehouseName;
/** 剁型ID */ /** 剁型ID */
@Excel(name = "${search.ViewStockDetail.stackingId}") // @Excel(name = "${search.ViewStockDetail.stackingId}")
private String stackingId; private String stackingId;
/** 货位名称 */ /** 货位名称 */
@@ -69,11 +69,17 @@ public class ViewStockDetail extends BaseEntity
private String roadwayId; private String roadwayId;
/** 货位状态 */ /** 货位状态 */
@Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}") @Excel(name = "${search.ViewStockDetail.cargoSpaceStatus}",dictType = "cargo_space_status")
private String cargoSpaceStatus; private String cargoSpaceStatus;
@Excel(name = "${search.ViewStockDetail.stockStatus}",dictType = "stock_status")
private String stockStatus;
@Excel(name = "${search.ViewStockDetail.productStatus}",dictType = "product_status")
private String productStatus;
/** 是否锁定 */ /** 是否锁定 */
@Excel(name = "${search.ViewStockDetail.locked}") @Excel(name = "${search.ViewStockDetail.locked}",dictType = "cargo_space_lock_status")
private String locked; private String locked;
/** 物料ID */ /** 物料ID */
@@ -85,7 +91,7 @@ public class ViewStockDetail extends BaseEntity
private String productName; private String productName;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewStockDetail.spec}") // @Excel(name = "${search.ViewStockDetail.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */
@@ -93,7 +99,7 @@ public class ViewStockDetail extends BaseEntity
private String unit; private String unit;
/** 价格 */ /** 价格 */
@Excel(name = "${search.ViewStockDetail.price}") // @Excel(name = "${search.ViewStockDetail.price}")
private String price; private String price;
/** 英文名称 */ /** 英文名称 */
@@ -123,10 +129,8 @@ public class ViewStockDetail extends BaseEntity
/** 备注 */ /** 备注 */
@Excel(name = "${search.ViewStockDetail.remark}") @Excel(name = "${search.ViewStockDetail.remark}")
private String remark; private String remark;
@Excel(name = "${search.ViewStockDetail.stockStatus}")
private String stockStatus;
@Excel(name = "${search.ViewStockDetail.productStatus}")
private String productStatus;
public String getStockStatus() { public String getStockStatus() {
return stockStatus; return stockStatus;

95
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java
View File

@@ -14,8 +14,12 @@ import com.ruoyi.common.core.domain.BaseEntity;
public class ViewStockSecure extends BaseEntity public class ViewStockSecure extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 仓库名称 */
@Excel(name = "${search.ViewStockSecure.warehouseName}")
private String warehouseName;
/** 库存ID */ /** 库存ID */
// @Excel(name = "库存ID")
@Excel(name = "${search.ViewStockSecure.stockId}") @Excel(name = "${search.ViewStockSecure.stockId}")
private String stockId; private String stockId;
@@ -24,15 +28,15 @@ public class ViewStockSecure extends BaseEntity
private String cargoSpaceId; private String cargoSpaceId;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "${search.ViewStockSecure.stockStatus}") @Excel(name = "${search.ViewStockSecure.stockStatus}",dictType = "stock_status")
private String stockStatus; private String stockStatus;
/** 物料状态 */ /** 物料状态 */
@Excel(name = "${search.ViewStockSecure.productStatus}") @Excel(name = "${search.ViewStockSecure.productStatus}",dictType = "product_status")
private String productStatus; private String productStatus;
/** 批次号 */ /** 批次号 */
@Excel(name = "${search.ViewStockSecure.lotNo}") // @Excel(name = "${search.ViewStockSecure.lotNo}")
private String lotNo; private String lotNo;
/** 入库时间 */ /** 入库时间 */
@@ -40,11 +44,11 @@ public class ViewStockSecure extends BaseEntity
private String inDate; private String inDate;
/** 回流时间 */ /** 回流时间 */
@Excel(name = "${search.ViewStockSecure.backDate}") // @Excel(name = "${search.ViewStockSecure.backDate}")
private String backDate; private String backDate;
/** 物料GUID */ /** 物料GUID */
@Excel(name = "${search.ViewStockSecure.productGuid}") // @Excel(name = "${search.ViewStockSecure.productGuid}")
private String productGuid; private String productGuid;
/** 库存数量 */ /** 库存数量 */
@@ -60,7 +64,7 @@ public class ViewStockSecure extends BaseEntity
private String trayCode; private String trayCode;
/** 出库数量 */ /** 出库数量 */
@Excel(name = "${search.ViewStockSecure.outQuantity}") // @Excel(name = "${search.ViewStockSecure.outQuantity}")
private String outQuantity; private String outQuantity;
/** 入库子单ID */ /** 入库子单ID */
@@ -72,23 +76,23 @@ public class ViewStockSecure extends BaseEntity
private String stockinId; private String stockinId;
/** 入库类型 */ /** 入库类型 */
@Excel(name = "${search.ViewStockSecure.inType}") @Excel(name = "${search.ViewStockSecure.inType}",dictType = "in_job_type")
private String inType; private String inType;
/** 入库班组ID */ /** 入库班组ID */
@Excel(name = "${search.ViewStockSecure.inClassId}") // @Excel(name = "${search.ViewStockSecure.inClassId}")
private String inClassId; private String inClassId;
/** 仓库ID */ /** 仓库ID */
@Excel(name = "${search.ViewStockSecure.warehouseId}") // @Excel(name = "${search.ViewStockSecure.warehouseId}")
private String warehouseId; private String warehouseId;
/** 垛型ID */ /** 垛型ID */
@Excel(name = "${search.ViewStockSecure.stackingId}") // @Excel(name = "${search.ViewStockSecure.stackingId}")
private String stackingId; private String stackingId;
/** 库存预警标识 */ /** 库存预警标识 */
@Excel(name = "${search.ViewStockSecure.spare1}") // @Excel(name = "${search.ViewStockSecure.spare1}")
private String spare1; private String spare1;
/** $column.columnComment */ /** $column.columnComment */
@@ -115,30 +119,30 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "${search.ViewStockSecure.productId}") @Excel(name = "${search.ViewStockSecure.productId}")
private String productId; private String productId;
/** 仓库名称 */ /** 物料名称 */
@Excel(name = "${search.ViewStockSecure.warehouseName}") @Excel(name = "${search.ViewStockSecure.productName}")
private String warehouseName; private String productName;
/** 英文名称 */
@Excel(name = "${search.ViewStockSecure.enName}")
private String enName;
/** 仓库地址 */ /** 仓库地址 */
@Excel(name = "${search.ViewStockSecure.address}") // @Excel(name = "${search.ViewStockSecure.address}")
private String address; private String address;
/** 仓库描述 */ /** 仓库描述 */
@Excel(name = "${search.ViewStockSecure.cDesc}") // @Excel(name = "${search.ViewStockSecure.cDesc}")
private String cDesc; private String cDesc;
/** 仓库级别 */ /** 仓库级别 */
@Excel(name = "${search.ViewStockSecure.warehouseKind}") // @Excel(name = "${search.ViewStockSecure.warehouseKind}")
private String warehouseKind; private String warehouseKind;
/** 仓库类型 */ /** 仓库类型 */
@Excel(name = "${search.ViewStockSecure.warehouseType}") // @Excel(name = "${search.ViewStockSecure.warehouseType}")
private String warehouseType; private String warehouseType;
/** 是否可用 */
@Excel(name = "${search.ViewStockSecure.isCurrent}")
private String isCurrent;
/** 价格 */ /** 价格 */
@Excel(name = "${search.ViewStockSecure.price}") @Excel(name = "${search.ViewStockSecure.price}")
private String price; private String price;
@@ -147,13 +151,13 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "${search.ViewStockSecure.unit}") @Excel(name = "${search.ViewStockSecure.unit}")
private String unit; private String unit;
/** 规格 */ /** 是否可用 */
@Excel(name = "${search.ViewStockSecure.spec}") // @Excel(name = "${search.ViewStockSecure.isCurrent}")
private String spec; private String isCurrent;
/** 英文名称 */ /** 规格 */
@Excel(name = "${search.ViewStockSecure.enName}") // @Excel(name = "${search.ViewStockSecure.spec}")
private String enName; private String spec;
/** 单件净重 */ /** 单件净重 */
@Excel(name = "${search.ViewStockSecure.weight}") @Excel(name = "${search.ViewStockSecure.weight}")
@@ -175,72 +179,69 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "${search.ViewStockSecure.volume}") @Excel(name = "${search.ViewStockSecure.volume}")
private String volume; private String volume;
/** 物料名称 */
@Excel(name = "${search.ViewStockSecure.productName}")
private String productName;
/** 货位名称 */ /** 货位名称 */
@Excel(name = "${search.ViewStockSecure.cargoSpaceName}") @Excel(name = "${search.ViewStockSecure.cargoSpaceName}")
private String cargoSpaceName; private String cargoSpaceName;
/** 巷道ID */ /** 巷道ID */
@Excel(name = "${search.ViewStockSecure.roadwayId}") // @Excel(name = "${search.ViewStockSecure.roadwayId}")
private String roadwayId; private String roadwayId;
/** 货区ID */ /** 货区ID */
@Excel(name = "${search.ViewStockSecure.cargoAreaId}") // @Excel(name = "${search.ViewStockSecure.cargoAreaId}")
private String cargoAreaId; private String cargoAreaId;
/** 货位类型 */ /** 货位类型 */
@Excel(name = "${search.ViewStockSecure.theType}") // @Excel(name = "${search.ViewStockSecure.theType}")
private String theType; private String theType;
/** 货位类型名称 */ /** 货位类型名称 */
@Excel(name = "${search.ViewStockSecure.theTypeName}") // @Excel(name = "${search.ViewStockSecure.theTypeName}")
private String theTypeName; private String theTypeName;
/** 排 */ /** 排 */
@Excel(name = "${search.ViewStockSecure.thePlatoon}") // @Excel(name = "${search.ViewStockSecure.thePlatoon}")
private Long thePlatoon; private Long thePlatoon;
/** 列 */ /** 列 */
@Excel(name = "${search.ViewStockSecure.theColumn}") // @Excel(name = "${search.ViewStockSecure.theColumn}")
private Long theColumn; private Long theColumn;
/** 层 */ /** 层 */
@Excel(name = "${search.ViewStockSecure.theFloor}") // @Excel(name = "${search.ViewStockSecure.theFloor}")
private Long theFloor; private Long theFloor;
/** 货位状态 */ /** 货位状态 */
@Excel(name = "${search.ViewStockSecure.cargoStatus}") @Excel(name = "${search.ViewStockSecure.cargoStatus}",dictType = "cargo_space_status")
private String cargoStatus; private String cargoStatus;
/** 是否锁定 */ /** 是否锁定 */
@Excel(name = "${search.ViewStockSecure.locked}") @Excel(name = "${search.ViewStockSecure.locked}",dictType = "cargo_space_lock_status")
private String locked; private String locked;
/** 货位高度 */ /** 货位高度 */
@Excel(name = "${search.ViewStockSecure.cargoHight}") // @Excel(name = "${search.ViewStockSecure.cargoHight}")
private String cargoHight; private String cargoHight;
/** 是否双伸 */ /** 是否双伸 */
@Excel(name = "${search.ViewStockSecure.issDouble}") // @Excel(name = "${search.ViewStockSecure.issDouble}")
private String issDouble; private String issDouble;
/** 双货位分组编码 */ /** 双货位分组编码 */
@Excel(name = "${search.ViewStockSecure.groupCodingNo}") // @Excel(name = "${search.ViewStockSecure.groupCodingNo}")
private String groupCodingNo; private String groupCodingNo;
/** 双货位分组编码 */ /** 双货位分组编码 */
@Excel(name = "${search.ViewStockSecure.groupCoding}") // @Excel(name = "${search.ViewStockSecure.groupCoding}")
private String groupCoding; private String groupCoding;
/** 双货位标识 */ /** 双货位标识 */
@Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}") // @Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}")
private String cargoSpaceLogo; private String cargoSpaceLogo;
/** 本仓库区域 */ /** 本仓库区域 */
@Excel(name = "${search.ViewStockSecure.thisCargoArea}") // @Excel(name = "${search.ViewStockSecure.thisCargoArea}")
private String thisCargoArea; private String thisCargoArea;
public void setStockId(String stockId) public void setStockId(String stockId)

127
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java
View File

@@ -15,81 +15,85 @@ public class ViewStockWarning extends BaseEntity
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 仓库名称 */
@Excel(name = "${search.ViewStockSecure.warehouseName}")
private String warehouseName;
/** 库存ID */ /** 库存ID */
// @Excel(name = "库存ID") @Excel(name = "${search.ViewStockSecure.stockId}")
@Excel(name = "${search.ViewStockWarning.stockId}")
private String stockId; private String stockId;
/** 货位ID */ /** 货位ID */
@Excel(name = "${search.ViewStockWarning.cargoSpaceId}") @Excel(name = "${search.ViewStockSecure.cargoSpaceId}")
private String cargoSpaceId; private String cargoSpaceId;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "${search.ViewStockWarning.stockStatus}") @Excel(name = "${search.ViewStockSecure.stockStatus}",dictType = "stock_status")
private String stockStatus; private String stockStatus;
/** 物料状态 */ /** 物料状态 */
@Excel(name = "${search.ViewStockWarning.productStatus}") @Excel(name = "${search.ViewStockSecure.productStatus}",dictType = "product_status")
private String productStatus; private String productStatus;
/** 批次号 */ /** 批次号 */
@Excel(name = "${search.ViewStockWarning.lotNo}") // @Excel(name = "${search.ViewStockSecure.lotNo}")
private String lotNo; private String lotNo;
/** 入库时间 */ /** 入库时间 */
@Excel(name = "${search.ViewStockWarning.inDate}") @Excel(name = "${search.ViewStockSecure.inDate}")
private String inDate; private String inDate;
/** 回流时间 */ /** 回流时间 */
@Excel(name = "${search.ViewStockWarning.backDate}") // @Excel(name = "${search.ViewStockSecure.backDate}")
private String backDate; private String backDate;
/** 物料GUID */ /** 物料GUID */
@Excel(name = "${search.ViewStockWarning.productGuid}") // @Excel(name = "${search.ViewStockSecure.productGuid}")
private String productGuid; private String productGuid;
/** 库存数量 */ /** 库存数量 */
@Excel(name = "${search.ViewStockWarning.quantity}") @Excel(name = "${search.ViewStockSecure.quantity}")
private String quantity; private String quantity;
/** 作业ID */ /** 作业ID */
@Excel(name = "${search.ViewStockWarning.jobId}") @Excel(name = "${search.ViewStockSecure.jobId}")
private String jobId; private String jobId;
/** 托盘条码 */ /** 托盘条码 */
@Excel(name = "${search.ViewStockWarning.trayCode}") @Excel(name = "${search.ViewStockSecure.trayCode}")
private String trayCode; private String trayCode;
/** 出库数量 */ /** 出库数量 */
@Excel(name = "${search.ViewStockWarning.outQuantity}") // @Excel(name = "${search.ViewStockSecure.outQuantity}")
private String outQuantity; private String outQuantity;
/** 入库子单ID */ /** 入库子单ID */
@Excel(name = "${search.ViewStockWarning.stockinDetailId}") @Excel(name = "${search.ViewStockSecure.stockinDetailId}")
private String stockinDetailId; private String stockinDetailId;
/** 入库主单 */ /** 入库主单 */
@Excel(name = "${search.ViewStockWarning.stockinId}") @Excel(name = "${search.ViewStockSecure.stockinId}")
private String stockinId; private String stockinId;
/** 入库类型 */ /** 入库类型 */
@Excel(name = "${search.ViewStockWarning.inType}") @Excel(name = "${search.ViewStockSecure.inType}",dictType = "in_job_type")
private String inType; private String inType;
/** 入库班组ID */ /** 入库班组ID */
@Excel(name = "${search.ViewStockWarning.inClassId}") // @Excel(name = "${search.ViewStockSecure.inClassId}")
private String inClassId; private String inClassId;
/** 仓库ID */ /** 仓库ID */
@Excel(name = "${search.ViewStockWarning.warehouseId}") // @Excel(name = "${search.ViewStockSecure.warehouseId}")
private String warehouseId; private String warehouseId;
/** 垛型ID */ /** 垛型ID */
@Excel(name = "${search.ViewStockWarning.stackingId}") // @Excel(name = "${search.ViewStockSecure.stackingId}")
private String stackingId; private String stackingId;
/** 库存预警标识 */ /** 库存预警标识 */
@Excel(name = "${search.ViewStockWarning.spare1}") // @Excel(name = "${search.ViewStockSecure.spare1}")
private String spare1; private String spare1;
/** $column.columnComment */ /** $column.columnComment */
@@ -113,135 +117,132 @@ public class ViewStockWarning extends BaseEntity
private String spare6; private String spare6;
/** 物料ID */ /** 物料ID */
@Excel(name = "${search.ViewStockWarning.productId}") @Excel(name = "${search.ViewStockSecure.productId}")
private String productId; private String productId;
/** 仓库名称 */ /** 物料名称 */
@Excel(name = "${search.ViewStockWarning.warehouseName}") @Excel(name = "${search.ViewStockSecure.productName}")
private String warehouseName; private String productName;
/** 英文名称 */
@Excel(name = "${search.ViewStockSecure.enName}")
private String enName;
/** 仓库地址 */ /** 仓库地址 */
@Excel(name = "${search.ViewStockWarning.address}") // @Excel(name = "${search.ViewStockSecure.address}")
private String address; private String address;
/** 仓库描述 */ /** 仓库描述 */
@Excel(name = "${search.ViewStockWarning.cDesc}") // @Excel(name = "${search.ViewStockSecure.cDesc}")
private String cDesc; private String cDesc;
/** 仓库级别 */ /** 仓库级别 */
@Excel(name = "${search.ViewStockWarning.warehouseKind}") // @Excel(name = "${search.ViewStockSecure.warehouseKind}")
private String warehouseKind; private String warehouseKind;
/** 仓库类型 */ /** 仓库类型 */
@Excel(name = "${search.ViewStockWarning.warehouseType}") // @Excel(name = "${search.ViewStockSecure.warehouseType}")
private String warehouseType; private String warehouseType;
/** 是否可用 */
@Excel(name = "${search.ViewStockWarning.isCurrent}")
private String isCurrent;
/** 价格 */ /** 价格 */
@Excel(name = "${search.ViewStockWarning.price}") @Excel(name = "${search.ViewStockSecure.price}")
private String price; private String price;
/** 单位 */ /** 单位 */
@Excel(name = "${search.ViewStockWarning.unit}") @Excel(name = "${search.ViewStockSecure.unit}")
private String unit; private String unit;
/** 是否可用 */
// @Excel(name = "${search.ViewStockSecure.isCurrent}")
private String isCurrent;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewStockWarning.spec}") // @Excel(name = "${search.ViewStockSecure.spec}")
private String spec; private String spec;
/** 英文名称 */
@Excel(name = "${search.ViewStockWarning.enName}")
private String enName;
/** 单件净重 */ /** 单件净重 */
@Excel(name = "${search.ViewStockWarning.weight}") @Excel(name = "${search.ViewStockSecure.weight}")
private String weight; private String weight;
/** 长MM */ /** 长MM */
@Excel(name = "${search.ViewStockWarning.longMM}") @Excel(name = "${search.ViewStockSecure.longMM}")
private String longMM; private String longMM;
/** 宽MM */ /** 宽MM */
@Excel(name = "${search.ViewStockWarning.wide}") @Excel(name = "${search.ViewStockSecure.wide}")
private String wide; private String wide;
/** 高MM */ /** 高MM */
@Excel(name = "${search.ViewStockWarning.hight}") @Excel(name = "${search.ViewStockSecure.hight}")
private String hight; private String hight;
/** 体积m³ */ /** 体积m³ */
@Excel(name = "${search.ViewStockWarning.volume}") @Excel(name = "${search.ViewStockSecure.volume}")
private String volume; private String volume;
/** 物料名称 */
@Excel(name = "${search.ViewStockWarning.productName}")
private String productName;
/** 货位名称 */ /** 货位名称 */
@Excel(name = "${search.ViewStockWarning.cargoSpaceName}") @Excel(name = "${search.ViewStockSecure.cargoSpaceName}")
private String cargoSpaceName; private String cargoSpaceName;
/** 巷道ID */ /** 巷道ID */
@Excel(name = "${search.ViewStockWarning.roadwayId}") // @Excel(name = "${search.ViewStockSecure.roadwayId}")
private String roadwayId; private String roadwayId;
/** 货区ID */ /** 货区ID */
@Excel(name = "${search.ViewStockWarning.cargoAreaId}") // @Excel(name = "${search.ViewStockSecure.cargoAreaId}")
private String cargoAreaId; private String cargoAreaId;
/** 货位类型 */ /** 货位类型 */
@Excel(name = "${search.ViewStockWarning.theType}") // @Excel(name = "${search.ViewStockSecure.theType}")
private String theType; private String theType;
/** 货位类型名称 */ /** 货位类型名称 */
@Excel(name = "${search.ViewStockWarning.theTypeName}") // @Excel(name = "${search.ViewStockSecure.theTypeName}")
private String theTypeName; private String theTypeName;
/** 排 */ /** 排 */
@Excel(name = "${search.ViewStockWarning.thePlatoon}") // @Excel(name = "${search.ViewStockSecure.thePlatoon}")
private Long thePlatoon; private Long thePlatoon;
/** 列 */ /** 列 */
@Excel(name = "${search.ViewStockWarning.theColumn}") // @Excel(name = "${search.ViewStockSecure.theColumn}")
private Long theColumn; private Long theColumn;
/** 层 */ /** 层 */
@Excel(name = "${search.ViewStockWarning.theFloor}") // @Excel(name = "${search.ViewStockSecure.theFloor}")
private Long theFloor; private Long theFloor;
/** 货位状态 */ /** 货位状态 */
@Excel(name = "${search.ViewStockWarning.cargoStatus}") @Excel(name = "${search.ViewStockSecure.cargoStatus}",dictType = "cargo_space_status")
private String cargoStatus; private String cargoStatus;
/** 是否锁定 */ /** 是否锁定 */
@Excel(name = "${search.ViewStockWarning.locked}") @Excel(name = "${search.ViewStockSecure.locked}",dictType = "cargo_space_lock_status")
private String locked; private String locked;
/** 货位高度 */ /** 货位高度 */
@Excel(name = "${search.ViewStockWarning.cargoHight}") // @Excel(name = "${search.ViewStockSecure.cargoHight}")
private String cargoHight; private String cargoHight;
/** 是否双伸 */ /** 是否双伸 */
@Excel(name = "${search.ViewStockWarning.issDouble}") // @Excel(name = "${search.ViewStockSecure.issDouble}")
private String issDouble; private String issDouble;
/** 双货位分组编码 */ /** 双货位分组编码 */
@Excel(name = "${search.ViewStockWarning.groupCodingNo}") // @Excel(name = "${search.ViewStockSecure.groupCodingNo}")
private String groupCodingNo; private String groupCodingNo;
/** 双货位分组编码 */ /** 双货位分组编码 */
@Excel(name = "${search.ViewStockWarning.groupCoding}") // @Excel(name = "${search.ViewStockSecure.groupCoding}")
private String groupCoding; private String groupCoding;
/** 双货位标识 */ /** 双货位标识 */
@Excel(name = "${search.ViewStockWarning.cargoSpaceLogo}") // @Excel(name = "${search.ViewStockSecure.cargoSpaceLogo}")
private String cargoSpaceLogo; private String cargoSpaceLogo;
/** 本仓库区域 */ /** 本仓库区域 */
@Excel(name = "${search.ViewStockWarning.thisCargoArea}") // @Excel(name = "${search.ViewStockSecure.thisCargoArea}")
private String thisCargoArea; private String thisCargoArea;
public void setStockId(String stockId) public void setStockId(String stockId)

32
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java
View File

@@ -16,7 +16,7 @@ public class ViewStockinHistory extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 入库单guid */ /** 入库单guid */
@Excel(name = "${search.ViewStockinHistory.stockinGuid}") // @Excel(name = "${search.ViewStockinHistory.stockinGuid}")
private String stockinGuid; private String stockinGuid;
/** 入库单号 */ /** 入库单号 */
@@ -24,7 +24,7 @@ public class ViewStockinHistory extends BaseEntity
private String stockinId; private String stockinId;
/** 入库类型 */ /** 入库类型 */
@Excel(name = "${search.ViewStockinHistory.inType}") @Excel(name = "${search.ViewStockinHistory.inType}",dictType = "in_job_type")
private String inType; private String inType;
/** 创建时间 */ /** 创建时间 */
@@ -36,7 +36,7 @@ public class ViewStockinHistory extends BaseEntity
private String createManId; private String createManId;
/** 单据状态 */ /** 单据状态 */
@Excel(name = "${search.ViewStockinHistory.status}") @Excel(name = "${search.ViewStockinHistory.status}",dictType = "in_bill_status")
private String status; private String status;
/** 仓库ID */ /** 仓库ID */
@@ -48,7 +48,7 @@ public class ViewStockinHistory extends BaseEntity
private String finishDate; private String finishDate;
/** ERP单号 */ /** ERP单号 */
@Excel(name = "${search.ViewStockinHistory.erpBill}") // @Excel(name = "${search.ViewStockinHistory.erpBill}")
private String erpBill; private String erpBill;
/** 单据来源 */ /** 单据来源 */
@@ -60,7 +60,7 @@ public class ViewStockinHistory extends BaseEntity
private String departmentNo; private String departmentNo;
/** 班组编码 */ /** 班组编码 */
@Excel(name = "${search.ViewStockinHistory.classNo}") // @Excel(name = "${search.ViewStockinHistory.classNo}")
private String classNo; private String classNo;
/** 供应商编号 */ /** 供应商编号 */
@@ -91,7 +91,7 @@ public class ViewStockinHistory extends BaseEntity
private String stockinDetailId; private String stockinDetailId;
/** 批次号 */ /** 批次号 */
@Excel(name = "${search.ViewStockinHistory.lotNo}") // @Excel(name = "${search.ViewStockinHistory.lotNo}")
private String lotNo; private String lotNo;
/** 计划数量 */ /** 计划数量 */
@@ -99,11 +99,11 @@ public class ViewStockinHistory extends BaseEntity
private String quantity; private String quantity;
/** 计划箱数 */ /** 计划箱数 */
@Excel(name = "${search.ViewStockinHistory.quantityX}") // @Excel(name = "${search.ViewStockinHistory.quantityX}")
private String quantityX; private String quantityX;
/** 计划件数 */ /** 计划件数 */
@Excel(name = "${search.ViewStockinHistory.quantityJ}") // @Excel(name = "${search.ViewStockinHistory.quantityJ}")
private String quantityJ; private String quantityJ;
/** 实际数量 */ /** 实际数量 */
@@ -111,11 +111,11 @@ public class ViewStockinHistory extends BaseEntity
private String assignNum; private String assignNum;
/** 实际箱数 */ /** 实际箱数 */
@Excel(name = "${search.ViewStockinHistory.assignNumX}") // @Excel(name = "${search.ViewStockinHistory.assignNumX}")
private String assignNumX; private String assignNumX;
/** 实际件数 */ /** 实际件数 */
@Excel(name = "${search.ViewStockinHistory.assignNumJ}") // @Excel(name = "${search.ViewStockinHistory.assignNumJ}")
private String assignNumJ; private String assignNumJ;
/** 扫码数量 */ /** 扫码数量 */
@@ -123,23 +123,23 @@ public class ViewStockinHistory extends BaseEntity
private String scanNum; private String scanNum;
/** 扫码箱数 */ /** 扫码箱数 */
@Excel(name = "${search.ViewStockinHistory.scanNumX}") // @Excel(name = "${search.ViewStockinHistory.scanNumX}")
private String scanNumX; private String scanNumX;
/** 扫码件数 */ /** 扫码件数 */
@Excel(name = "${search.ViewStockinHistory.scanNumJ}") // @Excel(name = "${search.ViewStockinHistory.scanNumJ}")
private String scanNumJ; private String scanNumJ;
/** 入库日期 */ /** 入库日期 */
@Excel(name = "${search.ViewStockinHistory.printDate}") // @Excel(name = "${search.ViewStockinHistory.printDate}")
private String printDate; private String printDate;
/** 库存状态 */ /** 库存状态 */
@Excel(name = "${search.ViewStockinHistory.stockStatus}") // @Excel(name = "${search.ViewStockinHistory.stockStatus}",dictType = "stock_status")
private String stockStatus; private String stockStatus;
/** 单价 */ /** 单价 */
@Excel(name = "${search.ViewStockinHistory.price}") // @Excel(name = "${search.ViewStockinHistory.price}")
private String price; private String price;
/** 物料编码 */ /** 物料编码 */
@@ -155,7 +155,7 @@ public class ViewStockinHistory extends BaseEntity
private String unit; private String unit;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewStockinHistory.spec}") // @Excel(name = "${search.ViewStockinHistory.spec}")
private String spec; private String spec;
/** 英文名称 */ /** 英文名称 */

37
ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java
View File

@@ -17,36 +17,34 @@ public class ViewStockoutHistory extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 出库单号 */ /** 出库单号 */
@Excel(name = "${search.ViewStockoutHistory.stockoutId}") // @Excel(name = "${search.ViewStockoutHistory.stockoutId}")
private String stockoutId; private String stockoutId;
/** 仓库ID */ /** 仓库ID */
@Excel(name = "${search.ViewStockoutHistory.warehouseId}") // @Excel(name = "${search.ViewStockoutHistory.warehouseId}")
private String warehouseId; private String warehouseId;
/** 出库类型 */ /** 出库类型 */
@Excel(name = "${search.ViewStockoutHistory.outType}") // @Excel(name = "${search.ViewStockoutHistory.outType}")
private String outType; private String outType;
/** 创建日期 */ /** 创建日期 */
@Excel(name = "${search.ViewStockoutHistory.createDate}") // @Excel(name = "${search.ViewStockoutHistory.createDate}")
private String createDate; private String createDate;
/** 创建人ID */ /** 创建人ID */
@Excel(name = "${search.ViewStockoutHistory.createManId}") // @Excel(name = "${search.ViewStockoutHistory.createManId}")
private String createManId; private String createManId;
/** 出库状态 */ /** 出库状态 */
@Excel(name = "${search.ViewStockoutHistory.status}") // @Excel(name = "${search.ViewStockoutHistory.status}")
private String status; private String status;
/** 出库来源 */ /** 出库来源 */
@Excel(name = "${search.ViewStockoutHistory.stockoutSource}") // @Excel(name = "${search.ViewStockoutHistory.stockoutSource}")
private String stockoutSource; private String stockoutSource;
/** 出口类型 */
@Excel(name = "${search.ViewStockoutHistory.exitId}")
private String exitId;
/** 出库明细ID */ /** 出库明细ID */
@Excel(name = "${search.ViewStockoutHistory.stockoutDetailId}") @Excel(name = "${search.ViewStockoutHistory.stockoutDetailId}")
@@ -60,8 +58,12 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "${search.ViewStockoutHistory.productName}") @Excel(name = "${search.ViewStockoutHistory.productName}")
private String productName; private String productName;
/** 出口类型 */
@Excel(name = "${search.ViewStockoutHistory.exitId}")
private String exitId;
/** 批次号 */ /** 批次号 */
@Excel(name = "${search.ViewStockoutHistory.lotNo}") // @Excel(name = "${search.ViewStockoutHistory.lotNo}")
private String lotNo; private String lotNo;
/** 出库数量 */ /** 出库数量 */
@@ -77,11 +79,11 @@ public class ViewStockoutHistory extends BaseEntity
private BigDecimal assignNum; private BigDecimal assignNum;
/** ERP出库单ID */ /** ERP出库单ID */
@Excel(name = "${search.ViewStockoutHistory.erpStockoutId}") // @Excel(name = "${search.ViewStockoutHistory.erpStockoutId}")
private String erpStockoutId; private String erpStockoutId;
/** 客户编号 */ /** 客户编号 */
@Excel(name = "${search.ViewStockoutHistory.entryid}") // @Excel(name = "${search.ViewStockoutHistory.entryid}")
private String entryid; private String entryid;
/** 客户名称 */ /** 客户名称 */
@@ -89,17 +91,13 @@ public class ViewStockoutHistory extends BaseEntity
private String customerName; private String customerName;
/** 规格 */ /** 规格 */
@Excel(name = "${search.ViewStockoutHistory.spec}") // @Excel(name = "${search.ViewStockoutHistory.spec}")
private String spec; private String spec;
/** 单位 */ /** 单位 */
@Excel(name = "${search.ViewStockoutHistory.unit}") @Excel(name = "${search.ViewStockoutHistory.unit}")
private String unit; private String unit;
/** 价格 */
@Excel(name = "${search.ViewStockoutHistory.price}")
private String price;
/** 英文名称 */ /** 英文名称 */
@Excel(name = "${search.ViewStockoutHistory.spare1}") @Excel(name = "${search.ViewStockoutHistory.spare1}")
private String spare1; private String spare1;
@@ -123,6 +121,9 @@ public class ViewStockoutHistory extends BaseEntity
/** 体积m³ */ /** 体积m³ */
@Excel(name = "${search.ViewStockoutHistory.spare8}") @Excel(name = "${search.ViewStockoutHistory.spare8}")
private String spare8; private String spare8;
/** 价格 */
@Excel(name = "${search.ViewStockoutHistory.price}")
private String price;
/** 备注 */ /** 备注 */
@Excel(name = "${search.ViewStockoutHistory.remark}") @Excel(name = "${search.ViewStockoutHistory.remark}")

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

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/** /**
* 库存冻结记录对象 bas_stock_freeze_record * 库存冻结记录对象 bas_stock_freeze_record
* *
@@ -19,7 +21,7 @@ public class BasStockFreezeRecord extends BaseEntity
private String whGuid; private String whGuid;
/** 库存编码 */ /** 库存编码 */
@Excel(name = "${stock.Freeze.stockId}") // @Excel(name = "${stock.Freeze.stockId}")
private String stockId; private String stockId;
/** 货位编码 */ /** 货位编码 */
@@ -34,57 +36,71 @@ public class BasStockFreezeRecord extends BaseEntity
private String trayCode; private String trayCode;
/** 物品编码 */ /** 物品编码 */
@Excel(name = "${stock.Freeze.productId}") // @Excel(name = "${stock.Freeze.productId}")
private String productId; private String productId;
/** 物品名称 */ /** 物品名称 */
@Excel(name = "${stock.Freeze.productName}") // @Excel(name = "${stock.Freeze.productName}")
private String productName; private String productName;
/** 生产日期 */ /** 生产日期 */
@Excel(name = "${stock.Freeze.printDate}") // @Excel(name = "${stock.Freeze.printDate}")
private String printDate; private String printDate;
/** 批号 */ /** 批号 */
@Excel(name = "${stock.Freeze.lotNo}") // @Excel(name = "${stock.Freeze.lotNo}")
private String lotNo; private String lotNo;
/** 初始状态 */ /** 初始状态 */
@Excel(name = "${stock.Freeze.oldStatus}") @Excel(name = "${stock.Freeze.oldStatus}",dictType="stock_status")
private String oldStatus; private String oldStatus;
/** 更改状态 */ /** 更改状态 */
@Excel(name = "${stock.Freeze.currStatus}") @Excel(name = "${stock.Freeze.currStatus}",dictType="stock_status")
private String currStatus; private String currStatus;
/** 操作 */ /** 操作 */
@Excel(name = "${stock.Freeze.method}") // @Excel(name = "${stock.Freeze.method}")
private String method; private String method;
/** 仓库 */ /** 仓库 */
@Excel(name = "${stock.Freeze.warehouseId}") @Excel(name = "${stock.Freeze.warehouseId}")
private String warehouseId;
private String warehouseName; private String warehouseName;
private String warehouseId;
/** 库存字表id */ /** 库存字表id */
@Excel(name = "${stock.Freeze.stockDetailId}") // @Excel(name = "${stock.Freeze.stockDetailId}")
private String stockDetailId; private String stockDetailId;
/** 操作目标 */ /** 操作目标 */
@Excel(name = "${stock.Freeze.operatingTarget}") // @Excel(name = "${stock.Freeze.operatingTarget}")
private String operatingTarget; private String operatingTarget;
/** 条码数量（旧） */ /** 条码数量（旧） */
@Excel(name = "${stock.Freeze.barCodeOldQuantity}") // @Excel(name = "${stock.Freeze.barCodeOldQuantity}")
private String barCodeOldQuantity; private String barCodeOldQuantity;
/** 条码数量（新） */ /** 条码数量（新） */
@Excel(name = "${stock.Freeze.barCodeQuantity}") // @Excel(name = "${stock.Freeze.barCodeQuantity}")
private String barCodeQuantity; private String barCodeQuantity;
/** 物料guid */ /** 物料guid */
@Excel(name = "${stock.Freeze.productGuid}") // @Excel(name = "${stock.Freeze.productGuid}")
private String productGuid; private String productGuid;
// 创建时间
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getWarehouseName() { public String getWarehouseName() {
return warehouseName; return warehouseName;

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

@@ -1,10 +1,13 @@
package com.ruoyi.stock.maintain.domain; package com.ruoyi.stock.maintain.domain;
import kotlin.Suppress;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
/** /**
* 库存操作记录对象 bas_stock_maintain_record * 库存操作记录对象 bas_stock_maintain_record
* *
@@ -42,11 +45,11 @@ public class BasStockMaintainRecord extends BaseEntity
private String productName; private String productName;
/** 生产日期 */ /** 生产日期 */
@Excel(name = "${stock.Maintain.printDate}") // @Excel(name = "${stock.Maintain.printDate}")
private String printDate; private String printDate;
/** 批号 */ /** 批号 */
@Excel(name = "${stock.Maintain.lotNo}") // @Excel(name = "${stock.Maintain.lotNo}")
private String lotNo; private String lotNo;
/** 初始数量 */ /** 初始数量 */
@@ -58,34 +61,48 @@ public class BasStockMaintainRecord extends BaseEntity
private String quantity; private String quantity;
/** 操作 */ /** 操作 */
@Excel(name = "${stock.Maintain.method}") @Excel(name = "${stock.Maintain.method}", dictType="stock_maintain_method")
private String method; private String method;
/** 仓库 */ /** 仓库 */
@Excel(name = "${stock.Maintain.warehouseId}") @Excel(name = "${stock.Maintain.warehouseId}")
private String warehouseId;
private String warehouseName; private String warehouseName;
private String warehouseId;
@Excel(name = "${stock.Maintain.createTime}", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 30)
private Date createTime;
@Override
public Date getCreateTime() {
return createTime;
}
@Override
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/** 库存字表id */ /** 库存字表id */
@Excel(name = "${stock.Maintain.stockDetailId}") // @Excel(name = "${stock.Maintain.stockDetailId}")
private String stockDetailId; private String stockDetailId;
/** 操作目标 */ /** 操作目标 */
@Excel(name = "${stock.Maintain.operatingTarget}") // @Excel(name = "${stock.Maintain.operatingTarget}")
private String operatingTarget; private String operatingTarget;
/** 条码数量（旧） */ /** 条码数量（旧） */
@Excel(name = "${stock.Maintain.barCodeOldQuantity}") // @Excel(name = "${stock.Maintain.barCodeOldQuantity}")
private String barCodeOldQuantity; private String barCodeOldQuantity;
/** 条码数量（新） */ /** 条码数量（新） */
@Excel(name = "${stock.Maintain.barCodeQuantity}") // @Excel(name = "${stock.Maintain.barCodeQuantity}")
private String barCodeQuantity; private String barCodeQuantity;
/** 物料guid */ /** 物料guid */
@Excel(name = "${stock.Maintain.productGuid}") // @Excel(name = "${stock.Maintain.productGuid}")
private String productGuid; private String productGuid;
public String getWarehouseName() { public String getWarehouseName() {
return warehouseName; return warehouseName;
} }

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@@ -99,7 +99,6 @@ public class SysLoginController
public AjaxResult changeLanguage(String lang) public AjaxResult changeLanguage(String lang)
{ {
return AjaxResult.success(); return AjaxResult.success();
} }
} }

22
ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
View File

@@ -41,7 +41,7 @@ no.view.permission=您没有查看数据的权限，请联系管理员添加权
#返回信息国际化 #返回信息国际化
ajax.result.success=操作成功 ajax.result.success=操作成功
ajax.result.fail=操作失败 ajax.result.fail=操作失败
table.result.success=查询成功 table.result.success=query success
#2wms message #2wms message
2wms.result1=作业请求成功 2wms.result1=作业请求成功
@@ -96,6 +96,8 @@ error.message29=未质检完成
error.message30=无质检信息 error.message30=无质检信息
error.message31=此起点无料架，请检查 error.message31=此起点无料架，请检查
stock.Maintain.createTime=Create Time
#ViewStockWarning #ViewStockWarning
search.ViewStockWarning.stockId=Stock ID search.ViewStockWarning.stockId=Stock ID
search.ViewStockWarning.cargoSpaceId=Cargo Space ID search.ViewStockWarning.cargoSpaceId=Cargo Space ID
@@ -583,16 +585,17 @@ bas.Product.price=Price
bas.Product.cargoNo=Brand bas.Product.cargoNo=Brand
bas.Product.unit=Unit bas.Product.unit=Unit
bas.Product.spec=Specification bas.Product.spec=Specification
bas.Product.spare1=Spare Field 1 bas.Product.spare1=English Description
bas.Product.spare2=Spare Field 2 bas.Product.spare2=Net Weight
bas.Product.spare3=Spare Field 3 bas.Product.spare3=Spare Field 3
bas.Product.spare4=Spare Field 4 bas.Product.spare4=Spare Field 4
bas.Product.spare5=Spare Field 5 bas.Product.spare5=Length
bas.Product.spare6=Spare Field 6 bas.Product.spare6=Width
bas.Product.spare7=Spare Field 7 bas.Product.spare7=Height
bas.Product.spare8=Spare Field 8 bas.Product.spare8=Volume
bas.Product.spare9=Spare Field 9 bas.Product.spare9=Spare Field 9
bas.Product.productName=Product Name bas.Product.productName=Product Name
bas.Product.remark=remark
# BasProductPort Export Fields # BasProductPort Export Fields
bas.ProductPort.portName=Port Name bas.ProductPort.portName=Port Name
@@ -615,7 +618,7 @@ bas.TraycodeFormat.serialExample=Barcode Example
bas.TraycodeFormat.remarks=Description bas.TraycodeFormat.remarks=Description
bas.TraycodeFormat.minNum=Minimum Serial Number bas.TraycodeFormat.minNum=Minimum Serial Number
bas.TraycodeFormat.maxNum=Maximum Serial Number bas.TraycodeFormat.maxNum=Maximum Serial Number
bas.TraycodeFormat.spare1=Spare Field 1 bas.TraycodeFormat.spare1=specifications
bas.TraycodeFormat.spare2=Spare Field 2 bas.TraycodeFormat.spare2=Spare Field 2
bas.TraycodeFormat.spare3=Spare Field 3 bas.TraycodeFormat.spare3=Spare Field 3
@@ -639,7 +642,8 @@ bas.Warehouse.warehouseType=Warehouse Type
bas.Warehouse.isCurrent=Is Available bas.Warehouse.isCurrent=Is Available
# BasCargoSpace Export Fields # BasCargoSpace Export Fields
bas.CargoSpace.warehouseId=Warehouse ID bas.CargoSpace.cargoSpaceId=Cargo Space Id
bas.CargoSpace.warehouseId=Warehouse
bas.CargoSpace.roadwayId=Roadway ID bas.CargoSpace.roadwayId=Roadway ID
bas.CargoSpace.cargoAreaId=Cargo Area ID bas.CargoSpace.cargoAreaId=Cargo Area ID
bas.CargoSpace.theType=Cargo Type bas.CargoSpace.theType=Cargo Type

29
ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties
View File

@@ -60,6 +60,7 @@ warn.message9=请选择仓库
warn.message10=请选择提供绑定数量 warn.message10=请选择提供绑定数量
warn.message11=请选择绑定容器 warn.message11=请选择绑定容器
warn.message12=绑定数量不能大于实际数量 warn.message12=绑定数量不能大于实际数量
warn.message13=任务未开始
#error message #error message
error.message1=托盘码不能为空 error.message1=托盘码不能为空
@@ -94,6 +95,8 @@ error.message29=未质检完成
error.message30=无质检信息 error.message30=无质检信息
error.message31=此起点无料架，请检查 error.message31=此起点无料架，请检查
stock.Maintain.createTime=创建时间
#ViewStockWarning #ViewStockWarning
search.ViewStockWarning.stockId=库存ID search.ViewStockWarning.stockId=库存ID
search.ViewStockWarning.cargoSpaceId=货位ID search.ViewStockWarning.cargoSpaceId=货位ID
@@ -204,11 +207,11 @@ search.ViewStockSecure.thisCargoArea=本仓库区域
#ViewFlatWarehouseOutFlow #ViewFlatWarehouseOutFlow
search.ViewFlatWarehouseOutFlow.inOrOut=入出库类型 search.ViewFlatWarehouseOutFlow.inOrOut=入出库类型
search.ViewFlatWarehouseOutFlow.inOrOutSotckId=入出库主单据ID search.ViewFlatWarehouseOutFlow.inOrOutSotckId=出库流水单号
search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId=入出库主子单据ID search.ViewFlatWarehouseOutFlow.inOrOutSotckDetailId=子出库流水单号
search.ViewFlatWarehouseOutFlow.productGuid=物料GUID search.ViewFlatWarehouseOutFlow.productGuid=物料GUID
search.ViewFlatWarehouseOutFlow.productId=物料ID search.ViewFlatWarehouseOutFlow.productId=物料ID
search.ViewFlatWarehouseOutFlow.quantity=入出库数量 search.ViewFlatWarehouseOutFlow.quantity=数量
search.ViewFlatWarehouseOutFlow.createMan=创建人 search.ViewFlatWarehouseOutFlow.createMan=创建人
search.ViewFlatWarehouseOutFlow.warehouseId=仓库ID search.ViewFlatWarehouseOutFlow.warehouseId=仓库ID
search.ViewFlatWarehouseOutFlow.warehouseName=仓库名称 search.ViewFlatWarehouseOutFlow.warehouseName=仓库名称
@@ -534,6 +537,7 @@ stock.Maintain.barCodeOldQuantity=条码数量（旧）
stock.Maintain.barCodeQuantity=条码数量（新） stock.Maintain.barCodeQuantity=条码数量（新）
stock.Maintain.productGuid=物料GUID stock.Maintain.productGuid=物料GUID
# BasSupplier 供应商管理导出字段 # BasSupplier 供应商管理导出字段
bas.Supplier.supplierNo=供应商编号 bas.Supplier.supplierNo=供应商编号
bas.Supplier.supplierGroupNo=供应商分组编号 bas.Supplier.supplierGroupNo=供应商分组编号
@@ -581,16 +585,18 @@ bas.Product.price=价格
bas.Product.cargoNo=品牌 bas.Product.cargoNo=品牌
bas.Product.unit=单位 bas.Product.unit=单位
bas.Product.spec=规格 bas.Product.spec=规格
bas.Product.spare1=备用字段1 bas.Product.spare1=英文描述
bas.Product.spare2=备用字段2 bas.Product.spare2=单件净重KG
bas.Product.spare3=备用字段3 bas.Product.spare3=备用字段3
bas.Product.spare4=备用字段4 bas.Product.spare4=备用字段4
bas.Product.spare5=备用字段5 bas.Product.spare5=长MM
bas.Product.spare6=备用字段6 bas.Product.spare6=宽MM
bas.Product.spare7=备用字段7 bas.Product.spare7=高MM
bas.Product.spare8=备用字段8 bas.Product.spare8=体积m³
bas.Product.spare9=备用字段9 bas.Product.spare9=备用字段9
bas.Product.productName=物料名称 bas.Product.productName=物料名称
bas.Product.remark=描述
# BasProductPort 基础点位导出字段 # BasProductPort 基础点位导出字段
bas.ProductPort.portName=点位名称 bas.ProductPort.portName=点位名称
@@ -613,7 +619,7 @@ bas.TraycodeFormat.serialExample=条码样例
bas.TraycodeFormat.remarks=描述 bas.TraycodeFormat.remarks=描述
bas.TraycodeFormat.minNum=最小流水号 bas.TraycodeFormat.minNum=最小流水号
bas.TraycodeFormat.maxNum=最大流水号 bas.TraycodeFormat.maxNum=最大流水号
bas.TraycodeFormat.spare1=备用字段1 bas.TraycodeFormat.spare1=规格
bas.TraycodeFormat.spare2=备用字段2 bas.TraycodeFormat.spare2=备用字段2
bas.TraycodeFormat.spare3=备用字段3 bas.TraycodeFormat.spare3=备用字段3
@@ -637,7 +643,8 @@ bas.Warehouse.warehouseType=仓库类型
bas.Warehouse.isCurrent=是否可用 bas.Warehouse.isCurrent=是否可用
# BasCargoSpace 货位管理导出字段 # BasCargoSpace 货位管理导出字段
bas.CargoSpace.warehouseId=仓库ID bas.CargoSpace.cargoSpaceId=货位编码
bas.CargoSpace.warehouseId=仓库
bas.CargoSpace.roadwayId=巷道ID bas.CargoSpace.roadwayId=巷道ID
bas.CargoSpace.cargoAreaId=货区ID bas.CargoSpace.cargoAreaId=货区ID
bas.CargoSpace.theType=货位类型 bas.CargoSpace.theType=货位类型

1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
View File

@@ -7,6 +7,7 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
/** /**
* Entity基类 * Entity基类

2
ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java
View File

@@ -24,7 +24,7 @@ public class I18nConfig implements WebMvcConfigurer
{ {
SessionLocaleResolver slr = new SessionLocaleResolver(); SessionLocaleResolver slr = new SessionLocaleResolver();
// 默认语言 // 默认语言
slr.setDefaultLocale(Locale.US); slr.setDefaultLocale(Locale.SIMPLIFIED_CHINESE);
return slr; return slr;
} }

14
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -319,12 +319,16 @@
<!-- <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />--> <!-- <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />-->
<el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewInJobFlow.priority')" align="right" prop="priority" /> <el-table-column :label="$t('searchViewInJobFlow.priority')" align="right" prop="priority" />
<el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase"> <!-- <el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/> <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut" />
<el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="left" prop="entranceId" /> <el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="left" prop="entranceId" />
<el-table-column :label="$t('searchViewInJobFlow.productId')" align="left" prop="productId" /> <el-table-column :label="$t('searchViewInJobFlow.productId')" align="left" prop="productId" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />--> <!-- <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />-->
@@ -338,7 +342,7 @@
<el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="left" prop="inOrOutId" /> <el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="left" prop="inOrOutId" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" /> <el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" />
<el-table-column :label="$t('searchViewInJobFlow.createTime')" align="left" prop="createTime" width="180" /> <el-table-column :label="$t('searchViewInJobFlow.createTime')" align="left" prop="createTime" width="180" />
<el-table-column :label="$t('searchViewInJobFlow.startTime')" align="left" prop="startTime" width="180" /> <!-- <el-table-column :label="$t('searchViewInJobFlow.startTime')" align="left" prop="startTime" width="180" />-->
<el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="left" prop="finishTime" width="180" /> <el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="left" prop="finishTime" width="180" />
<el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="left" prop="warehouseId" /> <el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" align="left" prop="productName" /> <el-table-column :label="$t('searchViewInJobFlow.productName')" align="left" prop="productName" />
@@ -516,7 +520,7 @@ import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow
import { listWarehouse } from "@/api/bas/warehouse" import { listWarehouse } from "@/api/bas/warehouse"
export default { export default {
name: "ViewInJobFlow", name: "ViewInJobFlow",
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'], dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','in_job_type'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

18
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -296,7 +296,7 @@
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="confirmExport"
v-hasPermi="['search:ViewOutJobFlow:export']" v-hasPermi="['search:ViewOutJobFlow:export']"
>{{$t('searchViewOutJobFlow.export')}} <!-- 导出 --> >{{$t('searchViewOutJobFlow.export')}} <!-- 导出 -->
</el-button> </el-button>
@@ -322,12 +322,16 @@
<el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="left" prop="theColumn"/> <el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="left" prop="theColumn"/>
<el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="left" prop="theFloor"/> <el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="left" prop="theFloor"/>
<el-table-column :label="$t('searchViewOutJobFlow.priority')" align="right" prop="priority"/> <el-table-column :label="$t('searchViewOutJobFlow.priority')" align="right" prop="priority"/>
<el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="left" prop="executionPhase"> <!-- <el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/> <dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut"/>
<el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="left" prop="exitId"/> <el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="left" prop="exitId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId"/> <el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>--> <!-- <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>-->
@@ -347,7 +351,7 @@
<el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="left" prop="warehouseId"/> <el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="left" prop="warehouseId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName"/> <el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>--> <!-- <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/> <!-- <el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit"/> <el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName"/> <el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName"/>
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 --> <el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
@@ -388,7 +392,7 @@
<!-- 导出对话框 --> <!-- 导出对话框 -->
<el-dialog :title="$t('searchViewOutJobFlow.export')" :visible.sync="exportOpen" width="400px" append-to-body> <el-dialog :title="$t('searchViewOutJobFlow.export')" :visible.sync="exportOpen" width="400px" append-to-body>
<div class="el-message-box__status el-icon-question">{{$t('searchViewOutJobFlow.confirmExport')}}</div> <!-- <div class="el-message-box__status el-icon-question">{{$t('searchViewOutJobFlow.confirmExport')}}</div>-->
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="exportOpen = false">{{$t('searchViewOutJobFlow.cancel')}} <!-- 取消 --></el-button> <el-button @click="exportOpen = false">{{$t('searchViewOutJobFlow.cancel')}} <!-- 取消 --></el-button>
<el-button type="primary" @click="confirmExport">{{$t('searchViewOutJobFlow.confirm')}} <!-- 确定 --></el-button> <el-button type="primary" @click="confirmExport">{{$t('searchViewOutJobFlow.confirm')}} <!-- 确定 --></el-button>
@@ -537,7 +541,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default { export default {
name: "ViewOutJobFlow", name: "ViewOutJobFlow",
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'], dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','out_job_type'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

92
ruoyi-ui/src/views/search/ViewStockSecure/index.vue
View File

@@ -93,63 +93,84 @@
<el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID --> <el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID --> <el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 --> <el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 --> <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 --> <el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> <!-- 回流时间 --> <!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID --> <!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 --> <el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID --> <el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> <el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 --> <!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID --> <el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 --> <el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" /> <!-- 入库类型 --> <el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID --> <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
<el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID --> </template>
<el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 --> </el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />--> <!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
<!-- <el-table-column label="备用字段3" align="center" prop="spare3" />--> <!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />--> <!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />--> <!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />--> <!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID --> <el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 --> <el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> <!-- 仓库地址 --> <el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 --> <!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 --> <!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 --> <!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 --> <!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 --> <el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 --> <el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> <!-- 规格 --> <!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 --> <el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM --> <el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM --> <el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM --> <el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ --> <el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 --> <el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> <!-- 货位类型 --> <!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 --> <!-- <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> &lt;!&ndash; 货位类型名称 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 --> <!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> <!-- 列 --> <!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> <!-- 层 --> <!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 --> <el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" /> <!-- 是否锁定 --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 --> <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
<el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 --> </template>
<el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 --> </el-table-column>
<el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 --> <el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 --> <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button--> <!-- <el-button-->
@@ -337,6 +358,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default { export default {
name: "ViewStockSecure", name: "ViewStockSecure",
dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

173
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

@@ -92,82 +92,102 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockWarning.stockId')" align="center" prop="stockId" /> <!-- 库存ID --> <el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID --> <el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockWarning.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 --> <el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<el-table-column :label="$t('searchViewStockWarning.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 --> <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
<el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 --> </template>
<el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 --> </el-table-column>
<el-table-column :label="$t('searchViewStockWarning.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID --> <el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockWarning.quantity')" align="center" prop="quantity" /> <!-- 库存数量 --> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockWarning.jobId')" align="center" prop="jobId" /> <!-- 作业ID --> <dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
<el-table-column :label="$t('searchViewStockWarning.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 --> </template>
<el-table-column :label="$t('searchViewStockWarning.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 --> </el-table-column>
<el-table-column :label="$t('searchViewStockWarning.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 --> <el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockWarning.inType')" align="center" prop="inType" /> <!-- 入库类型 --> <!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID --> <el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID --> <el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockWarning.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 --> <el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column label="${comment}" align="center" prop="spare2" />--> <!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<!-- <el-table-column label="${comment}" align="center" prop="spare3" />--> <el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<!-- <el-table-column label="${comment}" align="center" prop="spare4" />--> <el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<!-- <el-table-column label="${comment}" align="center" prop="spare5" />--> <el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<!-- <el-table-column label="${comment}" align="center" prop="spare6" />--> <template slot-scope="scope">
<el-table-column :label="$t('searchViewStockWarning.productId')" align="center" prop="productId" /> <!-- 物料ID --> <dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
<el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 --> </template>
<el-table-column :label="$t('searchViewStockWarning.address')" align="center" prop="address" /> <!-- 仓库地址 --> </el-table-column>
<el-table-column :label="$t('searchViewStockWarning.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 --> <!-- <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 --> <!-- <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 --> <!-- <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 --> <!-- <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.price')" align="center" prop="price" /> <!-- 价格 --> <!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 --> <!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
<el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> <!-- 规格 --> <!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<el-table-column :label="$t('searchViewStockWarning.enName')" align="center" prop="enName" /> <!-- 英文名称 --> <!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<el-table-column :label="$t('searchViewStockWarning.weight')" align="center" prop="weight" /> <!-- 单件净重 --> <!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockWarning.longMM')" align="center" prop="longMM" /> <!-- 长MM --> <el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockWarning.wide')" align="center" prop="wide" /> <!-- 宽MM --> <el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockWarning.hight')" align="center" prop="hight" /> <!-- 高MM --> <el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column :label="$t('searchViewStockWarning.volume')" align="center" prop="volume" /> <!-- 体积m³ --> <!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 --> <!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 --> <!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID --> <!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 --> <el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockWarning.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 --> <el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockWarning.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 --> <!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.theColumn')" align="center" prop="theColumn" /> <!-- 列 -->
<el-table-column :label="$t('searchViewStockWarning.theFloor')" align="center" prop="theFloor" /> <!-- 层 --> <el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 --> <el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 --> <el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 --> <el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 --> <el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockWarning.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 --> <el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockWarning.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 --> <!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 --> <!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 --> <!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">--> <!-- <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> &lt;!&ndash; 货位类型名称 &ndash;&gt;-->
<!-- <template slot-scope="scope">--> <!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<!-- <el-button--> <!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<!-- size="mini"--> <!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<!-- type="text"--> <el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<!-- icon="el-icon-edit"--> <template slot-scope="scope">
<!-- @click="handleUpdate(scope.row)"--> <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
<!-- v-hasPermi="['search:ViewStockWarning:edit']"--> </template>
<!-- >修改</el-button>--> </el-table-column>
<!-- <el-button--> <el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<!-- size="mini"--> <template slot-scope="scope">
<!-- type="text"--> <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
<!-- icon="el-icon-delete"--> </template>
<!-- @click="handleDelete(scope.row)"--> </el-table-column>
<!-- v-hasPermi="['search:ViewStockWarning:remove']"--> <!-- <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
<!-- >删除</el-button>--> <!-- <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<!-- </template>--> <!-- <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- </el-table-column>--> <!-- <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table> </el-table>
<pagination <pagination
@@ -340,6 +360,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
export default { export default {
name: "ViewStockWarning", name: "ViewStockWarning",
dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

30
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

@@ -188,16 +188,16 @@
<!-- :placeholder="$t('searchViewStockinHistory.selectPrintDate')">--> <!-- :placeholder="$t('searchViewStockinHistory.selectPrintDate')">-->
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> <!-- 库存状态 --> <!-- <el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;-->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable> <!-- <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>-->
<el-option <!-- <el-option-->
v-for="dict in dict.type.stock_status" <!-- v-for="dict in dict.type.stock_status"-->
:key="dict.value" <!-- :key="dict.value"-->
:label="dict.label" <!-- :label="dict.label"-->
:value="dict.value" <!-- :value="dict.value"-->
/> <!-- />-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<!-- <el-form-item label="单价" prop="price">--> <!-- <el-form-item label="单价" prop="price">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.price"--> <!-- v-model="queryParams.price"-->
@@ -350,11 +350,11 @@
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus"> <!-- <el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/> <!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column :label="$t('searchViewStockinHistory.productId')" align="left" prop="productId" /> <el-table-column :label="$t('searchViewStockinHistory.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" /> <el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" /> <el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" />

2
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -71,7 +71,7 @@
<dict-tag :options="dict.type.stock_status" :value="scope.row.currStatus"/> <dict-tag :options="dict.type.stock_status" :value="scope.row.currStatus"/>
</template> </template>
</el-table-column><!-- 现库位状态 --> </el-table-column><!-- 现库位状态 -->
<el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> <!-- 操作 --> <!-- <el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> &lt;!&ndash; 操作 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 --> <el-table-column :label="$t('stockFreeze.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="left" prop="createTime" /> <!-- 创建时间 --> <el-table-column :label="$t('stockFreeze.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;--> <!-- <el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->