From e95db40c236110934e7b843560b32e1787a50dec Mon Sep 17 00:00:00 2001
From: "peter.pan" <peter.pan@estsh.com>
Date: Tue, 2 Jul 2019 17:35:32 +0800
Subject: [PATCH 1/2] 123

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9bba3de..cece287 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
@@ -2505,7 +2505,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_PART_TYPE {
-        RAW_MATERIAL(1, "原材料"), PARTIALLY_PREPARED_PRODUCTS(2, "半成品"), FINISHED_PRODUCT(3, "成品");
+        RAW_MATERIAL(10, "原材料"), PARTIALLY_PREPARED_PRODUCTS(20, "半成品"), FINISHED_PRODUCT(30, "成品");
 
         private int value;
         private String description;

From 81ed2465e3c9ca9a13c52d51d54f48691b38c77b Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 2 Jul 2019 17:35:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=AE=9E=E7=9B=98?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=20?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=8C=83=E5=9B=B4=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
index 5427a91..efc024e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@@ -99,8 +99,16 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam("源仓库编号")
     public String srcWhNo;
 
+    @Column
+    @ApiParam("是否范围内")
+    public Integer isScope;
+
     public WmsCSFactTrans(){}
 
+    public Integer getIsScopeVal() {
+        return isScope== null ? 0 : this.isScope.intValue();
+    }
+
     public WmsCSFactTrans(Double factQty, String partNo){
         if(factQty == null) {
             this.factQty = 0d;
@@ -109,4 +117,20 @@ public class WmsCSFactTrans extends BaseBean {
         }
         this.partNo = partNo;
     }
+
+    public WmsCSFactTrans(String orderNo, String whNo, String zoneNo, String locateNo,Double factQty, String partNo, String partNameRdd, String sn, Double qty, String unit, String srcLocateNo, String srcZoneNo, String srcWhNo) {
+        this.orderNo = orderNo;
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.factQty = factQty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.sn = sn;
+        this.qty = qty;
+        this.unit = unit;
+        this.srcLocateNo = srcLocateNo;
+        this.srcZoneNo = srcZoneNo;
+        this.srcWhNo = srcWhNo;
+    }
 }