From c3bdf4a1624ef01d4fd6779ffa1faa85ef667050 Mon Sep 17 00:00:00 2001
From: "rock.yu" <rock.yu@estsh.com>
Date: Thu, 15 Oct 2020 20:20:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B310330=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=89=A3=E5=87=8F=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/model/wms/WmsJobParamModel.java    |  7 ++++++-
 .../i3plus/pojo/model/wms/WmsMoveDetailsModel.java |  8 ++++++++
 .../i3plus/pojo/model/wms/WmsMoveMasterModel.java  |  8 ++++++++
 .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java  | 24 ++++++++++++++++------
 .../estsh/i3plus/pojo/wms/bean/WmsTransType.java   |  4 ++++
 5 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
index 009c019..ca619c2 100755
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsJobParamModel.java
@@ -21,7 +21,12 @@ public class WmsJobParamModel implements Serializable {
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
     private Integer minuteDiff;//处理周期(分钟)
-    private String whereHql;//业务查询条件HQL
+    private List<String> fixPartList;//需要特殊处理的零件号集合
+    private String fixPartAndWhere; // 特殊零件号需要加的过滤条件
+    private Integer pageSize;//数据条数
+    private Integer isCheckSn;//是否检查条码存在
+    private Integer erpSyncFlag;//查询SHIPPING表的条件
+
 
     public int getMinuteDiffVal() {
         return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
index a718377..b92fbbe 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java
@@ -19,4 +19,12 @@ public class WmsMoveDetailsModel implements Serializable {
     private static final long serialVersionUID = -6968143574442339454L;
     private WmsMoveDetails details;
     private List<WmsMoveSn> moveSnList;
+
+    public WmsMoveDetailsModel(WmsMoveDetails details, List<WmsMoveSn> moveSnList) {
+        this.details = details;
+        this.moveSnList = moveSnList;
+    }
+
+    public WmsMoveDetailsModel() {
+    }
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
index 0e1e684..ff464ed 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveMasterModel.java
@@ -18,4 +18,12 @@ public class WmsMoveMasterModel implements Serializable {
     private static final long serialVersionUID = -5490167040159056107L;
     private WmsMoveMaster moveMaster;
     private List<WmsMoveDetailsModel> moveDetails;
+
+    public WmsMoveMasterModel(WmsMoveMaster moveMaster, List<WmsMoveDetailsModel> moveDetails) {
+        this.moveMaster = moveMaster;
+        this.moveDetails = moveDetails;
+    }
+
+    public WmsMoveMasterModel() {
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index f04cc9c..7f47f40 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -10,12 +10,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 库存移动单主表信息
@@ -177,6 +173,22 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("总行数")
     private Long itemQty;
 
+    @Transient
+    @ApiParam("存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam("仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam("状态集合")
+    private List<Integer> orderStatusList;
+
+    @Transient
+    @ApiParam("交易类型集合")
+    private List<String> transTypeCodeList;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
index edcf03a..7051b98 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java
@@ -81,6 +81,10 @@ public class WmsTransType extends BaseBean {
     @ApiParam(value = "交易处理组件名称")
     private String tmName;
 
+    @Column(name = "DIRECT")
+    @ApiParam(value = "交易的方向：IN,OUT,MOVE")
+    private String direct;
+
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;