From 709db0b573677e8915ebb25c59218674ff660c53 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 19 Feb 2020 13:23:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=207526=20=E5=8F=91=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E6=94=B6=E6=97=B6=EF=BC=8C=E5=9C=A8=E4=B8=BB=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=AE=B2=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E8=AF=A5=E5=8D=95=E6=8D=AE=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E4=B8=AD=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80=E6=AD=A5=E6=B3=95?=
 =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E8=AF=A5?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9C=80=E8=A6=81=E5=9C=A8=E5=89=8D=E5=8F=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=BA=E4=B8=80=E6=AD=A5=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=AD=98=E5=9C=A8=E4=B8=A4=E6=AD=A5=E6=B3=95?=
 =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E4=B8=A4=E6=AD=A5=E6=B3=95=E3=80=82=20?=
 =?UTF-8?q?=E3=80=91bug7526?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 8a1bb3a..74d1911 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
@@ -111,9 +111,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "客户单号")
     private String custOrderNo;
 
-    @Column(name = "remark")
-    @ApiParam(value = "备注:一步法/两步法")
-    private String remark;
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;
@@ -164,6 +161,15 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "计划时间")
     private String assignPlanTime;
 
+    @Column(name = "TAG")
+    @ApiParam(value = "标签")
+    private String tag;
+
+    @Column(name = "IS_SINGLE_STEP")
+    @ApiParam(value = "一步法/两步法")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STEP.class, refForeignKey = "value", value = "description")
+    private Integer isSingleStep;
+
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;
@@ -184,10 +190,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     public String title;
 
-    @Column(name = "TAG")
-    @ApiParam(value = "标签")
-    private String tag;
-
     @Transient
     @ApiParam("物料编号组")
     public String[] partNos;