From 374d6596fbe3150170599876dcf9f28477064d16 Mon Sep 17 00:00:00 2001 From: jiaqihou Date: Fri, 21 Oct 2022 11:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90add=20qcMaster=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?basCustomer=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=AE=B5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 11 ++++++----- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 11 +++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index cf6566e..bb36b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -6,15 +6,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description :客户信息表 @@ -79,6 +75,11 @@ public class BasCustomer extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; + @Column(name = "CHECK_NUMBER") + @ApiParam(value = "校验次数") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Integer checkNumber; + public double getSafetyStockVal() { return this.safetyStock == null ? 0.0d : this.safetyStock; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index a2a82f8..71daedd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -12,12 +12,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; /** * @Description : 质检单主表信息 @@ -142,6 +137,10 @@ public class WmsQCMaster extends BaseBean { @ApiParam(value = "收货数量") public Double qty; + @Column(name = "FILE_PATH",columnDefinition = "longtext") + @ApiParam(value = "附件地址") + public String filePath; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; }