diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
index 3989bc36..1d42825b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPut.java
@@ -97,8 +97,8 @@ public class WmsProductPut extends BaseEntity {
private String batchNumber;
/** 预留字段2 */
- @Excel(name = "预留字段2")
- private String attr2;
+ @Excel(name = "生产日期")
+ private String productDate;
/** 预留字段3 */
@Excel(name = "预留字段3")
@@ -272,13 +272,16 @@ public class WmsProductPut extends BaseEntity {
public String getBatchNumber() {
return batchNumber;
}
- public void setAttr2(String attr2) {
- this.attr2 = attr2;
+
+
+ public String getProductDate() {
+ return productDate;
}
- public String getAttr2() {
- return attr2;
+ public void setProductDate(String productDate) {
+ this.productDate = productDate;
}
+
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
@@ -338,40 +341,36 @@ public class WmsProductPut extends BaseEntity {
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("workOrder", getWorkOrder())
- .append("factoryCode", getFactoryCode())
- .append("productOrder", getProductOrder())
- .append("whCode", getWhCode())
- .append("waCode", getWaCode())
- .append("wlCode", getWlCode())
- .append("productName", getProductName())
- .append("productCode", getProductCode())
- .append("productSort", getProductSort())
- .append("specification", getSpecification())
- .append("unitOfMeasure", getUnitOfMeasure())
- .append("planQuantity", getPlanQuantity())
- .append("putQuantity", getPutQuantity())
- .append("status", getStatus())
- .append("sapStatus", getSapStatus())
- .append("sapProof", getSapProof())
- .append("sapMessage", getSapMessage())
- .append("putDate", getPutDate())
- .append("batchNumber", getBatchNumber())
- .append("attr2", getAttr2())
- .append("attr3", getAttr3())
- .append("attr4", getAttr4())
- .append("attr5", getAttr5())
- .append("attr6", getAttr6())
- .append("attr7", getAttr7())
- .append("attr8", getAttr8())
- .append("attr9", getAttr9())
- .append("attr10", getAttr10())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return "WmsProductPut{" +
+ "id='" + id + '\'' +
+ ", workOrder='" + workOrder + '\'' +
+ ", factoryCode='" + factoryCode + '\'' +
+ ", productOrder='" + productOrder + '\'' +
+ ", whCode='" + whCode + '\'' +
+ ", waCode='" + waCode + '\'' +
+ ", wlCode='" + wlCode + '\'' +
+ ", productName='" + productName + '\'' +
+ ", productCode='" + productCode + '\'' +
+ ", productSort='" + productSort + '\'' +
+ ", specification='" + specification + '\'' +
+ ", unitOfMeasure='" + unitOfMeasure + '\'' +
+ ", planQuantity=" + planQuantity +
+ ", putQuantity=" + putQuantity +
+ ", status='" + status + '\'' +
+ ", sapStatus='" + sapStatus + '\'' +
+ ", sapProof='" + sapProof + '\'' +
+ ", sapMessage='" + sapMessage + '\'' +
+ ", putDate=" + putDate +
+ ", batchNumber='" + batchNumber + '\'' +
+ ", product_date='" + productDate + '\'' +
+ ", attr3='" + attr3 + '\'' +
+ ", attr4='" + attr4 + '\'' +
+ ", attr5='" + attr5 + '\'' +
+ ", attr6='" + attr6 + '\'' +
+ ", attr7='" + attr7 + '\'' +
+ ", attr8='" + attr8 + '\'' +
+ ", attr9='" + attr9 + '\'' +
+ ", attr10='" + attr10 + '\'' +
+ '}';
}
}
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
index 7be217f4..7f333af1 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml
@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put
+ select id, work_order, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, specification, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, batch_number, product_date, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_product_put