|
|
@@ -26,6 +26,8 @@ import java.util.Date;
|
|
|
@Column(name="fa_date", attrName="faDate", label="发货日期"),
|
|
|
@Column(name="fa_nums", attrName="faNums", label="发货数量", isUpdateForce=true),
|
|
|
@Column(name="nums", attrName="nums", label="实际数量", isUpdateForce=true),
|
|
|
+ @Column(name="hg_qty", attrName="hgQty", label="合格数量", isUpdateForce=true),
|
|
|
+ @Column(name="bhg_qty", attrName="bhgQty", label="不合格数量", isUpdateForce=true),
|
|
|
@Column(name="state", attrName="state", label="状态"),
|
|
|
@Column(name="remark", attrName="remark", label="备注"),
|
|
|
@Column(name="create_by", attrName="createBy", label="报检人"),
|
|
|
@@ -52,19 +54,25 @@ import java.util.Date;
|
|
|
},orderBy="a.update_date DESC"
|
|
|
)
|
|
|
public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
-
|
|
|
+
|
|
|
private static final long serialVersionUID = 1L;
|
|
|
private String materialId; // 物料id
|
|
|
private String sn; // 来料码
|
|
|
private String faDate; // 发货日期
|
|
|
private Long faNums; // 发货数量
|
|
|
private Long nums; // 实际数量
|
|
|
+ private String hgQty; //合格数量
|
|
|
+ private String bhgQty; //不合格数量
|
|
|
private String state; // 状态
|
|
|
private String remark; // 备注
|
|
|
|
|
|
private String title; //物料名称
|
|
|
private String checkResult; //检查结果
|
|
|
private String productName; //产品名称
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@ExcelFields({
|
|
|
// @ExcelField(title="id", attrName="id", align=Align.CENTER, sort=10),
|
|
|
// @ExcelField(title="物料id", attrName="materialId", align=Align.CENTER, sort=20),
|
|
|
@@ -80,14 +88,32 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
// @ExcelField(title="update_by", attrName="updateBy", align=Align.CENTER, sort=100),
|
|
|
// @ExcelField(title="update_date", attrName="updateDate", align=Align.CENTER, sort=110),
|
|
|
})
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ public String getHgQty() {
|
|
|
+ return hgQty;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setHgQty(String hgQty) {
|
|
|
+ this.hgQty = hgQty;
|
|
|
+ }
|
|
|
+
|
|
|
+ public String getBhgQty() {
|
|
|
+ return bhgQty;
|
|
|
+ }
|
|
|
+
|
|
|
+ public void setBhgQty(String bhgQty) {
|
|
|
+ this.bhgQty = bhgQty;
|
|
|
+ }
|
|
|
public MesMaterialReport() {
|
|
|
this(null);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public MesMaterialReport(String id){
|
|
|
super(id);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Size(min=0, max=64, message="物料id长度不能超过 64 个字符")
|
|
|
public String getMaterialId() {
|
|
|
return materialId;
|
|
|
@@ -96,7 +122,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setMaterialId(String materialId) {
|
|
|
this.materialId = materialId;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Size(min=0, max=150, message="来料码长度不能超过 150 个字符")
|
|
|
public String getSn() {
|
|
|
return sn;
|
|
|
@@ -105,7 +131,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setSn(String sn) {
|
|
|
this.sn = sn;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Size(min=0, max=100, message="发货日期长度不能超过 100 个字符")
|
|
|
public String getFaDate() {
|
|
|
return faDate;
|
|
|
@@ -130,7 +156,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setNums(Long nums) {
|
|
|
this.nums = nums;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@NotBlank(message="状态不能为空")
|
|
|
@Size(min=0, max=1, message="状态长度不能超过 1 个字符")
|
|
|
public String getState() {
|
|
|
@@ -140,7 +166,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setState(String state) {
|
|
|
this.state = state;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Size(min=0, max=255, message="备注长度不能超过 255 个字符")
|
|
|
public String getRemark() {
|
|
|
return remark;
|
|
|
@@ -149,7 +175,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setRemark(String remark) {
|
|
|
this.remark = remark;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public String getFaDate_gte() {
|
|
|
return sqlMap.getWhere().getValue("fa_date", QueryType.GTE);
|
|
|
}
|
|
|
@@ -157,7 +183,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setFaDate_gte(String faDate) {
|
|
|
sqlMap.getWhere().and("fa_date", QueryType.GTE, faDate);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public String getFaDate_lte() {
|
|
|
return sqlMap.getWhere().getValue("fa_date", QueryType.LTE);
|
|
|
}
|
|
|
@@ -165,7 +191,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setFaDate_lte(String faDate) {
|
|
|
sqlMap.getWhere().and("fa_date", QueryType.LTE, faDate);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public Date getCreateDate_gte() {
|
|
|
return sqlMap.getWhere().getValue("create_date", QueryType.GTE);
|
|
|
}
|
|
|
@@ -173,7 +199,7 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setCreateDate_gte(Date createDate) {
|
|
|
sqlMap.getWhere().and("create_date", QueryType.GTE, createDate);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public Date getCreateDate_lte() {
|
|
|
return sqlMap.getWhere().getValue("create_date", QueryType.LTE);
|
|
|
}
|
|
|
@@ -205,4 +231,4 @@ public class MesMaterialReport extends DataEntity<MesMaterialReport> {
|
|
|
public void setProductName(String productName) {
|
|
|
this.productName = productName;
|
|
|
}
|
|
|
-}
|
|
|
+}
|