已完成已作废的作业不能再次操作，主子表刷新问题，导出字典国际化
This commit is contained in:
猫猫guowen
@@ -19,79 +19,79 @@ public class BasCustomer extends BaseEntity
|
||||
private String id;
|
||||
|
||||
/** 客户编号 */
|
||||
@Excel(name = "客户编号")
|
||||
@Excel(name = "${bas.Customer.customerNo}")
|
||||
private String customerNo;
|
||||
|
||||
/** 客户基本分类 */
|
||||
@Excel(name = "客户基本分类")
|
||||
@Excel(name = "${bas.Customer.customerGroupNo}")
|
||||
private String customerGroupNo;
|
||||
|
||||
/** 客户名称 */
|
||||
@Excel(name = "客户名称")
|
||||
@Excel(name = "${bas.Customer.customerName}")
|
||||
private String customerName;
|
||||
|
||||
/** 客户简称 */
|
||||
@Excel(name = "客户简称")
|
||||
@Excel(name = "${bas.Customer.simpleName}")
|
||||
private String simpleName;
|
||||
|
||||
/** 是否可用 */
|
||||
@Excel(name = "是否可用")
|
||||
@Excel(name = "${bas.Customer.useable}")
|
||||
private String useable;
|
||||
|
||||
/** 业务部门 */
|
||||
@Excel(name = "业务部门")
|
||||
@Excel(name = "${bas.Customer.businessDepartment}")
|
||||
private String businessDepartment;
|
||||
|
||||
/** 业务员 */
|
||||
@Excel(name = "业务员")
|
||||
@Excel(name = "${bas.Customer.salesman}")
|
||||
private String salesman;
|
||||
|
||||
/** 助忆码 */
|
||||
@Excel(name = "助忆码")
|
||||
@Excel(name = "${bas.Customer.mnemonicCode}")
|
||||
private String mnemonicCode;
|
||||
|
||||
/** 客户类型 */
|
||||
@Excel(name = "客户类型")
|
||||
@Excel(name = "${bas.Customer.type}")
|
||||
private String type;
|
||||
|
||||
/** 纳税人登记号 */
|
||||
@Excel(name = "纳税人登记号")
|
||||
@Excel(name = "${bas.Customer.taxpayerRegistrationNumber}")
|
||||
private String taxpayerRegistrationNumber;
|
||||
|
||||
/** 对应财务组织 */
|
||||
@Excel(name = "对应财务组织")
|
||||
@Excel(name = "${bas.Customer.organization}")
|
||||
private String organization;
|
||||
|
||||
/** 上级客户 */
|
||||
@Excel(name = "上级客户")
|
||||
@Excel(name = "${bas.Customer.supCustomer}")
|
||||
private String supCustomer;
|
||||
|
||||
/** 散户 */
|
||||
@Excel(name = "散户")
|
||||
@Excel(name = "${bas.Customer.retailInvestor}")
|
||||
private String retailInvestor;
|
||||
|
||||
/** 国家/地区 */
|
||||
@Excel(name = "国家/地区")
|
||||
@Excel(name = "${bas.Customer.country}")
|
||||
private String country;
|
||||
|
||||
/** 时区 */
|
||||
@Excel(name = "时区")
|
||||
@Excel(name = "${bas.Customer.timeZone}")
|
||||
private String timeZone;
|
||||
|
||||
/** 数据格式 */
|
||||
@Excel(name = "数据格式")
|
||||
@Excel(name = "${bas.Customer.dataFormat}")
|
||||
private String dataFormat;
|
||||
|
||||
/** 联系人姓名 */
|
||||
@Excel(name = "联系人姓名")
|
||||
@Excel(name = "${bas.Customer.contactName}")
|
||||
private String contactName;
|
||||
|
||||
/** 发货国家 */
|
||||
@Excel(name = "发货国家")
|
||||
@Excel(name = "${bas.Customer.shipment}")
|
||||
private String shipment;
|
||||
|
||||
/** 税类 */
|
||||
@Excel(name = "税类")
|
||||
@Excel(name = "${bas.Customer.taxCategory}")
|
||||
private String taxCategory;
|
||||
|
||||
public void setId(String id)
|
||||
|
||||
@@ -23,65 +23,65 @@ public class BasProduct extends BaseEntity
|
||||
private String productGuid;
|
||||
|
||||
/** 物料编码 */
|
||||
@Excel(name = "物料编码")
|
||||
@Excel(name = "${bas.Product.productId}")
|
||||
private String productId;
|
||||
|
||||
/** 父节点id */
|
||||
@Excel(name = "父节点id")
|
||||
@Excel(name = "${bas.Product.parentId}")
|
||||
private String parentId;
|
||||
|
||||
/** 价格 */
|
||||
@Excel(name = "价格")
|
||||
@Excel(name = "${bas.Product.price}")
|
||||
private String price;
|
||||
|
||||
/** 品牌 */
|
||||
@Excel(name = "品牌")
|
||||
@Excel(name = "${bas.Product.cargoNo}")
|
||||
private String cargoNo;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
@Excel(name = "${bas.Product.unit}")
|
||||
private String unit;
|
||||
|
||||
/** 规格 */
|
||||
@Excel(name = "规格")
|
||||
@Excel(name = "${bas.Product.spec}")
|
||||
private String spec;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
@Excel(name = "${bas.Product.spare1}")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
@Excel(name = "${bas.Product.spare2}")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
@Excel(name = "${bas.Product.spare3}")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
@Excel(name = "${bas.Product.spare4}")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
@Excel(name = "${bas.Product.spare5}")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
@Excel(name = "${bas.Product.spare6}")
|
||||
private String spare6;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段7")
|
||||
@Excel(name = "${bas.Product.spare7}")
|
||||
private String spare7;
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段8")
|
||||
@Excel(name = "${bas.Product.spare8}")
|
||||
private String spare8;
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段9")
|
||||
@Excel(name = "${bas.Product.spare9}")
|
||||
private String spare9;
|
||||
|
||||
/** 物料名称 */
|
||||
@Excel(name = "物料名称")
|
||||
@Excel(name = "${bas.Product.productName}")
|
||||
private String productName;
|
||||
|
||||
/**
|
||||
|
||||
@@ -19,71 +19,71 @@ public class BasSupplier extends BaseEntity
|
||||
private String id;
|
||||
|
||||
/** 供应商编号 */
|
||||
@Excel(name = " 供应商编号")
|
||||
@Excel(name = "${bas.Supplier.supplierNo}")
|
||||
private String supplierNo;
|
||||
|
||||
/** 供应商名称 */
|
||||
@Excel(name = "供应商名称")
|
||||
@Excel(name = "${bas.Supplier.supplierGroupNo}")
|
||||
private String supplierGroupNo;
|
||||
|
||||
/** 供应商名称 */
|
||||
@Excel(name = "供应商名称")
|
||||
@Excel(name = "${bas.Supplier.supplierName}")
|
||||
private String supplierName;
|
||||
|
||||
/** 简称 */
|
||||
@Excel(name = "简称")
|
||||
@Excel(name = "${bas.Supplier.simpleName}")
|
||||
private String simpleName;
|
||||
|
||||
/** 是否可用 */
|
||||
@Excel(name = "是否可用")
|
||||
@Excel(name = "${bas.Supplier.useable}")
|
||||
private String useable;
|
||||
|
||||
/** 地区分类 */
|
||||
@Excel(name = "地区分类")
|
||||
@Excel(name = "${bas.Supplier.supplierArae}")
|
||||
private String supplierArae;
|
||||
|
||||
/** 纳税人登记号 */
|
||||
@Excel(name = "纳税人登记号")
|
||||
@Excel(name = "${bas.Supplier.taxpayerRegistrationNumber}")
|
||||
private String taxpayerRegistrationNumber;
|
||||
|
||||
/** 国家 */
|
||||
@Excel(name = "国家")
|
||||
@Excel(name = "${bas.Supplier.country}")
|
||||
private String country;
|
||||
|
||||
/** 时区 */
|
||||
@Excel(name = "时区")
|
||||
@Excel(name = "${bas.Supplier.timeZone}")
|
||||
private String timeZone;
|
||||
|
||||
/** 数据格式 */
|
||||
@Excel(name = "数据格式")
|
||||
@Excel(name = "${bas.Supplier.dataFormat}")
|
||||
private String dataFormat;
|
||||
|
||||
/** 收货国家 */
|
||||
@Excel(name = "收货国家")
|
||||
@Excel(name = "${bas.Supplier.receivingCountry}")
|
||||
private String receivingCountry;
|
||||
|
||||
/** 税类 */
|
||||
@Excel(name = "税类")
|
||||
@Excel(name = "${bas.Supplier.taxCategory}")
|
||||
private String taxCategory;
|
||||
|
||||
/** 法人 */
|
||||
@Excel(name = "法人")
|
||||
@Excel(name = "${bas.Supplier.legalPerson}")
|
||||
private String legalPerson;
|
||||
|
||||
/** 注册资金 */
|
||||
@Excel(name = "注册资金")
|
||||
@Excel(name = "${bas.Supplier.registeredCapital}")
|
||||
private String registeredCapital;
|
||||
|
||||
/** 企业地址 */
|
||||
@Excel(name = "企业地址")
|
||||
@Excel(name = "${bas.Supplier.address}")
|
||||
private String address;
|
||||
|
||||
/** 联系人姓名 */
|
||||
@Excel(name = "联系人姓名")
|
||||
@Excel(name = "${bas.Supplier.contactName}")
|
||||
private String contactName;
|
||||
|
||||
/** 联系电话 */
|
||||
@Excel(name = "联系电话")
|
||||
@Excel(name = "${bas.Supplier.contactNumber}")
|
||||
private String contactNumber;
|
||||
|
||||
public void setId(String id)
|
||||
|
||||
@@ -26,77 +26,77 @@ public class BasCargoSpace extends BaseEntity {
|
||||
private String cargoSpaceId;
|
||||
|
||||
/** 仓库id（不允许为空） */
|
||||
@Excel(name = "仓库id", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.warehouseId}")
|
||||
private String warehouseId;
|
||||
private String warehouseName;
|
||||
|
||||
/** 巷道id（允许为空） */
|
||||
@Excel(name = "巷道id", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.CargoSpace.roadwayId}")
|
||||
private String roadwayId;
|
||||
|
||||
/** 货区id（允许为空） */
|
||||
@Excel(name = "货区id", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.CargoSpace.cargoAreaId}")
|
||||
private String cargoAreaId;
|
||||
|
||||
/** 货位类型（允许为空） */
|
||||
@Excel(name = "货位类型", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.CargoSpace.theType}")
|
||||
private String theType;
|
||||
|
||||
/** 货位类型名称 */
|
||||
@Excel(name = "货位类型名称")
|
||||
@Excel(name = "${bas.CargoSpace.theTypeName}")
|
||||
private String theTypeName;
|
||||
|
||||
/** 货位名称（不允许为空） */
|
||||
@Excel(name = "货位名称", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.cargoSpaceName}")
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 排（不允许为空） */
|
||||
@Excel(name = "排", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.thePlatoon}")
|
||||
private Long thePlatoon;
|
||||
|
||||
/** 列（不允许为空） */
|
||||
@Excel(name = "列", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.theColumn}")
|
||||
private Long theColumn;
|
||||
|
||||
/** 层（不允许为空） */
|
||||
@Excel(name = "层", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.theFloor}")
|
||||
private Long theFloor;
|
||||
|
||||
/** 货位状态1空2满 */
|
||||
@Excel(name = "货位状态1空2满")
|
||||
@Excel(name = "${bas.CargoSpace.status}")
|
||||
private String status;
|
||||
|
||||
/** 是否锁定（不允许为空）
|
||||
Y锁、N开 */
|
||||
@Excel(name = "是否锁定", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.CargoSpace.locked}")
|
||||
private String locked;
|
||||
|
||||
/** 托盘条码（允许为空） */
|
||||
@Excel(name = "托盘条码", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.CargoSpace.trayCode}")
|
||||
private String trayCode;
|
||||
|
||||
/** 货位高度 */
|
||||
@Excel(name = "货位高度")
|
||||
@Excel(name = "${bas.CargoSpace.cargoHight}")
|
||||
private String cargoHight;
|
||||
|
||||
/** 是否双伸 Y N */
|
||||
@Excel(name = "是否双伸 Y N ")
|
||||
@Excel(name = "${bas.CargoSpace.issDouble}")
|
||||
private String issDouble;
|
||||
|
||||
/** 双货位分组编码（标识区分） */
|
||||
@Excel(name = "双货位分组编码", readConverterExp = "标=识区分")
|
||||
@Excel(name = "${bas.CargoSpace.groupCodingNo}")
|
||||
private String groupCodingNo;
|
||||
|
||||
/** 双货位分组编码1、2… */
|
||||
@Excel(name = "双货位分组编码1、2… ")
|
||||
@Excel(name = "${bas.CargoSpace.groupCoding}")
|
||||
private String groupCoding;
|
||||
|
||||
/** 双货位标识 0 外1内 */
|
||||
@Excel(name = "双货位标识 0 外1内")
|
||||
@Excel(name = "${bas.CargoSpace.cargoSpaceLogo}")
|
||||
private String cargoSpaceLogo;
|
||||
|
||||
/** 本仓库区域 1--8 A9--15 B */
|
||||
@Excel(name = "本仓库区域 1--8 A9--15 B")
|
||||
@Excel(name = "${bas.CargoSpace.thisCargoArea}")
|
||||
private String thisCargoArea;
|
||||
|
||||
// @Override
|
||||
|
||||
@@ -25,27 +25,27 @@ public class BasContainer extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 容器编号 */
|
||||
@Excel(name = "容器编号")
|
||||
@Excel(name = "${bas.Container.containerId}")
|
||||
private String containerId;
|
||||
|
||||
/** 点位名称 */
|
||||
@Excel(name = "点位名称")
|
||||
@Excel(name = "${bas.Container.portName}")
|
||||
private String portName;
|
||||
|
||||
/** 容器状态 */
|
||||
@Excel(name = "容器状态")
|
||||
@Excel(name = "${bas.Container.status}")
|
||||
private Long status;
|
||||
|
||||
/** 物料种类数量 */
|
||||
@Excel(name = "物料种类")
|
||||
@Excel(name = "${bas.Container.productTypeQuantity}")
|
||||
private String productTypeQuantity;
|
||||
|
||||
/** 容量（可存放料箱数量） */
|
||||
@Excel(name = "容量", readConverterExp = "可存放料箱数量")
|
||||
@Excel(name = "${bas.Container.capacity}")
|
||||
private Long capacity;
|
||||
|
||||
/** 操作人 */
|
||||
@Excel(name = "操作人")
|
||||
@Excel(name = "${bas.Container.operationMan}")
|
||||
private String operationMan;
|
||||
|
||||
/** 备用 */
|
||||
|
||||
@@ -21,19 +21,19 @@ public class BasProductPort extends BaseEntity
|
||||
private String id;
|
||||
|
||||
/** 点位名称 */
|
||||
@Excel(name = "点位名称")
|
||||
@Excel(name = "${bas.ProductPort.portName}")
|
||||
private String portName;
|
||||
|
||||
/** 点位分类 */
|
||||
@Excel(name = "点位分类")
|
||||
@Excel(name = "${bas.ProductPort.portType}")
|
||||
private String portType;
|
||||
|
||||
/** 点位描述 */
|
||||
@Excel(name = "点位描述")
|
||||
@Excel(name = "${bas.ProductPort.portDesc}")
|
||||
private String portDesc;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
@Excel(name = "${bas.ProductPort.createMan}")
|
||||
private String createMan;
|
||||
private String warehouseId;
|
||||
|
||||
|
||||
@@ -16,27 +16,28 @@ public class BasTraycode extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id */
|
||||
@Excel(name = "${bas.Traycode.id}")
|
||||
private Long id;
|
||||
|
||||
/** 条码类型id */
|
||||
@Excel(name = "条码类型id")
|
||||
@Excel(name = "${bas.Traycode.formatId}")
|
||||
private Long formatId;
|
||||
private String formatName;
|
||||
|
||||
/** 条码 */
|
||||
@Excel(name = "条码")
|
||||
@Excel(name = "${bas.Traycode.trayCode}")
|
||||
private String trayCode;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
@Excel(name = "${bas.Traycode.spare1}")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
@Excel(name = "${bas.Traycode.spare2}")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
@Excel(name = "${bas.Traycode.spare3}")
|
||||
private String spare3;
|
||||
|
||||
public String getFormatName() {
|
||||
|
||||
@@ -19,39 +19,39 @@ public class BasTraycodeFormat extends BaseEntity
|
||||
private Long id;
|
||||
|
||||
/** 条码前缀 */
|
||||
@Excel(name = "条码前缀")
|
||||
@Excel(name = "${bas.TraycodeFormat.barcodeFormat}")
|
||||
private String barcodeFormat;
|
||||
|
||||
/** 流水号 */
|
||||
@Excel(name = "流水号")
|
||||
@Excel(name = "${bas.TraycodeFormat.serialRule}")
|
||||
private String serialRule;
|
||||
|
||||
/** 条码样例 */
|
||||
@Excel(name = "条码样例")
|
||||
@Excel(name = "${bas.TraycodeFormat.serialExample}")
|
||||
private String serialExample;
|
||||
|
||||
/** 描述 */
|
||||
@Excel(name = "描述")
|
||||
@Excel(name = "${bas.TraycodeFormat.remarks}")
|
||||
private String remarks;
|
||||
|
||||
/** 最小流水号 */
|
||||
@Excel(name = "最小流水号")
|
||||
@Excel(name = "${bas.TraycodeFormat.minNum}")
|
||||
private Long minNum;
|
||||
|
||||
/** 最大流水号 */
|
||||
@Excel(name = "最大流水号")
|
||||
@Excel(name = "${bas.TraycodeFormat.maxNum}")
|
||||
private Long maxNum;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
@Excel(name = "${bas.TraycodeFormat.spare1}")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
@Excel(name = "${bas.TraycodeFormat.spare2}")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
@Excel(name = "${bas.TraycodeFormat.spare3}")
|
||||
private String spare3;
|
||||
|
||||
public void setId(Long id)
|
||||
|
||||
@@ -2,9 +2,8 @@ package com.ruoyi.bas.warehouse.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -14,69 +13,172 @@ import java.util.List;
|
||||
* @author lsy
|
||||
* @date 2025-05-20
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class BasWarehouse extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** id（主键不允许为空）主键 */
|
||||
@Excel(name = "id", readConverterExp = "主=键不允许为空")
|
||||
@Excel(name = "${bas.Warehouse.warehouseId}")
|
||||
private String warehouseId;
|
||||
|
||||
/** 仓库id（不允许为空） */
|
||||
@Excel(name = "仓库id", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.Warehouse.warehouseNo}")
|
||||
private String warehouseNo;
|
||||
|
||||
/** 项目编号 */
|
||||
@Excel(name = "项目编号")
|
||||
@Excel(name = "${bas.Warehouse.projectNo}")
|
||||
private String projectNo;
|
||||
|
||||
/** 仓库名称（不允许为空） */
|
||||
@Excel(name = "仓库名称", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.Warehouse.warehouseName}")
|
||||
private String warehouseName;
|
||||
|
||||
/** 仓库地址（允许为空） */
|
||||
@Excel(name = "仓库地址", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.Warehouse.address}")
|
||||
private String address;
|
||||
|
||||
/** 仓库描述（允许为空） */
|
||||
@Excel(name = "仓库描述", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.Warehouse.cDesc}")
|
||||
private String cDesc;
|
||||
|
||||
/** 仓库级别（允许为空）1、2 */
|
||||
@Excel(name = "仓库级别", readConverterExp = "允=许为空")
|
||||
@Excel(name = "${bas.Warehouse.warehouseKind}")
|
||||
private String warehouseKind;
|
||||
|
||||
/** 仓库类型 */
|
||||
@Excel(name = "仓库类型")
|
||||
@Excel(name = "${bas.Warehouse.warehouseType}")
|
||||
private String warehouseType;
|
||||
|
||||
/** 是否可用（不允许为空）Y、N */
|
||||
@Excel(name = "是否可用", readConverterExp = "不=允许为空")
|
||||
@Excel(name = "${bas.Warehouse.isCurrent}")
|
||||
private String isCurrent;
|
||||
|
||||
/*仓库数据权限*/
|
||||
private List<String> dataScope;
|
||||
private List<String> typeData;
|
||||
|
||||
public void setWarehouseId(String warehouseId)
|
||||
{
|
||||
this.warehouseId = warehouseId;
|
||||
}
|
||||
|
||||
public String getWarehouseId()
|
||||
{
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
public void setWarehouseNo(String warehouseNo)
|
||||
{
|
||||
this.warehouseNo = warehouseNo;
|
||||
}
|
||||
|
||||
public String getWarehouseNo()
|
||||
{
|
||||
return warehouseNo;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public String toString() {
|
||||
// return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
// .append("warehouseId", getWarehouseId())
|
||||
// .append("warehouseNo", getWarehouseNo())
|
||||
// .append("projectNo", getProjectNo())
|
||||
// .append("warehouseName", getWarehouseName())
|
||||
// .append("address", getAddress())
|
||||
// .append("cDesc", getcDesc())
|
||||
// .append("warehouseKind", getWarehouseKind())
|
||||
// .append("warehouseType", getWarehouseType())
|
||||
// .append("isCurrent", getIsCurrent())
|
||||
// .toString();
|
||||
// }
|
||||
public void setProjectNo(String projectNo)
|
||||
{
|
||||
this.projectNo = projectNo;
|
||||
}
|
||||
|
||||
public String getProjectNo()
|
||||
{
|
||||
return projectNo;
|
||||
}
|
||||
|
||||
public void setWarehouseName(String warehouseName)
|
||||
{
|
||||
this.warehouseName = warehouseName;
|
||||
}
|
||||
|
||||
public String getWarehouseName()
|
||||
{
|
||||
return warehouseName;
|
||||
}
|
||||
|
||||
public void setAddress(String address)
|
||||
{
|
||||
this.address = address;
|
||||
}
|
||||
|
||||
public String getAddress()
|
||||
{
|
||||
return address;
|
||||
}
|
||||
|
||||
public void setCDesc(String cDesc)
|
||||
{
|
||||
this.cDesc = cDesc;
|
||||
}
|
||||
|
||||
public String getCDesc()
|
||||
{
|
||||
return cDesc;
|
||||
}
|
||||
|
||||
public void setWarehouseKind(String warehouseKind)
|
||||
{
|
||||
this.warehouseKind = warehouseKind;
|
||||
}
|
||||
|
||||
public String getWarehouseKind()
|
||||
{
|
||||
return warehouseKind;
|
||||
}
|
||||
|
||||
public void setWarehouseType(String warehouseType)
|
||||
{
|
||||
this.warehouseType = warehouseType;
|
||||
}
|
||||
|
||||
public String getWarehouseType()
|
||||
{
|
||||
return warehouseType;
|
||||
}
|
||||
|
||||
public void setIsCurrent(String isCurrent)
|
||||
{
|
||||
this.isCurrent = isCurrent;
|
||||
}
|
||||
|
||||
public String getIsCurrent()
|
||||
{
|
||||
return isCurrent;
|
||||
}
|
||||
|
||||
public void setDataScope(List<String> dataScope)
|
||||
{
|
||||
this.dataScope = dataScope;
|
||||
}
|
||||
|
||||
public List<String> getDataScope()
|
||||
{
|
||||
return dataScope;
|
||||
}
|
||||
|
||||
public void setTypeData(List<String> typeData)
|
||||
{
|
||||
this.typeData = typeData;
|
||||
}
|
||||
|
||||
public List<String> getTypeData()
|
||||
{
|
||||
return typeData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("warehouseId", getWarehouseId())
|
||||
.append("warehouseNo", getWarehouseNo())
|
||||
.append("projectNo", getProjectNo())
|
||||
.append("warehouseName", getWarehouseName())
|
||||
.append("address", getAddress())
|
||||
.append("cDesc", getCDesc())
|
||||
.append("warehouseKind", getWarehouseKind())
|
||||
.append("warehouseType", getWarehouseType())
|
||||
.append("isCurrent", getIsCurrent())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,69 +19,71 @@ public class BasStockFreezeRecord extends BaseEntity
|
||||
private String whGuid;
|
||||
|
||||
/** 库存编码 */
|
||||
@Excel(name = "库存编码")
|
||||
@Excel(name = "${stock.Freeze.stockId}")
|
||||
private String stockId;
|
||||
|
||||
/** 货位编码 */
|
||||
@Excel(name = "货位编码")
|
||||
@Excel(name = "${stock.Freeze.cargoSpaceId}")
|
||||
private String cargoSpaceId;
|
||||
/** 货位名称 */
|
||||
@Excel(name = "${stock.Freeze.cargoSpaceName}")
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "托盘条码")
|
||||
@Excel(name = "${stock.Freeze.trayCode}")
|
||||
private String trayCode;
|
||||
|
||||
/** 物品编码 */
|
||||
@Excel(name = "物品编码")
|
||||
@Excel(name = "${stock.Freeze.productId}")
|
||||
private String productId;
|
||||
|
||||
/** 物品名称 */
|
||||
@Excel(name = "物品名称")
|
||||
@Excel(name = "${stock.Freeze.productName}")
|
||||
private String productName;
|
||||
|
||||
/** 生产日期 */
|
||||
@Excel(name = "生产日期")
|
||||
@Excel(name = "${stock.Freeze.printDate}")
|
||||
private String printDate;
|
||||
|
||||
/** 批号 */
|
||||
@Excel(name = "批号")
|
||||
@Excel(name = "${stock.Freeze.lotNo}")
|
||||
private String lotNo;
|
||||
|
||||
/** 初始状态 */
|
||||
@Excel(name = "初始状态")
|
||||
@Excel(name = "${stock.Freeze.oldStatus}")
|
||||
private String oldStatus;
|
||||
|
||||
/** 更改状态 */
|
||||
@Excel(name = "更改状态")
|
||||
@Excel(name = "${stock.Freeze.currStatus}")
|
||||
private String currStatus;
|
||||
|
||||
/** 操作 */
|
||||
@Excel(name = "操作")
|
||||
@Excel(name = "${stock.Freeze.method}")
|
||||
private String method;
|
||||
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库")
|
||||
@Excel(name = "${stock.Freeze.warehouseId}")
|
||||
private String warehouseId;
|
||||
private String warehouseName;
|
||||
|
||||
/** 库存字表id */
|
||||
@Excel(name = "库存字表id")
|
||||
@Excel(name = "${stock.Freeze.stockDetailId}")
|
||||
private String stockDetailId;
|
||||
|
||||
/** 操作目标 */
|
||||
@Excel(name = "操作目标")
|
||||
@Excel(name = "${stock.Freeze.operatingTarget}")
|
||||
private String operatingTarget;
|
||||
|
||||
/** 条码数量（旧） */
|
||||
@Excel(name = "条码数量", readConverterExp = "旧=")
|
||||
@Excel(name = "${stock.Freeze.barCodeOldQuantity}")
|
||||
private String barCodeOldQuantity;
|
||||
|
||||
/** 条码数量（新） */
|
||||
@Excel(name = "条码数量", readConverterExp = "新=")
|
||||
@Excel(name = "${stock.Freeze.barCodeQuantity}")
|
||||
private String barCodeQuantity;
|
||||
|
||||
/** 物料guid */
|
||||
@Excel(name = "物料guid")
|
||||
@Excel(name = "${stock.Freeze.productGuid}")
|
||||
private String productGuid;
|
||||
|
||||
public String getWarehouseName() {
|
||||
|
||||
@@ -19,69 +19,71 @@ public class BasStockMaintainRecord extends BaseEntity
|
||||
private String whGuid;
|
||||
|
||||
/** 库存编码 */
|
||||
@Excel(name = "库存编码")
|
||||
@Excel(name = "${stock.Maintain.stockId}")
|
||||
private String stockId;
|
||||
|
||||
/** 货位编码 */
|
||||
@Excel(name = "货位编码")
|
||||
@Excel(name = "${stock.Maintain.cargoSpaceId}")
|
||||
private String cargoSpaceId;
|
||||
/** 货位名称 */
|
||||
@Excel(name = "${stock.Maintain.cargoSpaceName}")
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "托盘条码")
|
||||
@Excel(name = "${stock.Maintain.trayCode}")
|
||||
private String trayCode;
|
||||
|
||||
/** 物品编码 */
|
||||
@Excel(name = "物品编码")
|
||||
@Excel(name = "${stock.Maintain.productId}")
|
||||
private String productId;
|
||||
|
||||
/** 物品名称 */
|
||||
@Excel(name = "物品名称")
|
||||
@Excel(name = "${stock.Maintain.productName}")
|
||||
private String productName;
|
||||
|
||||
/** 生产日期 */
|
||||
@Excel(name = "生产日期")
|
||||
@Excel(name = "${stock.Maintain.printDate}")
|
||||
private String printDate;
|
||||
|
||||
/** 批号 */
|
||||
@Excel(name = "批号")
|
||||
@Excel(name = "${stock.Maintain.lotNo}")
|
||||
private String lotNo;
|
||||
|
||||
/** 初始数量 */
|
||||
@Excel(name = "初始数量")
|
||||
@Excel(name = "${stock.Maintain.oldQuantity}")
|
||||
private String oldQuantity;
|
||||
|
||||
/** 操作后数量 */
|
||||
@Excel(name = "操作后数量")
|
||||
@Excel(name = "${stock.Maintain.quantity}")
|
||||
private String quantity;
|
||||
|
||||
/** 操作 */
|
||||
@Excel(name = "操作")
|
||||
@Excel(name = "${stock.Maintain.method}")
|
||||
private String method;
|
||||
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库")
|
||||
@Excel(name = "${stock.Maintain.warehouseId}")
|
||||
private String warehouseId;
|
||||
private String warehouseName;
|
||||
|
||||
/** 库存字表id */
|
||||
@Excel(name = "库存字表id")
|
||||
@Excel(name = "${stock.Maintain.stockDetailId}")
|
||||
private String stockDetailId;
|
||||
|
||||
/** 操作目标 */
|
||||
@Excel(name = "操作目标")
|
||||
@Excel(name = "${stock.Maintain.operatingTarget}")
|
||||
private String operatingTarget;
|
||||
|
||||
/** 条码数量（旧） */
|
||||
@Excel(name = "条码数量", readConverterExp = "旧=")
|
||||
@Excel(name = "${stock.Maintain.barCodeOldQuantity}")
|
||||
private String barCodeOldQuantity;
|
||||
|
||||
/** 条码数量（新） */
|
||||
@Excel(name = "条码数量", readConverterExp = "新=")
|
||||
@Excel(name = "${stock.Maintain.barCodeQuantity}")
|
||||
private String barCodeQuantity;
|
||||
|
||||
/** 物料guid */
|
||||
@Excel(name = "物料guid")
|
||||
@Excel(name = "${stock.Maintain.productGuid}")
|
||||
private String productGuid;
|
||||
|
||||
public String getWarehouseName() {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.stock.stock.domain;
|
||||
|
||||
import com.ruoyi.common.annotation.Excels;
|
||||
import com.ruoyi.common.domain.ExtraField;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
@@ -19,116 +20,167 @@ public class BasStock extends BaseEntity
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 库存id */
|
||||
@Excel(name = "库存id")
|
||||
@Excel(name = "${stock.BasStock.stockId}")
|
||||
private String stockId;
|
||||
|
||||
/** 货位id */
|
||||
@Excel(name = "货位id")
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceId}")
|
||||
private String cargoSpaceId;
|
||||
/** 货位名称 */
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceName}")
|
||||
private String cargoSpaceName;
|
||||
|
||||
/** 库存状态 */
|
||||
@Excel(name = "库存状态")
|
||||
@Excel(name = "${stock.BasStock.stockStatus}", dictType = "stock_status")
|
||||
private String stockStatus;
|
||||
//货位库存状态
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceStockStatus}", dictType = "cargo_space_status")
|
||||
private String cargoSpaceStockStatus;
|
||||
//货位是否锁定
|
||||
@Excel(name = "${stock.BasStock.cargoSpaceStatus}", dictType = "cargo_space_lock_status")
|
||||
private String cargoSpaceStatus;
|
||||
|
||||
/** 物料状态 */
|
||||
@Excel(name = "物料状态")
|
||||
@Excel(name = "${stock.BasStock.productStatus}", dictType = "product_status")
|
||||
private String productStatus;
|
||||
|
||||
/** 批次号 */
|
||||
@Excel(name = "批次号")
|
||||
private String lotNo;
|
||||
//额外字段
|
||||
@Excels({
|
||||
@Excel(name = "${stock.BasStock.productId}", targetAttr = "productId"),// 物料编码
|
||||
@Excel(name = "${stock.BasStock.materialDesc}", targetAttr = "materialDesc"),// 物料描述
|
||||
@Excel(name = "${stock.BasStock.englishDesc}", targetAttr = "englishDesc"),//物料英文描述
|
||||
@Excel(name = "${stock.BasStock.netWeight}", targetAttr = "netWeight"),//净重
|
||||
@Excel(name = "${stock.BasStock.length}",targetAttr = "length"),//长度
|
||||
@Excel(name = "${stock.BasStock.width}",targetAttr = "width"),//宽度
|
||||
@Excel(name = "${stock.BasStock.height}",targetAttr = "height"),//高度
|
||||
@Excel(name = "${stock.BasStock.volume}",targetAttr = "volume")//体积
|
||||
})
|
||||
private ExtraField extraField;
|
||||
|
||||
/** 入库时间 */
|
||||
@Excel(name = "入库时间")
|
||||
private String inDate;
|
||||
/** 物料编码 */
|
||||
// @Excel(name = "${stock.BasStock.productId}")
|
||||
private String productId;
|
||||
|
||||
/** 回流时间 */
|
||||
@Excel(name = "回流时间")
|
||||
private String backDate;
|
||||
//物料描述
|
||||
// @Excel(name = "${stock.BasStock.materialDesc}")
|
||||
private String materialDesc;
|
||||
|
||||
/** 物料GUID */
|
||||
@Excel(name = "物料GUID")
|
||||
private String productGuid;
|
||||
//物料英文描述
|
||||
// @Excel(name = "${stock.BasStock.englishDesc}")
|
||||
private String spare1;
|
||||
|
||||
//净重
|
||||
// @Excel(name = "${stock.BasStock.netWeight}")
|
||||
private String spare2;
|
||||
|
||||
//长度
|
||||
// @Excel(name = "${stock.BasStock.length}")
|
||||
private String spare5;
|
||||
|
||||
//宽度
|
||||
// @Excel(name = "${stock.BasStock.width}")
|
||||
private String spare6;
|
||||
|
||||
//高度
|
||||
// @Excel(name = "${stock.BasStock.height}")
|
||||
private String spare7;
|
||||
|
||||
//体积
|
||||
// @Excel(name = "${stock.BasStock.volume}")
|
||||
private String spare8;
|
||||
|
||||
/** 库存数量 */
|
||||
@Excel(name = "库存数量")
|
||||
@Excel(name = "${stock.BasStock.quantity}")
|
||||
private String quantity;
|
||||
|
||||
/** 作业ID */
|
||||
@Excel(name = "作业ID")
|
||||
@Excel(name = "${stock.BasStock.jobId}")
|
||||
private String jobId;
|
||||
|
||||
/** 托盘条码 */
|
||||
@Excel(name = "托盘条码")
|
||||
@Excel(name = "${stock.BasStock.trayCode}")
|
||||
private String trayCode;
|
||||
|
||||
/** 出库数量 */
|
||||
@Excel(name = "出库数量")
|
||||
private String outQuantity;
|
||||
|
||||
/** 入库子单id */
|
||||
@Excel(name = "入库子单id")
|
||||
private String stockinDetailId;
|
||||
|
||||
/** 入库主单 */
|
||||
@Excel(name = "入库主单")
|
||||
@Excel(name = "${stock.BasStock.stockinId}")
|
||||
private String stockinId;
|
||||
|
||||
/** 入库子单id */
|
||||
@Excel(name = "${stock.BasStock.stockinDetailId}")
|
||||
private String stockinDetailId;
|
||||
|
||||
/** 入库类型 */
|
||||
@Excel(name = "入库类型")
|
||||
@Excel(name = "${stock.BasStock.inType}")
|
||||
private String inType;
|
||||
|
||||
/** 仓库名称 */
|
||||
@Excel(name = "${stock.BasStock.warehouseName}")
|
||||
private String warehouseName;
|
||||
|
||||
/** 入库时间 */
|
||||
@Excel(name = "${stock.BasStock.inDate}")
|
||||
private String inDate;
|
||||
|
||||
/** 批次号 */
|
||||
// @Excel(name = "${stock.BasStock.lotNo}")
|
||||
private String lotNo;
|
||||
|
||||
/** 回流时间 */
|
||||
// @Excel(name = "${stock.BasStock.backDate}")
|
||||
private String backDate;
|
||||
|
||||
/** 物料GUID */
|
||||
// @Excel(name = "${stock.BasStock.productGuid}")
|
||||
private String productGuid;
|
||||
|
||||
/** 出库数量 */
|
||||
// @Excel(name = "${stock.BasStock.outQuantity}")
|
||||
private String outQuantity;
|
||||
|
||||
/** 入库班组ID */
|
||||
@Excel(name = "入库班组ID")
|
||||
// @Excel(name = "${stock.BasStock.inClassId}")
|
||||
private String inClassId;
|
||||
|
||||
/** 仓库 */
|
||||
@Excel(name = "仓库Id")
|
||||
// @Excel(name = "${stock.BasStock.warehouseId}")
|
||||
private String warehouseId;
|
||||
@Excel(name = "仓库")
|
||||
private String warehouseName;
|
||||
|
||||
|
||||
/** 垛型ID */
|
||||
@Excel(name = "垛型ID")
|
||||
// @Excel(name = "${stock.BasStock.stackingId}")
|
||||
private String stackingId;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String spare1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String spare2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
// @Excel(name = "${stock.BasStock.spare3}")
|
||||
private String spare3;
|
||||
|
||||
/** 备用字段4 */
|
||||
@Excel(name = "备用字段4")
|
||||
// @Excel(name = "${stock.BasStock.spare4}")
|
||||
private String spare4;
|
||||
|
||||
/** 备用字段5 */
|
||||
@Excel(name = "备用字段5")
|
||||
private String spare5;
|
||||
|
||||
/** 备用字段6 */
|
||||
@Excel(name = "备用字段6")
|
||||
private String spare6;
|
||||
//额外字段
|
||||
private ExtraField extraField;
|
||||
//物料名称
|
||||
// @Excel(name = "物料名称")
|
||||
private String productName;
|
||||
//货位是否锁定
|
||||
private String cargoSpaceStatus;
|
||||
//货位库存状态
|
||||
private String cargoSpaceStockStatus;
|
||||
|
||||
private String productId;
|
||||
|
||||
private List<String> typeData;
|
||||
|
||||
public String getSpare7() {
|
||||
return spare7;
|
||||
}
|
||||
|
||||
public void setSpare7(String spare7) {
|
||||
this.spare7 = spare7;
|
||||
}
|
||||
|
||||
public String getSpare8() {
|
||||
return spare8;
|
||||
}
|
||||
|
||||
public void setSpare8(String spare8) {
|
||||
this.spare8 = spare8;
|
||||
}
|
||||
|
||||
public List<String> getTypeData() {
|
||||
return typeData;
|
||||
}
|
||||
@@ -145,6 +197,15 @@ public class BasStock extends BaseEntity
|
||||
this.productId = productId;
|
||||
}
|
||||
|
||||
public void setMaterialDesc(String materialDesc) {
|
||||
this.materialDesc = materialDesc;
|
||||
}
|
||||
|
||||
public String getMaterialDesc() {
|
||||
return materialDesc;
|
||||
}
|
||||
|
||||
|
||||
public String getCargoSpaceStockStatus() {
|
||||
return cargoSpaceStockStatus;
|
||||
}
|
||||
|
||||
@@ -459,3 +459,352 @@ search.ViewStockDetail.spare8=Volume m³
|
||||
search.ViewStockDetail.remark=Remark
|
||||
search.ViewStockDetail.stockStatus=Stock Status
|
||||
search.ViewStockDetail.productStatus=Product Status
|
||||
|
||||
# BasStock Export Fields
|
||||
stock.BasStock.stockId=Stock ID
|
||||
stock.BasStock.cargoSpaceId=Cargo Space ID
|
||||
stock.BasStock.cargoSpaceName=Cargo Space Name
|
||||
stock.BasStock.stockStatus=Stock Status
|
||||
stock.BasStock.productStatus=Product Status
|
||||
stock.BasStock.lotNo=Lot Number
|
||||
stock.BasStock.inDate=In Date
|
||||
stock.BasStock.backDate=Back Date
|
||||
stock.BasStock.productGuid=Product GUID
|
||||
stock.BasStock.quantity=Quantity
|
||||
stock.BasStock.jobId=Job ID
|
||||
stock.BasStock.trayCode=Tray Code
|
||||
stock.BasStock.outQuantity=Out Quantity
|
||||
stock.BasStock.stockinDetailId=Stock In Detail ID
|
||||
stock.BasStock.stockinId=Stock In ID
|
||||
stock.BasStock.inType=In Type
|
||||
stock.BasStock.inClassId=In Class ID
|
||||
stock.BasStock.warehouseId=Warehouse ID
|
||||
stock.BasStock.warehouseName=Warehouse Name
|
||||
stock.BasStock.stackingId=Stacking ID
|
||||
stock.BasStock.spare1=Spare Field 1
|
||||
stock.BasStock.spare2=Spare Field 2
|
||||
stock.BasStock.spare3=Spare Field 3
|
||||
stock.BasStock.spare4=Spare Field 4
|
||||
stock.BasStock.spare5=Spare Field 5
|
||||
stock.BasStock.spare6=Spare Field 6
|
||||
stock.BasStock.cargoSpaceStatus=Cargo Space Lock Status
|
||||
stock.BasStock.cargoSpaceStockStatus=Cargo Space Stock Status
|
||||
stock.BasStock.productId=Product ID
|
||||
stock.BasStock.materialDesc=Material Description
|
||||
stock.BasStock.englishDesc=English Description
|
||||
stock.BasStock.netWeight=Net Weight
|
||||
stock.BasStock.length=Length
|
||||
stock.BasStock.width=Width
|
||||
stock.BasStock.height=Height
|
||||
stock.BasStock.volume=Volume
|
||||
|
||||
# BasStockFreezeRecord Export Fields
|
||||
stock.Freeze.stockId=Stock ID
|
||||
stock.Freeze.cargoSpaceId=Cargo Space ID
|
||||
stock.Freeze.cargoSpaceName=Cargo Space Name
|
||||
stock.Freeze.trayCode=Tray Code
|
||||
stock.Freeze.productId=Product ID
|
||||
stock.Freeze.productName=Product Name
|
||||
stock.Freeze.printDate=Production Date
|
||||
stock.Freeze.lotNo=Lot Number
|
||||
stock.Freeze.oldStatus=Initial Status
|
||||
stock.Freeze.currStatus=Current Status
|
||||
stock.Freeze.method=Operation
|
||||
stock.Freeze.warehouseId=Warehouse
|
||||
stock.Freeze.stockDetailId=Stock Detail ID
|
||||
stock.Freeze.operatingTarget=Operating Target
|
||||
stock.Freeze.barCodeOldQuantity=Barcode Quantity (Old)
|
||||
stock.Freeze.barCodeQuantity=Barcode Quantity (New)
|
||||
stock.Freeze.productGuid=Product GUID
|
||||
|
||||
# BasStockMaintainRecord Export Fields
|
||||
stock.Maintain.stockId=Stock ID
|
||||
stock.Maintain.cargoSpaceId=Cargo Space ID
|
||||
stock.Maintain.cargoSpaceName=Cargo Space Name
|
||||
stock.Maintain.trayCode=Tray Code
|
||||
stock.Maintain.productId=Product ID
|
||||
stock.Maintain.productName=Product Name
|
||||
stock.Maintain.printDate=Production Date
|
||||
stock.Maintain.lotNo=Lot Number
|
||||
stock.Maintain.oldQuantity=Initial Quantity
|
||||
stock.Maintain.quantity=Quantity After Operation
|
||||
stock.Maintain.method=Operation
|
||||
stock.Maintain.warehouseId=Warehouse
|
||||
stock.Maintain.stockDetailId=Stock Detail ID
|
||||
stock.Maintain.operatingTarget=Operating Target
|
||||
stock.Maintain.barCodeOldQuantity=Barcode Quantity (Old)
|
||||
stock.Maintain.barCodeQuantity=Barcode Quantity (New)
|
||||
stock.Maintain.productGuid=Product GUID
|
||||
|
||||
# BasSupplier Export Fields
|
||||
bas.Supplier.supplierNo=Supplier Number
|
||||
bas.Supplier.supplierGroupNo=Supplier Group Number
|
||||
bas.Supplier.supplierName=Supplier Name
|
||||
bas.Supplier.simpleName=Short Name
|
||||
bas.Supplier.useable=Available
|
||||
bas.Supplier.supplierArae=Regional Classification
|
||||
bas.Supplier.taxpayerRegistrationNumber=Taxpayer Registration Number
|
||||
bas.Supplier.country=Country
|
||||
bas.Supplier.timeZone=Time Zone
|
||||
bas.Supplier.dataFormat=Data Format
|
||||
bas.Supplier.receivingCountry=Receiving Country
|
||||
bas.Supplier.taxCategory=Tax Category
|
||||
bas.Supplier.legalPerson=Legal Person
|
||||
bas.Supplier.registeredCapital=Registered Capital
|
||||
bas.Supplier.address=Company Address
|
||||
bas.Supplier.contactName=Contact Name
|
||||
bas.Supplier.contactNumber=Contact Number
|
||||
|
||||
# BasCustomer Export Fields
|
||||
bas.Customer.customerNo=Customer Number
|
||||
bas.Customer.customerGroupNo=Customer Group Number
|
||||
bas.Customer.customerName=Customer Name
|
||||
bas.Customer.simpleName=Customer Short Name
|
||||
bas.Customer.useable=Available
|
||||
bas.Customer.businessDepartment=Business Department
|
||||
bas.Customer.salesman=Salesman
|
||||
bas.Customer.mnemonicCode=Mnemonic Code
|
||||
bas.Customer.type=Customer Type
|
||||
bas.Customer.taxpayerRegistrationNumber=Taxpayer Registration Number
|
||||
bas.Customer.organization=Financial Organization
|
||||
bas.Customer.supCustomer=Superior Customer
|
||||
bas.Customer.retailInvestor=Retail Investor
|
||||
bas.Customer.country=Country/Region
|
||||
bas.Customer.timeZone=Time Zone
|
||||
bas.Customer.dataFormat=Data Format
|
||||
bas.Customer.contactName=Contact Name
|
||||
bas.Customer.shipment=Shipping Country
|
||||
bas.Customer.taxCategory=Tax Category
|
||||
|
||||
# BasProduct Export Fields
|
||||
bas.Product.productId=Product ID
|
||||
bas.Product.parentId=Parent Node ID
|
||||
bas.Product.price=Price
|
||||
bas.Product.cargoNo=Brand
|
||||
bas.Product.unit=Unit
|
||||
bas.Product.spec=Specification
|
||||
bas.Product.spare1=Spare Field 1
|
||||
bas.Product.spare2=Spare Field 2
|
||||
bas.Product.spare3=Spare Field 3
|
||||
bas.Product.spare4=Spare Field 4
|
||||
bas.Product.spare5=Spare Field 5
|
||||
bas.Product.spare6=Spare Field 6
|
||||
bas.Product.spare7=Spare Field 7
|
||||
bas.Product.spare8=Spare Field 8
|
||||
bas.Product.spare9=Spare Field 9
|
||||
bas.Product.productName=Product Name
|
||||
|
||||
# BasProductPort Export Fields
|
||||
bas.ProductPort.portName=Port Name
|
||||
bas.ProductPort.portType=Port Type
|
||||
bas.ProductPort.portDesc=Port Description
|
||||
bas.ProductPort.createMan=Creator
|
||||
|
||||
# BasContainer Export Fields
|
||||
bas.Container.containerId=Container ID
|
||||
bas.Container.portName=Port Name
|
||||
bas.Container.status=Container Status
|
||||
bas.Container.productTypeQuantity=Product Type Quantity
|
||||
bas.Container.capacity=Capacity
|
||||
bas.Container.operationMan=Operator
|
||||
|
||||
# BasTraycodeFormat Export Fields
|
||||
bas.TraycodeFormat.barcodeFormat=Barcode Prefix
|
||||
bas.TraycodeFormat.serialRule=Serial Rule
|
||||
bas.TraycodeFormat.serialExample=Barcode Example
|
||||
bas.TraycodeFormat.remarks=Description
|
||||
bas.TraycodeFormat.minNum=Minimum Serial Number
|
||||
bas.TraycodeFormat.maxNum=Maximum Serial Number
|
||||
bas.TraycodeFormat.spare1=Spare Field 1
|
||||
bas.TraycodeFormat.spare2=Spare Field 2
|
||||
bas.TraycodeFormat.spare3=Spare Field 3
|
||||
|
||||
# BasTraycode Export Fields
|
||||
bas.Traycode.id=ID
|
||||
bas.Traycode.formatId=Format ID
|
||||
bas.Traycode.trayCode=Tray Code
|
||||
bas.Traycode.spare1=Spare Field 1
|
||||
bas.Traycode.spare2=Spare Field 2
|
||||
bas.Traycode.spare3=Spare Field 3
|
||||
|
||||
# BasWarehouse Export Fields
|
||||
bas.Warehouse.warehouseId=Warehouse ID
|
||||
bas.Warehouse.warehouseNo=Warehouse Number
|
||||
bas.Warehouse.projectNo=Project Number
|
||||
bas.Warehouse.warehouseName=Warehouse Name
|
||||
bas.Warehouse.address=Warehouse Address
|
||||
bas.Warehouse.cDesc=Warehouse Description
|
||||
bas.Warehouse.warehouseKind=Warehouse Level
|
||||
bas.Warehouse.warehouseType=Warehouse Type
|
||||
bas.Warehouse.isCurrent=Is Available
|
||||
|
||||
# BasCargoSpace Export Fields
|
||||
bas.CargoSpace.warehouseId=Warehouse ID
|
||||
bas.CargoSpace.roadwayId=Roadway ID
|
||||
bas.CargoSpace.cargoAreaId=Cargo Area ID
|
||||
bas.CargoSpace.theType=Cargo Type
|
||||
bas.CargoSpace.theTypeName=Cargo Type Name
|
||||
bas.CargoSpace.cargoSpaceName=Cargo Space Name
|
||||
bas.CargoSpace.thePlatoon=Row
|
||||
bas.CargoSpace.theColumn=Column
|
||||
bas.CargoSpace.theFloor=Floor
|
||||
bas.CargoSpace.status=Cargo Status
|
||||
bas.CargoSpace.locked=Locked
|
||||
bas.CargoSpace.trayCode=Tray Code
|
||||
bas.CargoSpace.cargoHight=Cargo Height
|
||||
bas.CargoSpace.issDouble=Is Double
|
||||
bas.CargoSpace.groupCodingNo=Group Coding No
|
||||
bas.CargoSpace.groupCoding=Group Coding
|
||||
bas.CargoSpace.cargoSpaceLogo=Cargo Space Logo
|
||||
bas.CargoSpace.thisCargoArea=This Cargo Area
|
||||
|
||||
#字典
|
||||
dict.is_available.n=否
|
||||
dict.is_available.y=是
|
||||
dict.sys_user_sex.a1=男
|
||||
dict.sys_user_sex.a2=女
|
||||
dict.sys_user_sex.a3=未知
|
||||
|
||||
dict.sys_show_hide.a1=显示
|
||||
dict.sys_show_hide.a2=隐藏
|
||||
|
||||
dict.sys_normal_disable.a1=正常
|
||||
dict.sys_normal_disable.a2=停用
|
||||
|
||||
dict.sys_job_status.a1=正常
|
||||
dict.sys_job_status.a2=暂停
|
||||
|
||||
dict.sys_job_group.a1=默认
|
||||
dict.sys_job_group.a2=系统
|
||||
|
||||
dict.sys_yes_no.a1=是
|
||||
dict.sys_yes_no.a2=否
|
||||
|
||||
dict.sys_notice_type.a1=通知
|
||||
dict.sys_notice_type.a2=公告
|
||||
|
||||
dict.sys_notice_status.a1=正常
|
||||
dict.sys_notice_status.a2=关闭
|
||||
|
||||
dict.sys_oper_type.a1=新增
|
||||
dict.sys_oper_type.a2=修改
|
||||
dict.sys_oper_type.a3=删除
|
||||
dict.sys_oper_type.a4=授权
|
||||
dict.sys_oper_type.a5=导出
|
||||
dict.sys_oper_type.a6=导入
|
||||
dict.sys_oper_type.a7=强退
|
||||
dict.sys_oper_type.a8=生成代码
|
||||
dict.sys_oper_type.a9=清空数据
|
||||
dict.sys_oper_type.a10=其他
|
||||
|
||||
dict.sys_common_status.a1=成功
|
||||
dict.sys_common_status.a2=失败
|
||||
|
||||
dict.in_bill_type.a1=自建单据
|
||||
|
||||
dict.in_bill_status.a1=未执行
|
||||
dict.in_bill_status.a2=审核中
|
||||
dict.in_bill_status.a3=正执行
|
||||
dict.in_bill_status.a4=已完成
|
||||
dict.in_bill_status.a5=已作废
|
||||
|
||||
dict.out_bill_type.a1=拣选出库
|
||||
dict.out_bill_type.a2=退货单据
|
||||
|
||||
dict.out_bill_status.a1=待执行
|
||||
dict.out_bill_status.a2=已审核
|
||||
dict.out_bill_status.a3=正执行
|
||||
dict.out_bill_status.a4=已完成
|
||||
dict.out_bill_status.a5=已作废
|
||||
|
||||
dict.in_job_type.a1=空料箱入库
|
||||
dict.in_job_type.a2=CTU物资入库
|
||||
dict.in_job_type.a3=高架库物资入库
|
||||
dict.in_job_type.a4=托盘垛入库
|
||||
|
||||
dict.mydo_job_status.a1=未执行
|
||||
dict.mydo_job_status.a2=待执行
|
||||
dict.mydo_job_status.a3=正执行
|
||||
dict.mydo_job_status.a4=已完成
|
||||
dict.mydo_job_status.a5=已作废
|
||||
|
||||
dict.execution_phase_type.a1=输送线
|
||||
dict.execution_phase_type.a2=入库口
|
||||
dict.execution_phase_type.a3=CTU
|
||||
dict.execution_phase_type.a4=出库口
|
||||
|
||||
dict.on_line_type.a1=类型1
|
||||
dict.on_line_type.a2=类型2
|
||||
|
||||
dict.out_job_type.a1=空料箱出库
|
||||
dict.out_job_type.a2=空托盘出库
|
||||
dict.out_job_type.a3=料箱出库
|
||||
dict.out_job_type.a4=托盘出库
|
||||
|
||||
dict.stock_status.a1=正常
|
||||
dict.stock_status.a2=冻结
|
||||
|
||||
dict.product_status.a1=正常
|
||||
dict.product_status.a2=盘点待审批
|
||||
dict.product_status.a3=异常
|
||||
|
||||
dict.stock_maintain_method.a1=新增
|
||||
dict.stock_maintain_method.a2=修改
|
||||
dict.stock_maintain_method.a3=删除
|
||||
|
||||
dict.receive_bill_status.a1=未质检
|
||||
dict.receive_bill_status.a2=质检完成
|
||||
|
||||
dict.check_stock_type.a1=物料盘点
|
||||
dict.check_stock_type.a2=货位盘点
|
||||
|
||||
|
||||
dict.check_bill_status.a1=未执行
|
||||
dict.check_bill_status.a2=审核中
|
||||
dict.check_bill_status.a3=正执行
|
||||
dict.check_bill_status.a4=已完成
|
||||
dict.check_bill_status.a5=已作废
|
||||
|
||||
dict.product_port_rel_status.a1=是
|
||||
dict.product_port_rel_status.a2=否
|
||||
|
||||
dict.check_in_job_type.a1=盘点料箱入库
|
||||
dict.check_in_job_type.a2=盘点托盘入库
|
||||
|
||||
dict.check_out_job_type.a1=盘点料箱出库
|
||||
dict.check_out_job_type.a2=盘点托盘出库
|
||||
|
||||
dict.cargo_space_status.a1=空
|
||||
dict.cargo_space_status.a2=满
|
||||
dict.cargo_space_status.a3=入库分配
|
||||
dict.cargo_space_status.a4=出库分配
|
||||
dict.cargo_space_status.a5=入库盘点分配
|
||||
dict.cargo_space_status.a6=出库盘点分配
|
||||
|
||||
dict.warehouse_port_type.a1=入口
|
||||
dict.warehouse_port_type.a2=出口
|
||||
|
||||
dict.port_type.a1=缓存点位
|
||||
dict.port_type.a2=拣选工位
|
||||
dict.port_type.a3=拣选放货点位
|
||||
dict.port_type.a4=集货缓存点位
|
||||
dict.port_type.a5=线边点位
|
||||
dict.port_type.a6=台位点位
|
||||
|
||||
dict.cargo_space_lock_status.a1=锁定
|
||||
dict.cargo_space_lock_status.a2=解锁
|
||||
|
||||
dict.warehouse_type.a1=高架
|
||||
dict.warehouse_type.a2=CTU库
|
||||
dict.warehouse_type.a3=平库
|
||||
|
||||
dict.record_type.a1=修改
|
||||
dict.record_type.a2=新增
|
||||
dict.record_type.a3=删除
|
||||
|
||||
dict.audit_diff_status.a1=未审核
|
||||
dict.audit_diff_status.a2=审查通过
|
||||
dict.audit_diff_status.a3=审核不通过
|
||||
|
||||
dict.agv_status.a1=无任务
|
||||
dict.agv_status.a2=任务中
|
||||
@@ -457,3 +457,353 @@ search.ViewStockDetail.spare8=体积m³
|
||||
search.ViewStockDetail.remark=备注
|
||||
search.ViewStockDetail.stockStatus=库存状态
|
||||
search.ViewStockDetail.productStatus=物料状态
|
||||
|
||||
# BasStock 库存信息导出字段
|
||||
stock.BasStock.stockId=库存ID
|
||||
stock.BasStock.cargoSpaceId=货位ID
|
||||
stock.BasStock.cargoSpaceName=货位名称
|
||||
stock.BasStock.stockStatus=库存状态
|
||||
stock.BasStock.productStatus=物料状态
|
||||
stock.BasStock.lotNo=批次号
|
||||
stock.BasStock.inDate=入库时间
|
||||
stock.BasStock.backDate=回流时间
|
||||
stock.BasStock.productGuid=物料GUID
|
||||
stock.BasStock.quantity=库存数量
|
||||
stock.BasStock.jobId=作业ID
|
||||
stock.BasStock.trayCode=托盘条码
|
||||
stock.BasStock.outQuantity=出库数量
|
||||
stock.BasStock.stockinDetailId=入库子单ID
|
||||
stock.BasStock.stockinId=入库主单
|
||||
stock.BasStock.inType=入库类型
|
||||
stock.BasStock.inClassId=入库班组ID
|
||||
stock.BasStock.warehouseId=仓库ID
|
||||
stock.BasStock.warehouseName=仓库名称
|
||||
stock.BasStock.stackingId=垛型ID
|
||||
stock.BasStock.spare1=备用字段1
|
||||
stock.BasStock.spare2=备用字段2
|
||||
stock.BasStock.spare3=备用字段3
|
||||
stock.BasStock.spare4=备用字段4
|
||||
stock.BasStock.spare5=备用字段5
|
||||
stock.BasStock.spare6=备用字段6
|
||||
stock.BasStock.cargoSpaceStatus=货位锁定状态
|
||||
stock.BasStock.cargoSpaceStockStatus=货位库存状态
|
||||
stock.BasStock.productId=物料ID
|
||||
stock.BasStock.materialDesc=物料描述
|
||||
stock.BasStock.englishDesc=物料英文描述
|
||||
stock.BasStock.netWeight=净重
|
||||
stock.BasStock.length=长度
|
||||
stock.BasStock.width=宽度
|
||||
stock.BasStock.height=高度
|
||||
stock.BasStock.volume=体积
|
||||
|
||||
# BasStockFreezeRecord 库存冻结记录导出字段
|
||||
stock.Freeze.stockId=库存编码
|
||||
stock.Freeze.cargoSpaceId=货位编码
|
||||
stock.Freeze.cargoSpaceName=货位名称
|
||||
stock.Freeze.trayCode=托盘条码
|
||||
stock.Freeze.productId=物品编码
|
||||
stock.Freeze.productName=物品名称
|
||||
stock.Freeze.printDate=生产日期
|
||||
stock.Freeze.lotNo=批号
|
||||
stock.Freeze.oldStatus=初始状态
|
||||
stock.Freeze.currStatus=更改状态
|
||||
stock.Freeze.method=操作
|
||||
stock.Freeze.warehouseId=仓库
|
||||
stock.Freeze.stockDetailId=库存字表ID
|
||||
stock.Freeze.operatingTarget=操作目标
|
||||
stock.Freeze.barCodeOldQuantity=条码数量（旧）
|
||||
stock.Freeze.barCodeQuantity=条码数量（新）
|
||||
stock.Freeze.productGuid=物料GUID
|
||||
|
||||
# BasStockMaintainRecord 库存操作记录导出字段
|
||||
stock.Maintain.stockId=库存编码
|
||||
stock.Maintain.cargoSpaceId=货位编码
|
||||
stock.Maintain.cargoSpaceName=货位名称
|
||||
stock.Maintain.trayCode=托盘条码
|
||||
stock.Maintain.productId=物品编码
|
||||
stock.Maintain.productName=物品名称
|
||||
stock.Maintain.printDate=生产日期
|
||||
stock.Maintain.lotNo=批号
|
||||
stock.Maintain.oldQuantity=初始数量
|
||||
stock.Maintain.quantity=操作后数量
|
||||
stock.Maintain.method=操作
|
||||
stock.Maintain.warehouseId=仓库
|
||||
stock.Maintain.stockDetailId=库存字表ID
|
||||
stock.Maintain.operatingTarget=操作目标
|
||||
stock.Maintain.barCodeOldQuantity=条码数量（旧）
|
||||
stock.Maintain.barCodeQuantity=条码数量（新）
|
||||
stock.Maintain.productGuid=物料GUID
|
||||
|
||||
# BasSupplier 供应商管理导出字段
|
||||
bas.Supplier.supplierNo=供应商编号
|
||||
bas.Supplier.supplierGroupNo=供应商分组编号
|
||||
bas.Supplier.supplierName=供应商名称
|
||||
bas.Supplier.simpleName=简称
|
||||
bas.Supplier.useable=是否可用
|
||||
bas.Supplier.supplierArae=地区分类
|
||||
bas.Supplier.taxpayerRegistrationNumber=纳税人登记号
|
||||
bas.Supplier.country=国家
|
||||
bas.Supplier.timeZone=时区
|
||||
bas.Supplier.dataFormat=数据格式
|
||||
bas.Supplier.receivingCountry=收货国家
|
||||
bas.Supplier.taxCategory=税类
|
||||
bas.Supplier.legalPerson=法人
|
||||
bas.Supplier.registeredCapital=注册资金
|
||||
bas.Supplier.address=企业地址
|
||||
bas.Supplier.contactName=联系人姓名
|
||||
bas.Supplier.contactNumber=联系电话
|
||||
|
||||
# BasCustomer 客户管理导出字段
|
||||
bas.Customer.customerNo=客户编号
|
||||
bas.Customer.customerGroupNo=客户基本分类
|
||||
bas.Customer.customerName=客户名称
|
||||
bas.Customer.simpleName=客户简称
|
||||
bas.Customer.useable=是否可用
|
||||
bas.Customer.businessDepartment=业务部门
|
||||
bas.Customer.salesman=业务员
|
||||
bas.Customer.mnemonicCode=助忆码
|
||||
bas.Customer.type=客户类型
|
||||
bas.Customer.taxpayerRegistrationNumber=纳税人登记号
|
||||
bas.Customer.organization=对应财务组织
|
||||
bas.Customer.supCustomer=上级客户
|
||||
bas.Customer.retailInvestor=散户
|
||||
bas.Customer.country=国家/地区
|
||||
bas.Customer.timeZone=时区
|
||||
bas.Customer.dataFormat=数据格式
|
||||
bas.Customer.contactName=联系人姓名
|
||||
bas.Customer.shipment=发货国家
|
||||
bas.Customer.taxCategory=税类
|
||||
|
||||
# BasProduct 物料管理导出字段
|
||||
bas.Product.productId=物料编码
|
||||
bas.Product.parentId=父节点ID
|
||||
bas.Product.price=价格
|
||||
bas.Product.cargoNo=品牌
|
||||
bas.Product.unit=单位
|
||||
bas.Product.spec=规格
|
||||
bas.Product.spare1=备用字段1
|
||||
bas.Product.spare2=备用字段2
|
||||
bas.Product.spare3=备用字段3
|
||||
bas.Product.spare4=备用字段4
|
||||
bas.Product.spare5=备用字段5
|
||||
bas.Product.spare6=备用字段6
|
||||
bas.Product.spare7=备用字段7
|
||||
bas.Product.spare8=备用字段8
|
||||
bas.Product.spare9=备用字段9
|
||||
bas.Product.productName=物料名称
|
||||
|
||||
# BasProductPort 基础点位导出字段
|
||||
bas.ProductPort.portName=点位名称
|
||||
bas.ProductPort.portType=点位分类
|
||||
bas.ProductPort.portDesc=点位描述
|
||||
bas.ProductPort.createMan=创建人
|
||||
|
||||
# BasContainer 容器管理导出字段
|
||||
bas.Container.containerId=容器编号
|
||||
bas.Container.portName=点位名称
|
||||
bas.Container.status=容器状态
|
||||
bas.Container.productTypeQuantity=物料种类
|
||||
bas.Container.capacity=容量
|
||||
bas.Container.operationMan=操作人
|
||||
|
||||
# BasTraycodeFormat 条码生成规则导出字段
|
||||
bas.TraycodeFormat.barcodeFormat=条码前缀
|
||||
bas.TraycodeFormat.serialRule=流水号
|
||||
bas.TraycodeFormat.serialExample=条码样例
|
||||
bas.TraycodeFormat.remarks=描述
|
||||
bas.TraycodeFormat.minNum=最小流水号
|
||||
bas.TraycodeFormat.maxNum=最大流水号
|
||||
bas.TraycodeFormat.spare1=备用字段1
|
||||
bas.TraycodeFormat.spare2=备用字段2
|
||||
bas.TraycodeFormat.spare3=备用字段3
|
||||
|
||||
# BasTraycode 条码信息导出字段
|
||||
bas.Traycode.id=ID
|
||||
bas.Traycode.formatId=条码类型ID
|
||||
bas.Traycode.trayCode=条码
|
||||
bas.Traycode.spare1=备用字段1
|
||||
bas.Traycode.spare2=备用字段2
|
||||
bas.Traycode.spare3=备用字段3
|
||||
|
||||
# BasWarehouse 仓库管理导出字段
|
||||
bas.Warehouse.warehouseId=仓库ID
|
||||
bas.Warehouse.warehouseNo=仓库编号
|
||||
bas.Warehouse.projectNo=项目编号
|
||||
bas.Warehouse.warehouseName=仓库名称
|
||||
bas.Warehouse.address=仓库地址
|
||||
bas.Warehouse.cDesc=仓库描述
|
||||
bas.Warehouse.warehouseKind=仓库级别
|
||||
bas.Warehouse.warehouseType=仓库类型
|
||||
bas.Warehouse.isCurrent=是否可用
|
||||
|
||||
# BasCargoSpace 货位管理导出字段
|
||||
bas.CargoSpace.warehouseId=仓库ID
|
||||
bas.CargoSpace.roadwayId=巷道ID
|
||||
bas.CargoSpace.cargoAreaId=货区ID
|
||||
bas.CargoSpace.theType=货位类型
|
||||
bas.CargoSpace.theTypeName=货位类型名称
|
||||
bas.CargoSpace.cargoSpaceName=货位名称
|
||||
bas.CargoSpace.thePlatoon=排
|
||||
bas.CargoSpace.theColumn=列
|
||||
bas.CargoSpace.theFloor=层
|
||||
bas.CargoSpace.status=货位状态
|
||||
bas.CargoSpace.locked=是否锁定
|
||||
bas.CargoSpace.trayCode=托盘条码
|
||||
bas.CargoSpace.cargoHight=货位高度
|
||||
bas.CargoSpace.issDouble=是否双伸
|
||||
bas.CargoSpace.groupCodingNo=双货位分组编码
|
||||
bas.CargoSpace.groupCoding=双货位分组编码
|
||||
bas.CargoSpace.cargoSpaceLogo=双货位标识
|
||||
bas.CargoSpace.thisCargoArea=本仓库区域
|
||||
|
||||
#字典
|
||||
dict.is_available.n=否
|
||||
dict.is_available.y=是
|
||||
dict.sys_user_sex.a1=男
|
||||
dict.sys_user_sex.a2=女
|
||||
dict.sys_user_sex.a3=未知
|
||||
|
||||
dict.sys_show_hide.a1=显示
|
||||
dict.sys_show_hide.a2=隐藏
|
||||
|
||||
dict.sys_normal_disable.a1=正常
|
||||
dict.sys_normal_disable.a2=停用
|
||||
|
||||
dict.sys_job_status.a1=正常
|
||||
dict.sys_job_status.a2=暂停
|
||||
|
||||
dict.sys_job_group.a1=默认
|
||||
dict.sys_job_group.a2=系统
|
||||
|
||||
dict.sys_yes_no.a1=是
|
||||
dict.sys_yes_no.a2=否
|
||||
|
||||
dict.sys_notice_type.a1=通知
|
||||
dict.sys_notice_type.a2=公告
|
||||
|
||||
dict.sys_notice_status.a1=正常
|
||||
dict.sys_notice_status.a2=关闭
|
||||
|
||||
dict.sys_oper_type.a1=新增
|
||||
dict.sys_oper_type.a2=修改
|
||||
dict.sys_oper_type.a3=删除
|
||||
dict.sys_oper_type.a4=授权
|
||||
dict.sys_oper_type.a5=导出
|
||||
dict.sys_oper_type.a6=导入
|
||||
dict.sys_oper_type.a7=强退
|
||||
dict.sys_oper_type.a8=生成代码
|
||||
dict.sys_oper_type.a9=清空数据
|
||||
dict.sys_oper_type.a10=其他
|
||||
|
||||
dict.sys_common_status.a1=成功
|
||||
dict.sys_common_status.a2=失败
|
||||
|
||||
dict.in_bill_type.a1=自建单据
|
||||
|
||||
dict.in_bill_status.a1=未执行
|
||||
dict.in_bill_status.a2=审核中
|
||||
dict.in_bill_status.a3=正执行
|
||||
dict.in_bill_status.a4=已完成
|
||||
dict.in_bill_status.a5=已作废
|
||||
|
||||
dict.out_bill_type.a1=拣选出库
|
||||
dict.out_bill_type.a2=退货单据
|
||||
|
||||
dict.out_bill_status.a1=待执行
|
||||
dict.out_bill_status.a2=已审核
|
||||
dict.out_bill_status.a3=正执行
|
||||
dict.out_bill_status.a4=已完成
|
||||
dict.out_bill_status.a5=已作废
|
||||
|
||||
dict.in_job_type.a1=空料箱入库
|
||||
dict.in_job_type.a2=CTU物资入库
|
||||
dict.in_job_type.a3=高架库物资入库
|
||||
dict.in_job_type.a4=托盘垛入库
|
||||
|
||||
dict.mydo_job_status.a1=未执行
|
||||
dict.mydo_job_status.a2=待执行
|
||||
dict.mydo_job_status.a3=正执行
|
||||
dict.mydo_job_status.a4=已完成
|
||||
dict.mydo_job_status.a5=已作废
|
||||
|
||||
dict.execution_phase_type.a1=输送线
|
||||
dict.execution_phase_type.a2=入库口
|
||||
dict.execution_phase_type.a3=CTU
|
||||
dict.execution_phase_type.a4=出库口
|
||||
|
||||
dict.on_line_type.a1=类型1
|
||||
dict.on_line_type.a2=类型2
|
||||
|
||||
dict.out_job_type.a1=空料箱出库
|
||||
dict.out_job_type.a2=空托盘出库
|
||||
dict.out_job_type.a3=料箱出库
|
||||
dict.out_job_type.a4=托盘出库
|
||||
|
||||
dict.stock_status.a1=正常
|
||||
dict.stock_status.a2=冻结
|
||||
|
||||
dict.product_status.a1=正常
|
||||
dict.product_status.a2=盘点待审批
|
||||
dict.product_status.a3=异常
|
||||
|
||||
dict.stock_maintain_method.a1=新增
|
||||
dict.stock_maintain_method.a2=修改
|
||||
dict.stock_maintain_method.a3=删除
|
||||
|
||||
dict.receive_bill_status.a1=未质检
|
||||
dict.receive_bill_status.a2=质检完成
|
||||
|
||||
dict.check_stock_type.a1=物料盘点
|
||||
dict.check_stock_type.a2=货位盘点
|
||||
|
||||
|
||||
dict.check_bill_status.a1=未执行
|
||||
dict.check_bill_status.a2=审核中
|
||||
dict.check_bill_status.a3=正执行
|
||||
dict.check_bill_status.a4=已完成
|
||||
dict.check_bill_status.a5=已作废
|
||||
|
||||
dict.product_port_rel_status.a1=是
|
||||
dict.product_port_rel_status.a2=否
|
||||
|
||||
dict.check_in_job_type.a1=盘点料箱入库
|
||||
dict.check_in_job_type.a2=盘点托盘入库
|
||||
|
||||
dict.check_out_job_type.a1=盘点料箱出库
|
||||
dict.check_out_job_type.a2=盘点托盘出库
|
||||
|
||||
dict.cargo_space_status.a1=空
|
||||
dict.cargo_space_status.a2=满
|
||||
dict.cargo_space_status.a3=入库分配
|
||||
dict.cargo_space_status.a4=出库分配
|
||||
dict.cargo_space_status.a5=入库盘点分配
|
||||
dict.cargo_space_status.a6=出库盘点分配
|
||||
|
||||
dict.warehouse_port_type.a1=入口
|
||||
dict.warehouse_port_type.a2=出口
|
||||
|
||||
dict.port_type.a1=缓存点位
|
||||
dict.port_type.a2=拣选工位
|
||||
dict.port_type.a3=拣选放货点位
|
||||
dict.port_type.a4=集货缓存点位
|
||||
dict.port_type.a5=线边点位
|
||||
dict.port_type.a6=台位点位
|
||||
|
||||
dict.cargo_space_lock_status.a1=锁定
|
||||
dict.cargo_space_lock_status.a2=解锁
|
||||
|
||||
dict.warehouse_type.a1=高架
|
||||
dict.warehouse_type.a2=CTU库
|
||||
dict.warehouse_type.a3=平库
|
||||
|
||||
dict.record_type.a1=修改
|
||||
dict.record_type.a2=新增
|
||||
dict.record_type.a3=删除
|
||||
|
||||
dict.audit_diff_status.a1=未审核
|
||||
dict.audit_diff_status.a2=审查通过
|
||||
dict.audit_diff_status.a3=审核不通过
|
||||
|
||||
dict.agv_status.a1=无任务
|
||||
dict.agv_status.a2=任务中
|
||||
|
||||
|
||||
@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<select id="selectBasWarehouseList" parameterType="BasWarehouse" resultMap="BasWarehouseResult">
|
||||
<include refid="selectBasWarehouseVo"/>
|
||||
<where>
|
||||
<if test="warehouseId != null and warehouseId != ''">and warehouse_id = #{warehouseId}</if>
|
||||
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no = #{warehouseNo}</if>
|
||||
<if test="projectNo != null and projectNo != ''">and project_no = #{projectNo}</if>
|
||||
<if test="warehouseId != null and warehouseId != ''">and warehouse_id like concat('%',#{warehouseId}, '%')</if>
|
||||
<if test="warehouseNo != null and warehouseNo != ''">and warehouse_no like concat('%',#{warehouseNo}, '%')</if>
|
||||
<if test="projectNo != null and projectNo != ''">and project_no like concat('%',#{projectNo}, '%')</if>
|
||||
<if test="warehouseName != null and warehouseName != ''">and warehouse_name like concat('%',
|
||||
#{warehouseName}, '%')
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user