From ea9457a191274b4b30f0435ab3dcd5b169f6f22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= <sliter.yuan@estsh.com>
Date: Fri, 3 Apr 2020 15:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DWMS=E6=B3=A2=E6=AC=A1?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java   | 4 ++--
 .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
index ef16765..61cb767 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java
@@ -28,10 +28,10 @@ import java.math.BigDecimal;
         @Index(columnList = "ORDER_NO"),
         @Index(columnList = "PART_NO"),
         @Index(columnList = "ITEM_STATUS")
-}, uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})})
+})
+// uniqueConstraints = {@UniqueConstraint(columnNames = {"REF_SRC", "ITEM", "TRANS_TYPE_CODE_RDD"})}
 @Api("作业任务明细信息")
 public class WmsTaskDetails extends BaseBean {
-
     private static final long serialVersionUID = 2938720878619662102L;
     @Column(name = "ORDER_NO")
     @ApiParam(value = "单号")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
index 8f0336a..5b43149 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDocMovementModel.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 
 /**
@@ -14,6 +15,7 @@ import org.hibernate.annotations.ColumnDefault;
  * @Modify:
  **/
 @Data
+@NoArgsConstructor
 @AllArgsConstructor
 @Api("移库单数据模型")
 public class WmsDocMovementModel {
@@ -43,7 +45,7 @@ public class WmsDocMovementModel {
     private String partGroupNo;
 
     @ApiParam("订单状态")
-    private String orderStatus;
+    private Integer orderStatus;
 
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;