From 47ccfcc9e3afe151d98286e5766159d5a4531ecd Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 22 Nov 2019 20:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90EU=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90?= =?UTF-8?q?-=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E3=80=91=E3=80=90bug1177=E3=80=91=20=E3=80=90EU=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=8F=91=E8=BF=90-=E6=A3=80=E6=9F=A5=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=98=AF=E5=90=A6=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E3=80=91=E3=80=90bug1176=E3=80=91=20?= =?UTF-8?q?=E3=80=90EU=E6=88=90=E5=93=81=E5=8F=91=E8=BF=90-=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=8F=91=E8=BF=90FIFO=E6=8E=A8=E8=8D=90=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E3=80=90bug1174=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ---- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java | 15 ++++++++++++--- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 094cb2d..7bafaf6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -643,8 +643,8 @@ public class WmsEnumUtil { KT_DEFINITE(430,"KT_DEFINITE", "KT合格"), VDA_PACKAGE_MANAGE(440,"VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PURCHASE_RC(450,"KT_PURCHASE_RC", "采购收货"), - KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"); - + KT_PACK_RC(460,"KT_PACK_RC", "坤泰包装收货"), + FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"); private int value; private String code; 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 bf98ee4..f2a841b 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 @@ -60,8 +60,4 @@ public class BasCustomer extends BaseBean { @Column(name = "CUST_FAX") @ApiParam(value = "传真") private String custFax; - - @Column(name = "SHIPP_QTY") - @ApiParam(value = "发运数量控制") - private Integer shippQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 5705251..8ea05e4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -151,6 +151,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "计划日期") private String assignPlanDate; + @Column(name = "FLAG_NO") + @ApiParam(value = "客户发往地编号") + private String flagNo; + @Column(name = "PLAN_TIME") @ApiParam(value = "计划时间") private String assignPlanTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java index a401b2e..d08c68d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java @@ -29,20 +29,29 @@ import javax.persistence.Table; public class WmsShippingFlag extends BaseBean { private static final long serialVersionUID = 8034283413609254479L; + + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; + @Column(name = "FLAG_NO") - @ApiParam(value = "编号") + @ApiParam(value = "客户发往地编号") private String flagNo; @Column(name = "FLAG_NAME") - @ApiParam(value = "简称") + @ApiParam(value = "客户发往地名称") private String flagName; + @Column(name = "SHIPP_QTY") + @ApiParam(value = "发运数量控制") + private Integer shippQty; + @Column(name = "FLAG_DESC") @ApiParam(value = "全称") private String flagDesc; @Column(name = "FLAG_ADDR") - @ApiParam(value = "地址") + @ApiParam(value = "客户发往地址") private String flagAddr; @Column(name = "FLAG_OWNER")