From c9e4c7290115cafd37e20b836f84c582d03a1fc2 Mon Sep 17 00:00:00 2001 From: qianhs Date: Sat, 18 Jul 2020 13:50:39 +0800 Subject: [PATCH 1/2] Finish Task #2080 Cost:8h --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 2f6c498..f20b634 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 @@ -231,9 +231,9 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "备注1") private String remake; - @Column(name = "DESC") + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") - private String desc; + private String secondaryRemake; @Transient @ApiParam(value = "发运单号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 2a5f544..5b06475 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -221,9 +221,9 @@ public class WmsMoveToERP extends BaseBean { @ApiParam(value = "成本中心") private String costCenter; - @Column(name = "DESC") + @Column(name = "SECONDARY_REMAKE") @ApiParam(value = "备注2") - private String desc; + private String secondaryRemake; @Column(name = "QUEUE_GROUP_NO") @ApiParam(value = "jis料架号") From 88b85b03d2c47c427a87b65f559dc567a3f91a3c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 18 Jul 2020 20:22:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Finish=20Task=20#2436=20Cost:8h=20=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E3=80=81=E5=AE=A2=E6=88=B7=E5=8F=91=E8=BF=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=AE=80=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index d3a2c16..40da59c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -169,6 +169,10 @@ public class WmsMoveSn extends BaseBean { @ApiParam("供应商编号") private String vendorNo; + @Column(name = "srcSn") + @ApiParam("原条码") + private String srcSn; + @Column(name = "SERIAl_SN") @ApiParam("产品条码") public String serialSn;