diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java index 7647f9e..59dabf6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/StockSummary/domain/StockSummary.java @@ -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 + + '}'; } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java index ef89063..c08f147 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseInFlow/domain/ViewFlatWarehouseInFlow.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java index 4305d40..6ed5839 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewFlatWarehouseOutFlow/domain/ViewFlatWarehouseOutFlow.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java index c953dc6..0c415f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewInJobFlow/domain/ViewInJobFlow.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java index 29c0af4..1b7972b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewOutJobFlow/domain/ViewOutJobFlow.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java index 43275e0..ab921ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockDetail/domain/ViewStockDetail.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java index 43922d1..fc430b0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockSecure/domain/ViewStockSecure.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java index eea218e..f851b2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockWarning/domain/ViewStockWarning.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java index a9a048e..1155272 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockinHistory/domain/ViewStockinHistory.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java index 3ced8ef..f1719a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/search/ViewStockoutHistory/domain/ViewStockoutHistory.java @@ -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 + '\'' + + '}'; } } diff --git a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml index 26e753d..aaae76e 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml @@ -14,14 +14,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + SELECT - + p.product_id, p.product_name, + p.price, + p.spare1, + p.spare2, + p.spare5, + p.spare6, + p.spare8, + p.spare7, p.spec, p.unit, s.lot_no, @@ -36,6 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,p.product_name ,p.spec ,p.unit + ,p.price + p.spare1, + p.spare2, + p.spare5, + p.spare6, + p.spare8, + p.spare7, ,s.lot_no ,s.warehouse_id ,s.cargo_space_id @@ -57,6 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND p.product_name like concat('%', #{productName}, '%') AND p.spec = #{spec} AND p.unit = #{unit} + AND p.price = #{price} + AND p.spare1 = #{spare1} + AND p.spare2 = #{spare2} + AND p.spare5 = #{spare5} + AND p.spare6 = #{spare6} + AND p.spare8 = #{spare8} + AND p.spare7 = #{spare7} + AND p.spare7 = #{remark} AND s.lot_no = #{lotNo} AND s.warehouse_id = #{warehouseId} AND s.cargo_space_id = #{roadwayId} @@ -76,6 +106,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_name, spec, unit, + ,price, + spare1, + spare2, + spare5, + spare6, + spare8, + spare7, + remark, lot_no, warehouse_id, roadway_id, @@ -87,6 +125,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{productName}, #{spec}, #{unit}, + ,#{price}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare8}, + #{spare7}, + #{remark}, #{lotNo}, #{warehouseId}, #{roadwayId}, @@ -101,6 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_name = #{productName}, spec = #{spec}, unit = #{unit}, + price = #{price}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare8 = #{spare8}, + spare7 = #{spare7}, + spare7 = #{remark}, lot_no = #{lotNo}, warehouse_id = #{warehouseId}, roadway_id = #{roadwayId}, diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml index d58b9d1..41d0f7a 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml @@ -23,14 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + - select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark from view_flat_warehouse_in_flow + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_in_flow @@ -84,10 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current, product_name, spec, - cargo_no, unit, price, remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{id}, @@ -108,10 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isCurrent}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, #{price}, #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -135,10 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current = #{isCurrent}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, price = #{price}, remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml index 3b7aec3..cae8304 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml @@ -23,14 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + - select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark from view_flat_warehouse_out_flow + select id, in_or_out, in_or_out_sotck_id, in_or_out_sotck_detail_id, product_guid, product_id, quantity, create_time, create_man, warehouse_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_flat_warehouse_out_flow @@ -84,10 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current, product_name, spec, - cargo_no, unit, price, remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{id}, @@ -108,10 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isCurrent}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, #{price}, #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -135,10 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current = #{isCurrent}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, price = #{price}, remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where id = #{id} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml index 863e0f0..a654fa5 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml @@ -33,12 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + - select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, cargo_no, unit from view_in_job_flow + select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, entrance_id, product_id, lot_no, stacking_id, stock_status, in_quantity, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_in_job_flow @@ -113,8 +126,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_id, product_name, spec, - cargo_no, unit, + price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{jobId}, @@ -145,8 +165,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warehouseId}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, + #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -180,8 +207,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_id = #{warehouseId}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, + price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where job_id = #{jobId} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml index adaf1e6..babd1d8 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml @@ -34,13 +34,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + - select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, cargo_no, unit, customer_name from view_out_job_flow + select job_id, job_detail_id, status, task_no, tray_code, roadway_id, cargo_space_id, cargo_space_name, the_platoon, the_column, the_floor, priority, execution_phase, in_or_out, exit_id, product_id, lot_no, stacking_id, stock_status, out_quantity, give_num, in_or_out_id, in_or_out_d_id, create_time, start_time, finish_time, warehouse_id, product_name, spec, unit, customer_name, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_out_job_flow @@ -118,9 +131,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_id, product_name, spec, - cargo_no, unit, customer_name, + price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{jobId}, @@ -152,9 +172,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warehouseId}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, #{customerName}, + #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -189,9 +216,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warehouse_id = #{warehouseId}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, customer_name = #{customerName}, + price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where job_id = #{jobId} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml index 03f0b54..c62a7f4 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml @@ -25,10 +25,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + - select only_identity, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price from view_stock_detail + select only_identity, stock_id, cargo_space_id, tray_code, quantity, job_id, lot_no, stockin_detail_id, in_date, warehouse_id, stacking_id, cargo_space_name, roadway_id, cargo_space_status, locked, product_id, product_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stock_detail @@ -85,6 +98,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spec, unit, price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{onlyIdentity}, @@ -107,6 +127,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{spec}, #{unit}, #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -132,6 +159,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" spec = #{spec}, unit = #{unit}, price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where only_identity = #{onlyIdentity} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml index 5b07254..e734a00 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml @@ -25,8 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -38,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -58,10 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_secure + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8, remark from view_stock_secure @@ -150,8 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stacking_id, spare1, spare2, - spare3, - spare4, spare5, spare6, product_id, @@ -163,7 +160,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current, product_name, spec, - cargo_no, unit, price, remark, @@ -183,7 +179,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_coding, cargo_space_logo, this_cargo_area, - + spare7, + spare8, + remark, + #{stockId}, #{cargoSpaceId}, @@ -205,8 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stackingId}, #{spare1}, #{spare2}, - #{spare3}, - #{spare4}, #{spare5}, #{spare6}, #{productId}, @@ -218,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isCurrent}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, #{price}, #{remark}, @@ -238,7 +234,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{groupCoding}, #{cargoSpaceLogo}, #{thisCargoArea}, - + #{remark}, + #{spare7}, + #{spare8}, + @@ -263,8 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stacking_id = #{stackingId}, spare1 = #{spare1}, spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, spare5 = #{spare5}, spare6 = #{spare6}, product_id = #{productId}, @@ -276,7 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current = #{isCurrent}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, price = #{price}, remark = #{remark}, @@ -296,6 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_coding = #{groupCoding}, cargo_space_logo = #{cargoSpaceLogo}, this_cargo_area = #{thisCargoArea}, + spare7 = #{spare7}, + spare8 = #{spare8}, + remark = #{remark}, where stock_id = #{stockId} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml index ca164e1..3ee316b 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml @@ -25,8 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -38,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - @@ -58,10 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare3, spare4, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, cargo_no, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area from view_stock_warning + select stock_id, cargo_space_id, stock_status, product_status, lot_no, in_date, back_date, product_guid, quantity, job_id, tray_code, out_quantity, stockin_detail_id, stockin_id, in_type, in_class_id, warehouse_id, stacking_id, spare1, spare2, spare5, spare6, product_id, warehouse_name, address, c_desc, warehouse_kind, warehouse_type, is_current, product_name, spec, unit, price, remark, cargo_space_name, roadway_id, cargo_area_id, the_type, the_type_name, the_platoon, the_column, the_floor, cargo_status, locked, cargo_hight, iss_double, group_coding_no, group_coding, cargo_space_logo, this_cargo_area,spare7,spare8, remark from view_stock_warning @@ -150,8 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stacking_id, spare1, spare2, - spare3, - spare4, spare5, spare6, product_id, @@ -163,7 +160,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current, product_name, spec, - cargo_no, unit, price, remark, @@ -183,7 +179,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_coding, cargo_space_logo, this_cargo_area, - + remark, + spare7, + spare8, + #{stockId}, #{cargoSpaceId}, @@ -205,8 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{stackingId}, #{spare1}, #{spare2}, - #{spare3}, - #{spare4}, #{spare5}, #{spare6}, #{productId}, @@ -218,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isCurrent}, #{productName}, #{spec}, - #{cargoNo}, #{unit}, #{price}, #{remark}, @@ -238,7 +234,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{groupCoding}, #{cargoSpaceLogo}, #{thisCargoArea}, - + #{spare7}, + #{spare8}, + #{remark}, + @@ -263,8 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" stacking_id = #{stackingId}, spare1 = #{spare1}, spare2 = #{spare2}, - spare3 = #{spare3}, - spare4 = #{spare4}, spare5 = #{spare5}, spare6 = #{spare6}, product_id = #{productId}, @@ -276,7 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_current = #{isCurrent}, product_name = #{productName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, price = #{price}, remark = #{remark}, @@ -296,6 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" group_coding = #{groupCoding}, cargo_space_logo = #{cargoSpaceLogo}, this_cargo_area = #{thisCargoArea}, + spare7 = #{spare7}, + spare8 = #{spare8}, + remark = #{remark}, where stock_id = #{stockId} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml index cdc0b48..06f6049 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml @@ -40,13 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + - select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name, cargo_no, unit, spec from view_stockin_history + select stockin_guid, stockin_id, in_type, create_date, create_man_id, status, warehouse_id, finish_date, erp_bill, stock_source, department_no, class_no, supplier_no, supplier_name, simple_name, contact_name, contact_number, address, stockin_detail_id, lot_no, quantity, quantity_x, quantity_j, assign_num, assign_num_x, assign_num_j, scan_num, scan_num_x, scan_num_j, print_date, stock_status, price, remark, product_id, product_name, unit, spec, spare1,spare2,spare5,spare6,spare7,spare8 from view_stockin_history @@ -136,9 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, product_id, product_name, - cargo_no, unit, spec, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{stockinGuid}, @@ -176,9 +191,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{remark}, #{productId}, #{productName}, - #{cargoNo}, #{unit}, #{spec}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -219,9 +239,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark = #{remark}, product_id = #{productId}, product_name = #{productName}, - cargo_no = #{cargoNo}, unit = #{unit}, spec = #{spec}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where stockin_guid = #{stockinGuid} diff --git a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml index 8fa1ad6..8c5cbe4 100644 --- a/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml @@ -23,12 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + - select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, cargo_no, unit from view_stockout_history + select stockout_id, out_type, create_date, create_man_id, status, stockout_source, exit_id, stockout_detail_id, product_id, product_name, lot_no, quantity, allot_quantity, assign_num, erp_stockout_id, entryid, customer_name, spec, unit, price, remark,spare1,spare2,spare5,spare6,spare7,spare8 from view_stockout_history @@ -83,8 +96,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" entryid, customer_name, spec, - cargo_no, unit, + price, + remark, + spare1, + spare2, + spare5, + spare6, + spare7, + spare8, #{stockoutId}, @@ -105,8 +125,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{entryid}, #{customerName}, #{spec}, - #{cargoNo}, #{unit}, + #{price}, + #{remark}, + #{spare1}, + #{spare2}, + #{spare5}, + #{spare6}, + #{spare7}, + #{spare8}, @@ -130,8 +157,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" entryid = #{entryid}, customer_name = #{customerName}, spec = #{spec}, - cargo_no = #{cargoNo}, unit = #{unit}, + price = #{price}, + remark = #{remark}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare5 = #{spare5}, + spare6 = #{spare6}, + spare7 = #{spare7}, + spare8 = #{spare8}, where stockout_id = #{stockoutId} diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 504d009..b4a31a5 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1,6 +1,6 @@ // en.js export default { - + login: { title: 'FORTUCKY WMS SYSTEM', logIn: 'Login in', @@ -684,7 +684,10 @@ export default { addSuccess: 'Added successfully', editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', - deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?' + deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?', + search:'search', + reset:'reset', + export:'export' }, // *************Supplier Management*************** @@ -1715,7 +1718,7 @@ export default { btnExpandOrCollapse: 'Expand/Collapse', lblWidthDialog: '80px', - + //--------------提示文本-------------- //---handleDelete--- @@ -3045,6 +3048,16 @@ export default { deleteSuccess: 'deleteSuccess', deleteConfirm: 'Are you sure to delete the customerNo with ID {ids}?' }, - +// ***************产品基础表添加字段************** + basproduct1:{ + englishName:"englishName", + netWeightPerUnit:"netWeightPerUnit", + long:"long", + wide:"wide", + tall:"tall", + volume:"volume", + price:"price", + notes:"notes" + }, } diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 097c6ca..b892744 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -690,7 +690,10 @@ export default { addSuccess: '新增成功', editSuccess: '修改成功', deleteSuccess: '删除成功', - deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？' + deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？', + search:'搜索', + reset:'重置', + export:'导出' }, // *************供应商管理*************** BasSupplier: { @@ -2650,7 +2653,7 @@ export default { }, // ***************库存明细查询************* searchViewStockDetail: { - stockId: '库存ID111111111', + stockId: '库存ID', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', @@ -2708,7 +2711,7 @@ export default { }, // ***************平库出库流水************* searchViewFlatWarehouseOutFlow: { - warehouse: '仓库111111111111', + warehouse: '仓库', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -2753,7 +2756,7 @@ export default { }, // ***************平库入库流水************* searchViewFlatWarehouseInFlow: { - warehouse: '仓库1111111111', + warehouse: '仓库', selectWarehouse: '请选择仓库', productId: '物料ID', inputProductId: '请输入物料ID', @@ -2786,7 +2789,7 @@ export default { }, // ***************出库单据历史查询************* searchViewStockoutHistory: { - stockoutId: '出库单号111111111111', + stockoutId: '出库单号', inputStockoutId: '请输入出库单号', outType: '出库类型', selectOutType: '请选择出库类型', @@ -2834,7 +2837,7 @@ export default { }, // ***************入库单据历史查询************* searchViewStockinHistory: { - stockinGuid: '入库单guid1111111111', + stockinGuid: '入库单', inputStockinGuid: '请输入入库单guid', stockinId: '入库单号', inputStockinId: '请输入入库单号', @@ -2916,7 +2919,7 @@ export default { // ***************收货单据管理************* searchStockSummary: { export: '导出', - productId: '物料编码1111111111', + productId: '物料编码', inputProductId: '请输入物料编码', productName: '物料名称', inputProductName: '请输入物料名称', @@ -2935,7 +2938,7 @@ export default { }, // ***************预警库存查询************* searchViewStockWarning: { - stockId: '库存ID111111111111', + stockId: '库存ID', inputStockId: '请输入库存ID', cargoSpaceId: '货位ID', inputCargoSpaceId: '请输入货位ID', @@ -3009,7 +3012,17 @@ export default { confirm: '确 定', cancel: '取 消' }, - +// ***************产品基础表添加字段************** + basproduct1:{ + englishName:"英文名称", + netWeightPerUnit:"单件净重", + long:"长MM", + wide:"宽MM", + tall:"高MM", + volume:"体积m³", + price:"价格", + notes:"描述" + }, // ***************客户管理************** basCustomer: { customerNo: '客户编号', diff --git a/ruoyi-ui/src/views/search/StockSummary/index.vue b/ruoyi-ui/src/views/search/StockSummary/index.vue index 3a0a4fc..190f377 100644 --- a/ruoyi-ui/src/views/search/StockSummary/index.vue +++ b/ruoyi-ui/src/views/search/StockSummary/index.vue @@ -83,6 +83,14 @@ + + + + + + + + - - - - - + + + + + + + + + + + + - - - - - diff --git a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue index 8fec815..4698edf 100644 --- a/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue @@ -184,7 +184,7 @@ - + @@ -196,7 +196,6 @@ - @@ -205,6 +204,14 @@ + + + + + + + + diff --git a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue index 1362d41..b5bee4e 100644 --- a/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewInJobFlow/index.vue @@ -356,9 +356,18 @@ - + - + + + + + + + + + + diff --git a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue index 595ee83..ea05dd1 100644 --- a/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue +++ b/ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue @@ -360,6 +360,14 @@ + + + + + + + + diff --git a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue index 0cf0bce..01cf7f6 100644 --- a/ruoyi-ui/src/views/search/ViewStockDetail/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockDetail/index.vue @@ -226,7 +226,14 @@ - + + + + + + + + diff --git a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue index 6a6d831..0fd0a1b 100644 --- a/ruoyi-ui/src/views/search/ViewStockSecure/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockSecure/index.vue @@ -176,24 +176,33 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -192,6 +191,14 @@ + + + + + + + + - - - + + + + + + + + diff --git a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue index 12eeb2f..3e7a7b7 100644 --- a/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue +++ b/ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue @@ -249,8 +249,15 @@ - + + + + + + + +