From c45cd70ea91a3790074facd7031873fb52bd7e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 15 Jan 2021 13:31:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=96=9C=E5=BE=B7BUG=EF=BC=9A=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=B1=95=E5=BC=80=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BF=94=E5=9B=9EseqNo=E5=AF=BC=E8=87=B4=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index b6b0f0b..c69cab8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -768,6 +768,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { this.orderMasterStatus = orderMasterStatus; this.createUser = createUser; this.createDatetime = createDatetime; + this.seqNo = seqNo; } public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) { From 8cd32346d399b1e7e6cefe69b3439070680b1bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 15 Jan 2021 15:30:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?BUG#13694,=E5=96=9C=E5=BE=B7BUG=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81=E5=B1=95=E5=BC=80=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9F=A5=E8=AF=A2seqNo=E5=AF=BC=E8=87=B4=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index c69cab8..ed0c231 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -753,7 +753,7 @@ public WmsDocMovementDetails (String partNo,String orderNo) { public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType, String item, String partNo, String partNameRdd, String unit, Double qty, - Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime) { + Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime, String seqNo) { this.organizeCode = organizeCode; this.workOrderCode = workOrderCode; this.orderNo = orderNo; From db204080a8670a0ebcc71ff842a9592b55345ad2 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Mon, 18 Jan 2021 14:54:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=BB=91=E9=81=93=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E5=AE=A2=E6=88=B7=E4=BB=A3=E5=8F=B7"?= =?UTF-8?q?=E4=B8=8E"=E5=AE=A2=E6=88=B7=E6=8A=AC=E5=A4=B4"=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index ad614a8..39b12bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -5,16 +5,12 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; 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.ColumnDefault; 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.*; import java.io.Serializable; /** @@ -62,4 +58,12 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_CFG_CODE") @ApiParam("客户配置代码") private String customerCfgCode; + + @Column(name = "CUSTOMER_MARK") + @ApiParam("客户代号") + private String customerMark; + + @Column(name = "CUSTOMER_LATCH") + @ApiParam("客户抬头") + private String customerLatch; }