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 + '\'' +
'}';
}
}

56
ruoyi-admin/src/main/resources/mapper/search/StockSummaryMapper.xml
View File

@@ -14,14 +14,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseId" column="warehouse_id" />
<result property="roadwayId" column="roadway_id" />
<result property="quantity" column="quantity" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectStockSummaryVo">
SELECT
<choose>
<when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByRoadwayId != null and groupByRoadwayId">
<when test="groupByProductId != null and groupByProductId or groupByProductName != null and groupByProductName or groupBySpec != null and groupBySpec or groupByUnit != null and groupByUnit or groupByLotNo != null and groupByLotNo or groupByWarehouseId != null and groupByWarehouseId or groupByRoadwayId != null and groupByRoadwayId or groupByPrice != null and groupByPrice or groupBySpare1 != null and groupBySpare1 or groupBySpare2 != null and groupBySpare2 or groupBySpare5 != null and groupBySpare5 or groupBySpare6 != null and groupBySpare6 or groupBySpare7 != null and groupBySpare7 or groupBySpare8 != null and groupBySpare8">
<if test="groupByProductId != null and groupByProductId">p.product_id,</if>
<if test="groupByProductName != null and groupByProductName">p.product_name,</if>
<if test="groupByPrice != null and groupByPrice">p.price,</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
<if test="groupBySpec != null and groupBySpec">p.spec,</if>
<if test="groupByUnit != null and groupByUnit">p.unit,</if>
<if test="groupByLotNo != null and groupByLotNo">s.lot_no,</if>
@@ -36,6 +51,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupByProductName != null and groupByProductName">,p.product_name</if>
<if test="groupBySpec != null and groupBySpec">,p.spec</if>
<if test="groupByUnit != null and groupByUnit">,p.unit</if>
<if test="groupByPrice != null and groupByPrice">,p.price</if>
<if test="groupBySpare1 != null and groupBySpare1">p.spare1,</if>
<if test="groupBySpare2 != null and groupBySpare2">p.spare2,</if>
<if test="groupBySpare5 != null and groupBySpare5">p.spare5,</if>
<if test="groupBySpare6 != null and groupBySpare6">p.spare6,</if>
<if test="groupBySpare8 != null and groupBySpare8">p.spare8,</if>
<if test="groupBySpare7 != null and groupBySpare7">p.spare7,</if>
<if test="groupByLotNo != null and groupByLotNo">,s.lot_no</if>
<if test="groupByWarehouseId != null and groupByWarehouseId">,s.warehouse_id</if>
<if test="groupByRoadwayId != null and groupByRoadwayId">,s.cargo_space_id</if>
@@ -57,6 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''"> AND p.product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> AND p.spec = #{spec}</if>
<if test="unit != null and unit != ''"> AND p.unit = #{unit}</if>
<if test="price != null and price != ''"> AND p.price = #{price}</if>
<if test="spare1 != null and spare1 != ''"> AND p.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> AND p.spare2 = #{spare2}</if>
<if test="spare5 != null and spare5 != ''"> AND p.spare5 = #{spare5}</if>
<if test="spare6 != null and spare6 != ''"> AND p.spare6 = #{spare6}</if>
<if test="spare8 != null and spare8 != ''"> AND p.spare8 = #{spare8}</if>
<if test="spare7 != null and spare7 != ''"> AND p.spare7 = #{spare7}</if>
<if test="remark != null and remark != ''"> AND p.spare7 = #{remark}</if>
<if test="lotNo != null and lotNo != ''"> AND s.lot_no = #{lotNo}</if>
<if test="warehouseId != null and warehouseId != ''"> AND s.warehouse_id = #{warehouseId}</if>
<if test="roadwayId != null and roadwayId != ''"> AND s.cargo_space_id = #{roadwayId}</if>
@@ -76,6 +106,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="price != null">,price,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare8 != null">spare8,</if>
<if test="spare7 != null">spare7,</if>
<if test="remark != null">remark,</if>
<if test="lotNo != null">lot_no,</if>
<if test="warehouseId != null">warehouse_id,</if>
<if test="roadwayId != null">roadway_id,</if>
@@ -87,6 +125,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">,#{price},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="remark != null">#{remark},</if>
<if test="lotNo != null">#{lotNo},</if>
<if test="warehouseId != null">#{warehouseId},</if>
<if test="roadwayId != null">#{roadwayId},</if>
@@ -101,6 +147,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="remark != null">spare7 = #{remark},</if>
<if test="lotNo != null">lot_no = #{lotNo},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="roadwayId != null">roadway_id = #{roadwayId},</if>

37
ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseInFlowMapper.xml
View File

@@ -23,14 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isCurrent" column="is_current" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewFlatWarehouseInFlowVo">
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
</sql>
<select id="selectViewFlatWarehouseInFlowList" parameterType="ViewFlatWarehouseInFlow" resultMap="ViewFlatWarehouseInFlowResult">
@@ -52,9 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -84,10 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -108,10 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -135,10 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where id = #{id}
</update>

37
ruoyi-admin/src/main/resources/mapper/search/ViewFlatWarehouseOutFlowMapper.xml
View File

@@ -23,14 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isCurrent" column="is_current" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="remark" column="remark" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
</resultMap>
<sql id="selectViewFlatWarehouseOutFlowVo">
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
</sql>
<select id="selectViewFlatWarehouseOutFlowList" parameterType="ViewFlatWarehouseOutFlow" resultMap="ViewFlatWarehouseOutFlowResult">
@@ -52,9 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -84,10 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -108,10 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -135,10 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where id = #{id}
</update>

46
ruoyi-admin/src/main/resources/mapper/search/ViewInJobFlowMapper.xml
View File

@@ -33,12 +33,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewInJobFlowVo">
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
</sql>
<select id="selectViewInJobFlowList" parameterType="ViewInJobFlow" resultMap="ViewInJobFlowResult">
@@ -72,8 +79,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -113,8 +126,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">warehouse_id,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -145,8 +165,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">#{warehouseId},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -180,8 +207,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where job_id = #{jobId}
</update>

46
ruoyi-admin/src/main/resources/mapper/search/ViewOutJobFlowMapper.xml
View File

@@ -34,13 +34,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="warehouseId" column="warehouse_id" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="customerName" column="customer_name" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewOutJobFlowVo">
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
</sql>
<select id="selectViewOutJobFlowList" parameterType="ViewOutJobFlow" resultMap="ViewOutJobFlowResult">
@@ -75,9 +82,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id like concat('%', #{warehouseId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -118,9 +131,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">warehouse_id,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="customerName != null">customer_name,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null and jobId != ''">#{jobId},</if>
@@ -152,9 +172,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">#{warehouseId},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="customerName != null">#{customerName},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -189,9 +216,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where job_id = #{jobId}
</update>

36
ruoyi-admin/src/main/resources/mapper/search/ViewStockDetailMapper.xml
View File

@@ -25,10 +25,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="spec" column="spec" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewStockDetailVo">
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
</sql>
<select id="selectViewStockDetailList" parameterType="ViewStockDetail" resultMap="ViewStockDetailResult">
@@ -54,6 +61,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -85,6 +98,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spec != null">spec,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="onlyIdentity != null">#{onlyIdentity},</if>
@@ -107,6 +127,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spec != null">#{spec},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -132,6 +159,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spec != null">spec = #{spec},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where only_identity = #{onlyIdentity}
</update>

35
ruoyi-admin/src/main/resources/mapper/search/ViewStockSecureMapper.xml
View File

@@ -25,8 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productId" column="product_id" />
@@ -38,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isCurrent" column="is_current" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="remark" column="remark" />
@@ -58,10 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="groupCoding" column="group_coding" />
<result property="cargoSpaceLogo" column="cargo_space_logo" />
<result property="thisCargoArea" column="this_cargo_area" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewStockSecureVo">
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
</sql>
<select id="selectViewStockSecureList" parameterType="ViewStockSecure" resultMap="ViewStockSecureResult">
@@ -87,8 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
@@ -100,7 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
@@ -119,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -150,8 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">stacking_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productId != null">product_id,</if>
@@ -163,7 +160,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
@@ -183,7 +179,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">group_coding,</if>
<if test="cargoSpaceLogo != null">cargo_space_logo,</if>
<if test="thisCargoArea != null">this_cargo_area,</if>
</trim>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockId != null and stockId != ''">#{stockId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
@@ -205,8 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">#{stackingId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productId != null">#{productId},</if>
@@ -218,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
@@ -238,7 +234,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">#{groupCoding},</if>
<if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
<if test="thisCargoArea != null">#{thisCargoArea},</if>
</trim>
<if test="remark != null">#{remark},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
<update id="updateViewStockSecure" parameterType="ViewStockSecure">
@@ -263,8 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productId != null">product_id = #{productId},</if>
@@ -276,7 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
@@ -296,6 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">group_coding = #{groupCoding},</if>
<if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
<if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where stock_id = #{stockId}
</update>

35
ruoyi-admin/src/main/resources/mapper/search/ViewStockWarningMapper.xml
View File

@@ -25,8 +25,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stackingId" column="stacking_id" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
<result property="spare4" column="spare4" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="productId" column="product_id" />
@@ -38,7 +36,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isCurrent" column="is_current" />
<result property="productName" column="product_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="remark" column="remark" />
@@ -58,10 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="groupCoding" column="group_coding" />
<result property="cargoSpaceLogo" column="cargo_space_logo" />
<result property="thisCargoArea" column="this_cargo_area" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewStockWarningVo">
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
</sql>
<select id="selectViewStockWarningList" parameterType="ViewStockWarning" resultMap="ViewStockWarningResult">
@@ -87,8 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null and stackingId != ''"> and stacking_id like concat('%', #{stackingId}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare3 != null and spare3 != ''"> and spare3 like concat('%', #{spare3}, '%')</if>
<if test="spare4 != null and spare4 != ''"> and spare4 like concat('%', #{spare4}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
@@ -100,7 +98,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null and isCurrent != ''"> and is_current like concat('%', #{isCurrent}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="cargoSpaceName != null and cargoSpaceName != ''"> and cargo_space_name like concat('%', #{cargoSpaceName}, '%')</if>
@@ -119,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null and groupCoding != ''"> and group_coding like concat('%', #{groupCoding}, '%')</if>
<if test="cargoSpaceLogo != null and cargoSpaceLogo != ''"> and cargo_space_logo like concat('%', #{cargoSpaceLogo}, '%')</if>
<if test="thisCargoArea != null and thisCargoArea != ''"> and this_cargo_area like concat('%', #{thisCargoArea}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -150,8 +149,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">stacking_id,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
<if test="spare4 != null">spare4,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="productId != null">product_id,</if>
@@ -163,7 +160,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current,</if>
<if test="productName != null">product_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
@@ -183,7 +179,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">group_coding,</if>
<if test="cargoSpaceLogo != null">cargo_space_logo,</if>
<if test="thisCargoArea != null">this_cargo_area,</if>
</trim>
<if test="remark != null">remark,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockId != null and stockId != ''">#{stockId},</if>
<if test="cargoSpaceId != null">#{cargoSpaceId},</if>
@@ -205,8 +204,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">#{stackingId},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
<if test="spare4 != null">#{spare4},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="productId != null">#{productId},</if>
@@ -218,7 +215,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">#{isCurrent},</if>
<if test="productName != null">#{productName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
@@ -238,7 +234,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">#{groupCoding},</if>
<if test="cargoSpaceLogo != null">#{cargoSpaceLogo},</if>
<if test="thisCargoArea != null">#{thisCargoArea},</if>
</trim>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateViewStockWarning" parameterType="ViewStockWarning">
@@ -263,8 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="stackingId != null">stacking_id = #{stackingId},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
<if test="spare4 != null">spare4 = #{spare4},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="productId != null">product_id = #{productId},</if>
@@ -276,7 +273,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isCurrent != null">is_current = #{isCurrent},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
@@ -296,6 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="groupCoding != null">group_coding = #{groupCoding},</if>
<if test="cargoSpaceLogo != null">cargo_space_logo = #{cargoSpaceLogo},</if>
<if test="thisCargoArea != null">this_cargo_area = #{thisCargoArea},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where stock_id = #{stockId}
</update>

37
ruoyi-admin/src/main/resources/mapper/search/ViewStockinHistoryMapper.xml
View File

@@ -40,13 +40,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="remark" column="remark" />
<result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="spec" column="spec" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
</resultMap>
<sql id="selectViewStockinHistoryVo">
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
</sql>
<select id="selectViewStockinHistoryList" parameterType="ViewStockinHistory" resultMap="ViewStockinHistoryResult">
@@ -87,9 +92,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="productId != null and productId != ''"> and product_id like concat('%', #{productId}, '%')</if>
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -136,9 +146,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark,</if>
<if test="productId != null">product_id,</if>
<if test="productName != null">product_name,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="spec != null">spec,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockinGuid != null and stockinGuid != ''">#{stockinGuid},</if>
@@ -176,9 +191,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">#{remark},</if>
<if test="productId != null">#{productId},</if>
<if test="productName != null">#{productName},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="spec != null">#{spec},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -219,9 +239,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="remark != null">remark = #{remark},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="productName != null">product_name = #{productName},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where stockin_guid = #{stockinGuid}
</update>

46
ruoyi-admin/src/main/resources/mapper/search/ViewStockoutHistoryMapper.xml
View File

@@ -23,12 +23,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="entryid" column="entryid" />
<result property="customerName" column="customer_name" />
<result property="spec" column="spec" />
<result property="cargoNo" column="cargo_no" />
<result property="unit" column="unit" />
<result property="price" column="price" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare5" column="spare5" />
<result property="spare6" column="spare6" />
<result property="spare7" column="spare7" />
<result property="spare8" column="spare8" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectViewStockoutHistoryVo">
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
</sql>
<select id="selectViewStockoutHistoryList" parameterType="ViewStockoutHistory" resultMap="ViewStockoutHistoryResult">
@@ -52,8 +59,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryid != null and entryid != ''"> and entryid like concat('%', #{entryid}, '%')</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="spec != null and spec != ''"> and spec like concat('%', #{spec}, '%')</if>
<if test="cargoNo != null and cargoNo != ''"> and cargo_no like concat('%', #{cargoNo}, '%')</if>
<if test="unit != null and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
<if test="price != null and price != ''"> and price like concat('%', #{price}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 like concat('%', #{spare1}, '%')</if>
<if test="spare2 != null and spare2 != ''"> and spare2 like concat('%', #{spare2}, '%')</if>
<if test="spare5 != null and spare5 != ''"> and spare5 like concat('%', #{spare5}, '%')</if>
<if test="spare6 != null and spare6 != ''"> and spare6 like concat('%', #{spare6}, '%')</if>
<if test="spare7 != null and spare7 != ''"> and spare7 like concat('%', #{spare7}, '%')</if>
<if test="spare8 != null and spare8 != ''"> and spare8 like concat('%', #{spare8}, '%')</if>
</where>
</select>
@@ -83,8 +96,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryid != null">entryid,</if>
<if test="customerName != null">customer_name,</if>
<if test="spec != null">spec,</if>
<if test="cargoNo != null">cargo_no,</if>
<if test="unit != null">unit,</if>
<if test="price != null">price,</if>
<if test="remark != null">remark,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare5 != null">spare5,</if>
<if test="spare6 != null">spare6,</if>
<if test="spare7 != null">spare7,</if>
<if test="spare8 != null">spare8,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="stockoutId != null and stockoutId != ''">#{stockoutId},</if>
@@ -105,8 +125,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryid != null">#{entryid},</if>
<if test="customerName != null">#{customerName},</if>
<if test="spec != null">#{spec},</if>
<if test="cargoNo != null">#{cargoNo},</if>
<if test="unit != null">#{unit},</if>
<if test="price != null">#{price},</if>
<if test="remark != null">#{remark},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare5 != null">#{spare5},</if>
<if test="spare6 != null">#{spare6},</if>
<if test="spare7 != null">#{spare7},</if>
<if test="spare8 != null">#{spare8},</if>
</trim>
</insert>
@@ -130,8 +157,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryid != null">entryid = #{entryid},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="spec != null">spec = #{spec},</if>
<if test="cargoNo != null">cargo_no = #{cargoNo},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="price != null">price = #{price},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare5 != null">spare5 = #{spare5},</if>
<if test="spare6 != null">spare6 = #{spare6},</if>
<if test="spare7 != null">spare7 = #{spare7},</if>
<if test="spare8 != null">spare8 = #{spare8},</if>
</trim>
where stockout_id = #{stockoutId}
</update>