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

给所有查询统计页面添加product表新加字段

Browse Source
This commit is contained in:
猫猫guowen
2025-06-13 16:06:30 +08:00
parent 740c917ba6
commit f794b3ded9
32 changed files with 1779 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,6 +51,40 @@ public class StockSummary extends BaseEntity
@Excel(name = "库存数量")
private Double quantity;
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 分组字段控制 */
private Boolean groupByProductId;
private Boolean groupByProductName;
@@ -59,6 +93,135 @@ public class StockSummary extends BaseEntity
private Boolean groupByLotNo;
private Boolean groupByWarehouseId;
private Boolean groupByRoadwayId;
private Boolean groupByPrice;
private Boolean groupBySpare1;
private Boolean groupBySpare2;
private Boolean groupBySpare5;
private Boolean groupBySpare6;
private Boolean groupBySpare7;
private Boolean groupBySpare8;
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public Boolean getGroupByPrice() {
return groupByPrice;
}
public void setGroupByPrice(Boolean groupByPrice) {
this.groupByPrice = groupByPrice;
}
public Boolean getGroupBySpare1() {
return groupBySpare1;
}
public void setGroupBySpare1(Boolean groupBySpare1) {
this.groupBySpare1 = groupBySpare1;
}
public Boolean getGroupBySpare2() {
return groupBySpare2;
}
public void setGroupBySpare2(Boolean groupBySpare2) {
this.groupBySpare2 = groupBySpare2;
}
public Boolean getGroupBySpare5() {
return groupBySpare5;
}
public void setGroupBySpare5(Boolean groupBySpare5) {
this.groupBySpare5 = groupBySpare5;
}
public Boolean getGroupBySpare6() {
return groupBySpare6;
}
public void setGroupBySpare6(Boolean groupBySpare6) {
this.groupBySpare6 = groupBySpare6;
}
public Boolean getGroupBySpare7() {
return groupBySpare7;
}
public void setGroupBySpare7(Boolean groupBySpare7) {
this.groupBySpare7 = groupBySpare7;
}
public Boolean getGroupBySpare8() {
return groupBySpare8;
}
public void setGroupBySpare8(Boolean groupBySpare8) {
this.groupBySpare8 = groupBySpare8;
}
public Boolean getGroupByProductId() {
return groupByProductId;
@@ -208,16 +371,38 @@ public class StockSummary extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("onlyIdentity", getOnlyIdentity())
.append("productId", getProductId())
.append("productName", getProductName())
.append("spec", getSpec())
.append("unit", getUnit())
.append("lotNo", getLotNo())
.append("warehouseId", getWarehouseId())
.append("roadwayId", getRoadwayId())
.append("quantity", getQuantity())
.toString();
return "StockSummary{" +
"onlyIdentity=" + onlyIdentity +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", lotNo='" + lotNo + '\'' +
", warehouseId='" + warehouseId + '\'' +
", roadwayId='" + roadwayId + '\'' +
", quantity=" + quantity +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
", groupByProductId=" + groupByProductId +
", groupByProductName=" + groupByProductName +
", groupBySpec=" + groupBySpec +
", groupByUnit=" + groupByUnit +
", groupByLotNo=" + groupByLotNo +
", groupByWarehouseId=" + groupByWarehouseId +
", groupByRoadwayId=" + groupByRoadwayId +
", groupByPrice=" + groupByPrice +
", groupBySpare1=" + groupBySpare1 +
", groupBySpare2=" + groupBySpare2 +
", groupBySpare5=" + groupBySpare5 +
", groupBySpare6=" + groupBySpare6 +
", groupBySpare7=" + groupBySpare7 +
", groupBySpare8=" + groupBySpare8 +
'}';
}
}

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

@@ -82,10 +82,6 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
@@ -94,7 +90,93 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
@Excel(name = "价格")
private String price;
public void setId(Long id)
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
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 void setId(Long id)
{
this.id = id;
}
@@ -264,17 +346,7 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -296,29 +368,33 @@ public class ViewFlatWarehouseInFlow extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("inOrOut", getInOrOut())
.append("inOrOutSotckId", getInOrOutSotckId())
.append("inOrOutSotckDetailId", getInOrOutSotckDetailId())
.append("productGuid", getProductGuid())
.append("productId", getProductId())
.append("quantity", getQuantity())
.append("createTime", getCreateTime())
.append("createMan", getCreateMan())
.append("warehouseId", getWarehouseId())
.append("warehouseName", getWarehouseName())
.append("address", getAddress())
.append("cDesc", getcDesc())
.append("warehouseKind", getWarehouseKind())
.append("warehouseType", getWarehouseType())
.append("isCurrent", getIsCurrent())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("price", getPrice())
.append("remark", getRemark())
.toString();
return "ViewFlatWarehouseInFlow{" +
"id=" + id +
", inOrOut='" + inOrOut + '\'' +
", inOrOutSotckId='" + inOrOutSotckId + '\'' +
", inOrOutSotckDetailId='" + inOrOutSotckDetailId + '\'' +
", productGuid='" + productGuid + '\'' +
", productId='" + productId + '\'' +
", quantity='" + quantity + '\'' +
", createMan='" + createMan + '\'' +
", warehouseId='" + warehouseId + '\'' +
", warehouseName='" + warehouseName + '\'' +
", address='" + address + '\'' +
", cDesc='" + cDesc + '\'' +
", warehouseKind='" + warehouseKind + '\'' +
", warehouseType='" + warehouseType + '\'' +
", isCurrent='" + isCurrent + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -82,10 +82,6 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
@@ -94,6 +90,94 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
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 void setId(Long id)
{
this.id = id;
@@ -264,17 +348,7 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -296,29 +370,33 @@ public class ViewFlatWarehouseOutFlow extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("inOrOut", getInOrOut())
.append("inOrOutSotckId", getInOrOutSotckId())
.append("inOrOutSotckDetailId", getInOrOutSotckDetailId())
.append("productGuid", getProductGuid())
.append("productId", getProductId())
.append("quantity", getQuantity())
.append("createTime", getCreateTime())
.append("createMan", getCreateMan())
.append("warehouseId", getWarehouseId())
.append("warehouseName", getWarehouseName())
.append("address", getAddress())
.append("cDesc", getcDesc())
.append("warehouseKind", getWarehouseKind())
.append("warehouseType", getWarehouseType())
.append("isCurrent", getIsCurrent())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("price", getPrice())
.append("remark", getRemark())
.toString();
return "ViewFlatWarehouseOutFlow{" +
"id=" + id +
", inOrOut='" + inOrOut + '\'' +
", inOrOutSotckId='" + inOrOutSotckId + '\'' +
", inOrOutSotckDetailId='" + inOrOutSotckDetailId + '\'' +
", productGuid='" + productGuid + '\'' +
", productId='" + productId + '\'' +
", quantity='" + quantity + '\'' +
", createMan='" + createMan + '\'' +
", warehouseId='" + warehouseId + '\'' +
", warehouseName='" + warehouseName + '\'' +
", address='" + address + '\'' +
", cDesc='" + cDesc + '\'' +
", warehouseKind='" + warehouseKind + '\'' +
", warehouseType='" + warehouseType + '\'' +
", isCurrent='" + isCurrent + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -123,15 +123,109 @@ public class ViewInJobFlow extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
public void setJobId(String jobId)
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
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 void setJobId(String jobId)
{
this.jobId = jobId;
}
@@ -401,17 +495,7 @@ public class ViewInJobFlow extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -423,37 +507,42 @@ public class ViewInJobFlow extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("jobId", getJobId())
.append("jobDetailId", getJobDetailId())
.append("status", getStatus())
.append("taskNo", getTaskNo())
.append("trayCode", getTrayCode())
.append("roadwayId", getRoadwayId())
.append("cargoSpaceId", getCargoSpaceId())
.append("cargoSpaceName", getCargoSpaceName())
.append("thePlatoon", getThePlatoon())
.append("theColumn", getTheColumn())
.append("theFloor", getTheFloor())
.append("priority", getPriority())
.append("executionPhase", getExecutionPhase())
.append("inOrOut", getInOrOut())
.append("entranceId", getEntranceId())
.append("productId", getProductId())
.append("lotNo", getLotNo())
.append("stackingId", getStackingId())
.append("stockStatus", getStockStatus())
.append("inQuantity", getInQuantity())
.append("inOrOutId", getInOrOutId())
.append("inOrOutDId", getInOrOutDId())
.append("createTime", getCreateTime())
.append("startTime", getStartTime())
.append("finishTime", getFinishTime())
.append("warehouseId", getWarehouseId())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.toString();
return "ViewInJobFlow{" +
"jobId='" + jobId + '\'' +
", jobDetailId='" + jobDetailId + '\'' +
", status='" + status + '\'' +
", taskNo='" + taskNo + '\'' +
", trayCode='" + trayCode + '\'' +
", roadwayId='" + roadwayId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", thePlatoon=" + thePlatoon +
", theColumn=" + theColumn +
", theFloor=" + theFloor +
", priority=" + priority +
", executionPhase='" + executionPhase + '\'' +
", inOrOut='" + inOrOut + '\'' +
", entranceId='" + entranceId + '\'' +
", productId='" + productId + '\'' +
", lotNo='" + lotNo + '\'' +
", stackingId='" + stackingId + '\'' +
", stockStatus='" + stockStatus + '\'' +
", inQuantity='" + inQuantity + '\'' +
", inOrOutId='" + inOrOutId + '\'' +
", inOrOutDId='" + inOrOutDId + '\'' +
", startTime='" + startTime + '\'' +
", finishTime='" + finishTime + '\'' +
", warehouseId='" + warehouseId + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -127,10 +127,6 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
@@ -139,7 +135,105 @@ public class ViewOutJobFlow extends BaseEntity
@Excel(name = "客户名称")
private String customerName;
public void setJobId(String jobId)
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
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 void setJobId(String jobId)
{
this.jobId = jobId;
}
@@ -419,17 +513,7 @@ public class ViewOutJobFlow extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -451,39 +535,45 @@ public class ViewOutJobFlow extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("jobId", getJobId())
.append("jobDetailId", getJobDetailId())
.append("status", getStatus())
.append("taskNo", getTaskNo())
.append("trayCode", getTrayCode())
.append("roadwayId", getRoadwayId())
.append("cargoSpaceId", getCargoSpaceId())
.append("cargoSpaceName", getCargoSpaceName())
.append("thePlatoon", getThePlatoon())
.append("theColumn", getTheColumn())
.append("theFloor", getTheFloor())
.append("priority", getPriority())
.append("executionPhase", getExecutionPhase())
.append("inOrOut", getInOrOut())
.append("exitId", getExitId())
.append("productId", getProductId())
.append("lotNo", getLotNo())
.append("stackingId", getStackingId())
.append("stockStatus", getStockStatus())
.append("outQuantity", getOutQuantity())
.append("giveNum", getGiveNum())
.append("inOrOutId", getInOrOutId())
.append("inOrOutDId", getInOrOutDId())
.append("createTime", getCreateTime())
.append("startTime", getStartTime())
.append("finishTime", getFinishTime())
.append("warehouseId", getWarehouseId())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("customerName", getCustomerName())
.toString();
return "ViewOutJobFlow{" +
"jobId='" + jobId + '\'' +
", jobDetailId='" + jobDetailId + '\'' +
", status='" + status + '\'' +
", taskNo='" + taskNo + '\'' +
", trayCode='" + trayCode + '\'' +
", roadwayId='" + roadwayId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", thePlatoon=" + thePlatoon +
", theColumn=" + theColumn +
", theFloor=" + theFloor +
", priority=" + priority +
", executionPhase='" + executionPhase + '\'' +
", inOrOut='" + inOrOut + '\'' +
", exitId='" + exitId + '\'' +
", productId='" + productId + '\'' +
", lotNo='" + lotNo + '\'' +
", stackingId='" + stackingId + '\'' +
", stockStatus='" + stockStatus + '\'' +
", outQuantity='" + outQuantity + '\'' +
", giveNum='" + giveNum + '\'' +
", inOrOutId='" + inOrOutId + '\'' +
", inOrOutDId='" + inOrOutDId + '\'' +
", startTime='" + startTime + '\'' +
", finishTime='" + finishTime + '\'' +
", warehouseId='" + warehouseId + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", customerName='" + customerName + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -95,7 +95,93 @@ public class ViewStockDetail extends BaseEntity
@Excel(name = "价格")
private String price;
public void setOnlyIdentity(Long onlyIdentity)
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
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 void setOnlyIdentity(Long onlyIdentity)
{
this.onlyIdentity = onlyIdentity;
}
@@ -297,27 +383,34 @@ public class ViewStockDetail extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("onlyIdentity", getOnlyIdentity())
.append("stockId", getStockId())
.append("cargoSpaceId", getCargoSpaceId())
.append("trayCode", getTrayCode())
.append("quantity", getQuantity())
.append("jobId", getJobId())
.append("lotNo", getLotNo())
.append("stockinDetailId", getStockinDetailId())
.append("inDate", getInDate())
.append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("cargoSpaceName", getCargoSpaceName())
.append("roadwayId", getRoadwayId())
.append("cargoSpaceStatus", getCargoSpaceStatus())
.append("locked", getLocked())
.append("productId", getProductId())
.append("productName", getProductName())
.append("spec", getSpec())
.append("unit", getUnit())
.append("price", getPrice())
.toString();
return "ViewStockDetail{" +
"onlyIdentity=" + onlyIdentity +
", stockId='" + stockId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", trayCode='" + trayCode + '\'' +
", quantity='" + quantity + '\'' +
", jobId='" + jobId + '\'' +
", lotNo='" + lotNo + '\'' +
", stockinDetailId='" + stockinDetailId + '\'' +
", inDate='" + inDate + '\'' +
", warehouseId='" + warehouseId + '\'' +
", stackingId='" + stackingId + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", roadwayId='" + roadwayId + '\'' +
", cargoSpaceStatus='" + cargoSpaceStatus + '\'' +
", locked='" + locked + '\'' +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -87,30 +87,38 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "垛型ID")
private String stackingId;
/** 库存预警 */
@Excel(name = "库存预警")
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String spare3;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String spare4;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 物料ID */
@Excel(name = "物料ID")
private String productId;
@@ -147,18 +155,10 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 价格 */
@Excel(name = "价格")
private String price;
/** 货位名称 */
@Excel(name = "货位名称")
private String cargoSpaceName;
@@ -223,7 +223,33 @@ public class ViewStockSecure extends BaseEntity
@Excel(name = "本仓库区域")
private String thisCargoArea;
public void setStockId(String stockId)
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setStockId(String stockId)
{
this.stockId = stockId;
}
@@ -423,26 +449,6 @@ public class ViewStockSecure extends BaseEntity
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
@@ -553,17 +559,7 @@ public class ViewStockSecure extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -745,60 +741,59 @@ public class ViewStockSecure extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockId", getStockId())
.append("cargoSpaceId", getCargoSpaceId())
.append("stockStatus", getStockStatus())
.append("productStatus", getProductStatus())
.append("lotNo", getLotNo())
.append("inDate", getInDate())
.append("backDate", getBackDate())
.append("productGuid", getProductGuid())
.append("quantity", getQuantity())
.append("jobId", getJobId())
.append("trayCode", getTrayCode())
.append("outQuantity", getOutQuantity())
.append("stockinDetailId", getStockinDetailId())
.append("stockinId", getStockinId())
.append("inType", getInType())
.append("inClassId", getInClassId())
.append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.append("productId", getProductId())
.append("warehouseName", getWarehouseName())
.append("address", getAddress())
.append("cDesc", getcDesc())
.append("warehouseKind", getWarehouseKind())
.append("warehouseType", getWarehouseType())
.append("isCurrent", getIsCurrent())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("price", getPrice())
.append("remark", getRemark())
.append("cargoSpaceName", getCargoSpaceName())
.append("roadwayId", getRoadwayId())
.append("cargoAreaId", getCargoAreaId())
.append("theType", getTheType())
.append("theTypeName", getTheTypeName())
.append("thePlatoon", getThePlatoon())
.append("theColumn", getTheColumn())
.append("theFloor", getTheFloor())
.append("cargoStatus", getCargoStatus())
.append("locked", getLocked())
.append("cargoHight", getCargoHight())
.append("issDouble", getIssDouble())
.append("groupCodingNo", getGroupCodingNo())
.append("groupCoding", getGroupCoding())
.append("cargoSpaceLogo", getCargoSpaceLogo())
.append("thisCargoArea", getThisCargoArea())
.toString();
return "ViewStockSecure{" +
"stockId='" + stockId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", stockStatus='" + stockStatus + '\'' +
", productStatus='" + productStatus + '\'' +
", lotNo='" + lotNo + '\'' +
", inDate='" + inDate + '\'' +
", backDate='" + backDate + '\'' +
", productGuid='" + productGuid + '\'' +
", quantity='" + quantity + '\'' +
", jobId='" + jobId + '\'' +
", trayCode='" + trayCode + '\'' +
", outQuantity='" + outQuantity + '\'' +
", stockinDetailId='" + stockinDetailId + '\'' +
", stockinId='" + stockinId + '\'' +
", inType='" + inType + '\'' +
", inClassId='" + inClassId + '\'' +
", warehouseId='" + warehouseId + '\'' +
", stackingId='" + stackingId + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
", productId='" + productId + '\'' +
", warehouseName='" + warehouseName + '\'' +
", address='" + address + '\'' +
", cDesc='" + cDesc + '\'' +
", warehouseKind='" + warehouseKind + '\'' +
", warehouseType='" + warehouseType + '\'' +
", isCurrent='" + isCurrent + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", roadwayId='" + roadwayId + '\'' +
", cargoAreaId='" + cargoAreaId + '\'' +
", theType='" + theType + '\'' +
", theTypeName='" + theTypeName + '\'' +
", thePlatoon=" + thePlatoon +
", theColumn=" + theColumn +
", theFloor=" + theFloor +
", cargoStatus='" + cargoStatus + '\'' +
", locked='" + locked + '\'' +
", cargoHight='" + cargoHight + '\'' +
", issDouble='" + issDouble + '\'' +
", groupCodingNo='" + groupCodingNo + '\'' +
", groupCoding='" + groupCoding + '\'' +
", cargoSpaceLogo='" + cargoSpaceLogo + '\'' +
", thisCargoArea='" + thisCargoArea + '\'' +
'}';
}
}

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

@@ -87,30 +87,38 @@ public class ViewStockWarning extends BaseEntity
@Excel(name = "垛型ID")
private String stackingId;
/** 预警标识 */
@Excel(name = "预警标识")
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String spare3;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
private String spare4;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** $column.columnComment */
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
/** 物料ID */
@Excel(name = "物料ID")
private String productId;
@@ -147,18 +155,10 @@ public class ViewStockWarning extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
/** 价格 */
@Excel(name = "价格")
private String price;
/** 货位名称 */
@Excel(name = "货位名称")
private String cargoSpaceName;
@@ -223,7 +223,33 @@ public class ViewStockWarning extends BaseEntity
@Excel(name = "本仓库区域")
private String thisCargoArea;
public void setStockId(String stockId)
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setStockId(String stockId)
{
this.stockId = stockId;
}
@@ -423,26 +449,6 @@ public class ViewStockWarning extends BaseEntity
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
public void setSpare4(String spare4)
{
this.spare4 = spare4;
}
public String getSpare4()
{
return spare4;
}
public void setSpare5(String spare5)
{
this.spare5 = spare5;
@@ -553,17 +559,7 @@ public class ViewStockWarning extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -745,60 +741,59 @@ public class ViewStockWarning extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockId", getStockId())
.append("cargoSpaceId", getCargoSpaceId())
.append("stockStatus", getStockStatus())
.append("productStatus", getProductStatus())
.append("lotNo", getLotNo())
.append("inDate", getInDate())
.append("backDate", getBackDate())
.append("productGuid", getProductGuid())
.append("quantity", getQuantity())
.append("jobId", getJobId())
.append("trayCode", getTrayCode())
.append("outQuantity", getOutQuantity())
.append("stockinDetailId", getStockinDetailId())
.append("stockinId", getStockinId())
.append("inType", getInType())
.append("inClassId", getInClassId())
.append("warehouseId", getWarehouseId())
.append("stackingId", getStackingId())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.append("spare4", getSpare4())
.append("spare5", getSpare5())
.append("spare6", getSpare6())
.append("productId", getProductId())
.append("warehouseName", getWarehouseName())
.append("address", getAddress())
.append("cDesc", getcDesc())
.append("warehouseKind", getWarehouseKind())
.append("warehouseType", getWarehouseType())
.append("isCurrent", getIsCurrent())
.append("productName", getProductName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("price", getPrice())
.append("remark", getRemark())
.append("cargoSpaceName", getCargoSpaceName())
.append("roadwayId", getRoadwayId())
.append("cargoAreaId", getCargoAreaId())
.append("theType", getTheType())
.append("theTypeName", getTheTypeName())
.append("thePlatoon", getThePlatoon())
.append("theColumn", getTheColumn())
.append("theFloor", getTheFloor())
.append("cargoStatus", getCargoStatus())
.append("locked", getLocked())
.append("cargoHight", getCargoHight())
.append("issDouble", getIssDouble())
.append("groupCodingNo", getGroupCodingNo())
.append("groupCoding", getGroupCoding())
.append("cargoSpaceLogo", getCargoSpaceLogo())
.append("thisCargoArea", getThisCargoArea())
.toString();
return "ViewStockWarning{" +
"stockId='" + stockId + '\'' +
", cargoSpaceId='" + cargoSpaceId + '\'' +
", stockStatus='" + stockStatus + '\'' +
", productStatus='" + productStatus + '\'' +
", lotNo='" + lotNo + '\'' +
", inDate='" + inDate + '\'' +
", backDate='" + backDate + '\'' +
", productGuid='" + productGuid + '\'' +
", quantity='" + quantity + '\'' +
", jobId='" + jobId + '\'' +
", trayCode='" + trayCode + '\'' +
", outQuantity='" + outQuantity + '\'' +
", stockinDetailId='" + stockinDetailId + '\'' +
", stockinId='" + stockinId + '\'' +
", inType='" + inType + '\'' +
", inClassId='" + inClassId + '\'' +
", warehouseId='" + warehouseId + '\'' +
", stackingId='" + stackingId + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
", productId='" + productId + '\'' +
", warehouseName='" + warehouseName + '\'' +
", address='" + address + '\'' +
", cDesc='" + cDesc + '\'' +
", warehouseKind='" + warehouseKind + '\'' +
", warehouseType='" + warehouseType + '\'' +
", isCurrent='" + isCurrent + '\'' +
", productName='" + productName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", cargoSpaceName='" + cargoSpaceName + '\'' +
", roadwayId='" + roadwayId + '\'' +
", cargoAreaId='" + cargoAreaId + '\'' +
", theType='" + theType + '\'' +
", theTypeName='" + theTypeName + '\'' +
", thePlatoon=" + thePlatoon +
", theColumn=" + theColumn +
", theFloor=" + theFloor +
", cargoStatus='" + cargoStatus + '\'' +
", locked='" + locked + '\'' +
", cargoHight='" + cargoHight + '\'' +
", issDouble='" + issDouble + '\'' +
", groupCodingNo='" + groupCodingNo + '\'' +
", groupCoding='" + groupCoding + '\'' +
", cargoSpaceLogo='" + cargoSpaceLogo + '\'' +
", thisCargoArea='" + thisCargoArea + '\'' +
'}';
}
}

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

@@ -151,10 +151,6 @@ public class ViewStockinHistory extends BaseEntity
@Excel(name = "物料名称")
private String productName;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
@@ -163,7 +159,93 @@ public class ViewStockinHistory extends BaseEntity
@Excel(name = "规格")
private String spec;
public void setStockinGuid(String stockinGuid)
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setStockinGuid(String stockinGuid)
{
this.stockinGuid = stockinGuid;
}
@@ -503,17 +585,7 @@ public class ViewStockinHistory extends BaseEntity
return productName;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -535,45 +607,50 @@ public class ViewStockinHistory extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockinGuid", getStockinGuid())
.append("stockinId", getStockinId())
.append("inType", getInType())
.append("createDate", getCreateDate())
.append("createManId", getCreateManId())
.append("status", getStatus())
.append("warehouseId", getWarehouseId())
.append("finishDate", getFinishDate())
.append("erpBill", getErpBill())
.append("stockSource", getStockSource())
.append("departmentNo", getDepartmentNo())
.append("classNo", getClassNo())
.append("supplierNo", getSupplierNo())
.append("supplierName", getSupplierName())
.append("simpleName", getSimpleName())
.append("contactName", getContactName())
.append("contactNumber", getContactNumber())
.append("address", getAddress())
.append("stockinDetailId", getStockinDetailId())
.append("lotNo", getLotNo())
.append("quantity", getQuantity())
.append("quantityX", getQuantityX())
.append("quantityJ", getQuantityJ())
.append("assignNum", getAssignNum())
.append("assignNumX", getAssignNumX())
.append("assignNumJ", getAssignNumJ())
.append("scanNum", getScanNum())
.append("scanNumX", getScanNumX())
.append("scanNumJ", getScanNumJ())
.append("printDate", getPrintDate())
.append("stockStatus", getStockStatus())
.append("price", getPrice())
.append("remark", getRemark())
.append("productId", getProductId())
.append("productName", getProductName())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.append("spec", getSpec())
.toString();
return "ViewStockinHistory{" +
"stockinGuid='" + stockinGuid + '\'' +
", stockinId='" + stockinId + '\'' +
", inType='" + inType + '\'' +
", createDate='" + createDate + '\'' +
", createManId='" + createManId + '\'' +
", status='" + status + '\'' +
", warehouseId='" + warehouseId + '\'' +
", finishDate='" + finishDate + '\'' +
", erpBill='" + erpBill + '\'' +
", stockSource='" + stockSource + '\'' +
", departmentNo='" + departmentNo + '\'' +
", classNo='" + classNo + '\'' +
", supplierNo='" + supplierNo + '\'' +
", supplierName='" + supplierName + '\'' +
", simpleName='" + simpleName + '\'' +
", contactName='" + contactName + '\'' +
", contactNumber='" + contactNumber + '\'' +
", address='" + address + '\'' +
", stockinDetailId='" + stockinDetailId + '\'' +
", lotNo='" + lotNo + '\'' +
", quantity='" + quantity + '\'' +
", quantityX='" + quantityX + '\'' +
", quantityJ='" + quantityJ + '\'' +
", assignNum='" + assignNum + '\'' +
", assignNumX='" + assignNumX + '\'' +
", assignNumJ='" + assignNumJ + '\'' +
", scanNum='" + scanNum + '\'' +
", scanNumX='" + scanNumX + '\'' +
", scanNumJ='" + scanNumJ + '\'' +
", printDate='" + printDate + '\'' +
", stockStatus='" + stockStatus + '\'' +
", price='" + price + '\'' +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", unit='" + unit + '\'' +
", spec='" + spec + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}

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

@@ -88,15 +88,109 @@ public class ViewStockoutHistory extends BaseEntity
@Excel(name = "规格")
private String spec;
/** 品牌 */
@Excel(name = "品牌")
private String cargoNo;
/** 单位 */
@Excel(name = "单位")
private String unit;
public void setStockoutId(String stockoutId)
/** 价格 */
@Excel(name = "价格")
private String price;
/** 英文名称 */
@Excel(name = "英文名称")
private String spare1;
/** 单件净重 */
@Excel(name = "单件净重")
private String spare2;
/** 长MM */
@Excel(name = "长MM")
private String spare5;
/** 宽MM */
@Excel(name = "宽MM")
private String spare6;
/** 高MM */
@Excel(name = "高MM")
private String spare7;
/** 体积m³ */
@Excel(name = "体积m³")
private String spare8;
/** 备注 */
@Excel(name = "备注")
private String remark;
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public String getSpare1() {
return spare1;
}
public void setSpare1(String spare1) {
this.spare1 = spare1;
}
public String getSpare2() {
return spare2;
}
public void setSpare2(String spare2) {
this.spare2 = spare2;
}
public String getSpare5() {
return spare5;
}
public void setSpare5(String spare5) {
this.spare5 = spare5;
}
public String getSpare6() {
return spare6;
}
public void setSpare6(String spare6) {
this.spare6 = spare6;
}
public String getSpare7() {
return spare7;
}
public void setSpare7(String spare7) {
this.spare7 = spare7;
}
public String getSpare8() {
return spare8;
}
public void setSpare8(String spare8) {
this.spare8 = spare8;
}
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setStockoutId(String stockoutId)
{
this.stockoutId = stockoutId;
}
@@ -276,17 +370,7 @@ public class ViewStockoutHistory extends BaseEntity
return spec;
}
public void setCargoNo(String cargoNo)
{
this.cargoNo = cargoNo;
}
public String getCargoNo()
{
return cargoNo;
}
public void setUnit(String unit)
public void setUnit(String unit)
{
this.unit = unit;
}
@@ -298,27 +382,34 @@ public class ViewStockoutHistory extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("stockoutId", getStockoutId())
.append("outType", getOutType())
.append("createDate", getCreateDate())
.append("createManId", getCreateManId())
.append("status", getStatus())
.append("stockoutSource", getStockoutSource())
.append("exitId", getExitId())
.append("stockoutDetailId", getStockoutDetailId())
.append("productId", getProductId())
.append("productName", getProductName())
.append("lotNo", getLotNo())
.append("quantity", getQuantity())
.append("allotQuantity", getAllotQuantity())
.append("assignNum", getAssignNum())
.append("erpStockoutId", getErpStockoutId())
.append("entryid", getEntryid())
.append("customerName", getCustomerName())
.append("spec", getSpec())
.append("cargoNo", getCargoNo())
.append("unit", getUnit())
.toString();
return "ViewStockoutHistory{" +
"stockoutId='" + stockoutId + '\'' +
", outType='" + outType + '\'' +
", createDate='" + createDate + '\'' +
", createManId='" + createManId + '\'' +
", status='" + status + '\'' +
", stockoutSource='" + stockoutSource + '\'' +
", exitId='" + exitId + '\'' +
", stockoutDetailId='" + stockoutDetailId + '\'' +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", lotNo='" + lotNo + '\'' +
", quantity=" + quantity +
", allotQuantity=" + allotQuantity +
", assignNum=" + assignNum +
", erpStockoutId='" + erpStockoutId + '\'' +
", entryid='" + entryid + '\'' +
", customerName='" + customerName + '\'' +
", spec='" + spec + '\'' +
", unit='" + unit + '\'' +
", price='" + price + '\'' +
", spare1='" + spare1 + '\'' +
", spare2='" + spare2 + '\'' +
", spare5='" + spare5 + '\'' +
", spare6='" + spare6 + '\'' +
", spare7='" + spare7 + '\'' +
", spare8='" + spare8 + '\'' +
", remark='" + remark + '\'' +
'}';
}
}