From c9f6f336af818031c2967a524392f51d16a24324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Tue, 10 Mar 2020 10:30:32 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=9A=E8=A7=A3=E5=86=B3=E4=BA=86BUG#7658,7660,7661,7663,766?=
 =?UTF-8?q?4=203D=E4=BB=93=E5=BA=93=EF=BC=9A=E8=81=94=E8=B0=83=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/model/wms/WmsTdChangeModel.java    | 25 +++++++++++++++++++
 .../estsh/i3plus/pojo/wms/bean/WmsFurniture.java   | 29 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java   | 16 +++++++++++-
 .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java    |  4 +++
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  |  2 +-
 5 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java
new file mode 100644
index 0000000..a6f69a8
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTdChangeModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsFurniture;
+import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 更改三维坐标MoDel
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/3/6 17:57
+ * @Modify
+ */
+@Data
+public class WmsTdChangeModel implements Serializable {
+    private static final long serialVersionUID = -2682858106052506217L;
+
+    private List<WmsZones> wmsZonesList;
+    private List<WmsFurniture> wmsFurnitureList;
+    private List<WmsLocate> wmsLocateList;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
index a6f6904..8dd97f8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 家具实体
@@ -49,7 +50,35 @@ public class WmsFurniture extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
+    @Transient
+    @ApiParam(value = "层")
+    private Integer storey;
+
+    @Transient
+    @ApiParam(value = "列")
+    private Integer fntCol;
+
+
     public int getIsSaveGoodsVal() {
         return this.isSaveGoods == null ? 0 : this.isSaveGoods;
     }
+
+    public WmsFurniture() {
+    }
+
+    public WmsFurniture(String whNo, String zoneNo, String typeCode, String furnitureNo,
+                        Integer isSaveGoods, String position, Integer storey, Integer fntCol) {
+        this.whNo = whNo;
+        this.zoneNo = zoneNo;
+        this.typeCode = typeCode;
+        this.furnitureNo = furnitureNo;
+        this.isSaveGoods = isSaveGoods;
+        this.position = position;
+        this.storey = storey;
+        this.fntCol = fntCol;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 41092ce..ea6891b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -47,7 +47,7 @@ public class WmsLocate extends BaseBean {
      */
     @Column(name = "LOCATE_TYPE")
     @ApiParam(value = "库位类型")
-    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, entityName = "LOCATE_TYPE")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "LOCATE_TYPE")
     private Integer locateType;
 
     @Column(name = "WH_NO")
@@ -147,6 +147,10 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private String lastCsTime;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
     // 导入用
     @ApiParam(value = "工厂")
     @Transient
@@ -254,5 +258,15 @@ public class WmsLocate extends BaseBean {
         return this.frequency == null ? 0 : this.frequency.intValue();
     }
 
+    public Integer getXVal() {
+        return this.x == null ? 0 : this.x.intValue();
+    }
+    public Integer getYVal() {
+        return this.y == null ? 0 : this.y.intValue();
+    }
+    public Integer getZVal() {
+        return this.z == null ? 0 : this.z.intValue();
+    }
+
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
index 4c9e00d..c00ff31 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@@ -113,6 +113,10 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
     private Double zoneWidth;
 
+    @Column(name = "POSITION")
+    @ApiParam(value = "三维位置")
+    private String position;
+
     @Transient
     @ApiParam(value = "子存储区列表")
     private List<WmsZones> childList;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index 6e717a9..9808095 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -541,7 +541,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
         if (wmsLocate.getZoneNo() != null) {
-            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "", result);
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))), ","), "zoneNo", result);
         }
         if (wmsLocate.getLocateNoArr() != null) {
             DdlPreparedPack.getInPack(StringUtils.join(wmsLocate.getLocateNoArr()), "", result);

From ccf2817788468ba2a0d4083d406c418dd3ddd9f2 Mon Sep 17 00:00:00 2001
From: joke lin <jokelin@jokedeMacBook-Pro.local>
Date: Tue, 10 Mar 2020 19:54:52 +0800
Subject: [PATCH 2/9] =?UTF-8?q?[=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 117 +++++++++++++++++++--
 .../i3plus/pojo/mes/bean/MesQueueGroupCount.java   |   2 +-
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java |   8 ++
 .../i3plus/pojo/mes/bean/MesQueueJisDetail.java    |   8 ++
 .../i3plus/pojo/mes/bean/MesQueueJitActual.java    |  12 +++
 .../pojo/mes/bean/MesQueueJitActualDetail.java     |   6 +-
 .../estsh/i3plus/pojo/mes/bean/MesQueueOrder.java  |  20 ++++
 .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java  |  12 ++-
 8 files changed, 173 insertions(+), 12 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 850ce6c..9683119 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -17,7 +17,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_ACTION_MODULE {
-        WORK_ORDER_LANDED(10, "生产工单下达");
+        WORK_ORDER_LANDED(10, "生产工单下达"),
+        QUEUE_JIT_ACTUAL_LANDED(20, "客户JIT生产工单下达");
 
         private int value;
         private String description;
@@ -2915,7 +2916,8 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;
@@ -4068,7 +4070,7 @@ public class MesEnumUtil {
      * 客户JIT生产队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+    public enum QUEUE_JIT_ACTUAL_STATUS {
         CREATE(10, "创建"),
         LANDED(20, "下达"),
         CANCEL(30, "取消");
@@ -4076,7 +4078,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
+        QUEUE_JIT_ACTUAL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -4104,14 +4106,117 @@ public class MesEnumUtil {
      * 客户JIT生产队列特殊标识
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+    public enum QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
         NORMAL(10, "正常"),
         EMPTYING(20, "放空");
 
         private int value;
         private String description;
 
-        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+        QUEUE_JIT_ACTUAL_SPECIAL_FLAG(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIS发运队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_STATUS {
+        CREATE(10, "创建");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 生产队列 队列类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_QUEUE_TYPE {
+        PRODUCT_QUEUE(10, "生产队列"),
+        PRELOAD_QUEUE(20, "预装队列");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_QUEUE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIS发运队列明细 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_JIS_DETAIL_STATUS {
+        CREATE(10, "创建");
+
+        private int value;
+        private String description;
+
+        QUEUE_JIS_DETAIL_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
index 1133c1a..a459fb4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java
@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_JIT_ACTUAL_DETAIL
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java
index 249fd29..4a6ca87 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java
@@ -64,6 +64,14 @@ public class MesQueueJis extends BaseBean implements Serializable {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_PLANT_CODE")
+    @ApiParam("客户产线代码")
+    private String custPlantCode;
+
     @Transient
     @ApiParam("颜色")
     private String color;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java
index 5ac2924..8c8e9bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java
@@ -59,4 +59,12 @@ public class MesQueueJisDetail extends BaseBean implements Serializable {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index e3f8e55..0f191b6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -88,4 +88,16 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
     @ApiParam("客户需求结束时间")
     private String custPointEndDate;
 
+    @Transient
+    @ApiParam("产品配置名称")
+    private String prodCfgName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("特殊标识名称")
+    private String specialFlagName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index 77e6c6f..832419c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -31,9 +31,9 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 1442091799346314190L;
 
-    @Column(name = "QGR_CODE")
-    @ApiParam("分组规则代码")
-    private String qgrCode;
+    @Column(name = "JIS_ACTUAL_NO")
+    @ApiParam("队列编号")
+    private String jisActualNo;
 
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
index 159aa03..fa0c07b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@@ -72,6 +72,26 @@ public class MesQueueOrder extends BaseBean implements Serializable {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Column(name = "IS_LOCK")
+    @ApiParam("锁定标识")
+    private Integer isLock;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "WORK_TYPE")
+    @ApiParam("区域代码")
+    private String workType;
+
+    @Column(name = "QUEUE_TYPE")
+    @ApiParam("队列类型")
+    private Integer queueType;
+
+    @Column(name = "PG_CODE")
+    @ApiParam("生产组代码")
+    private String pgCode;
+
     @Transient
     @ApiParam("起始车号")
     private String custFlagNoStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index 040bac7..c7554a2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -72,10 +72,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "产品生产类型")
-    @ApiParam("产品类型名称")
+    @Column(name = "PPT_CODE")
+    @ApiParam("产品生产类型")
     private String pptCode;
 
+    @Column(name = "QUEUE_GROUP_NO")
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Column(name = "GROUP_NO")
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
     @Transient
     @ApiParam("队列序号")
     private Double queueSeq;

From 0968cdc49e5289438d19f192abfd56bd4eb7741f Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 11 Mar 2020 11:35:36 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E3=80=907601=20=E5=8F=91=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1=E4=BA=8E=E7=94=9F=E6=88=90=E7=9A=84=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=9D=A1=E7=A0=81=E4=B8=8D=E5=AD=98=E5=9C=A8=E4=BA=8E?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E4=B8=AD=E3=80=82=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E4=B8=AA=E7=95=8C=E9=9D=A2=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=9F=A5=E5=88=B0=E8=BF=99=E4=BA=9B=E6=9D=A1=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=89=93=E5=8D=B0=E5=87=BA=E6=9D=A5=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E7=9A=84=E8=AF=9D=E5=A6=82=E6=9E=9C=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=82=A3=E6=AC=A1=E7=9A=84=E6=89=93=E5=8D=B0=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E4=BA=86=EF=BC=8C=E9=82=A3=E5=B0=B1=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=8D=B0=E6=94=B9=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E3=80=82=E3=80=91BUG#7601=20=E3=80=907567=20=E6=9D=A1=E7=A0=81?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8A=A5=E8=A1=A8=E5=B8=8C=E6=9C=9B=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AAASN=E7=BB=84=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E6=98=AF=E5=B8=8C=E6=9C=9B=E5=8F=AF=E4=BB=A5=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7ASN=E7=BB=84=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E7=A0=81=E3=80=91bug#7567=20=E3=80=907520=20=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E5=8D=95=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E4=B8=8E=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E4=BB=8E=E7=9B=98=E7=82=B9=E8=8C=83=E5=9B=B4=E9=87=8C?=
 =?UTF-8?q?=E5=8F=96=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E5=BA=93=E5=8C=BA=E6=88=96=E8=80=85=E5=A4=9A=E4=B8=AA=E9=9B=B6?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=88=99=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E5=B0=B1=E8=A1=8C,=E6=9F=A5=E8=AF=A2=E6=A1=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9B=B6=E4=BB=B6=E5=8F=B7=E4=B8=8E=E5=BA=93?=
 =?UTF-8?q?=E5=8C=BA=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E3=80=91bug#7520?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 8 ++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java   | 4 ++++
 3 files changed, 17 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
index fe8ebc7..6d70ddc 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
@@ -92,10 +92,18 @@ public class WmsCSOrderMaster extends BaseBean {
     public String[] wmsCSParts;
 
     @Transient
+    @ApiParam(value = "盘点物料清单")
+    public String wmsCSPartsStr;
+
+    @Transient
     @ApiParam(value = "盘点存储区清单")
     public String[] wmsCSZones;
 
     @Transient
+    @ApiParam(value = "盘点存储区清单")
+    public String wmsCSZonesStr;
+
+    @Transient
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 81cd4b4..f5631cd 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -126,4 +126,9 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @ApiParam("父层级packcode对应的可回用零件号")
     private String parentReturnPart;
+
+
+    @Transient
+    @ApiParam("打印模板")
+    private String templateNo;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index f72a66b..eae8683 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -306,6 +306,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 
+    @Transient
+    @ApiParam(value = "集装箱号")
+    private String containerNo;
+
     public WmsStockSn() {
     }
 

From 2c0ef55e85e32afe6f2705e2853fc0b2d5420cd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Wed, 11 Mar 2020 15:00:49 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2BUG#7674,#7676+=20=E6=B5=81=E7=A8=8B=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5BUG#7682?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WareHouse.java   | 51 +++++++++++++---------
 .../estsh/i3plus/pojo/wms/bean/WmsFurniture.java   | 10 ++---
 .../i3plus/pojo/wms/bean/WmsFurnitureType.java     | 38 +++++++++++-----
 .../cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java   | 30 ++++++-------
 .../cn/estsh/i3plus/pojo/wms/bean/WmsZones.java    | 16 +++----
 5 files changed, 85 insertions(+), 60 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
index e3ddc5b..30d7725 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WareHouse.java
@@ -28,52 +28,63 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_WAREHOUSE")
+@Table(name = "WMS_WAREHOUSE")
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
     private static final long serialVersionUID = 7914396535326597148L;
-    @Column(name="CODE")
+    @Column(name = "CODE")
     @ApiParam("仓库代码")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String code;
 
-    @Column(name="NAME")
+    @Column(name = "NAME")
     @ApiParam("仓库名称")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     public String name;
 
-    @Column(name="ADDRESS")
+    @Column(name = "ADDRESS")
     @ApiParam("仓库地址")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     public String address;
 
-    @Column(name = "WH_LENGTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "长")
+    @Column(name = "WH_LENGTH")
+    @ApiParam(value = "长(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whLength;
+    private Integer whLength;
 
-    @Column(name = "WH_WIDTH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "宽")
+    @Column(name = "WH_WIDTH")
+    @ApiParam(value = "宽(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whWidth;
+    private Integer whWidth;
 
-    @Column(name = "WH_HEIGHT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "高")
+    @Column(name = "WH_HEIGHT")
+    @ApiParam(value = "高(单位：全局设置参数中的基本单元)")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double whHeight;
+    private Integer whHeight;
+
+    @Column(name = "BASE_UNIT", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "基本单元（米）")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    private Double baseUnit;
 
     @Transient
-    @ApiParam(value ="存储区列表")
+    @ApiParam(value = "存储区列表")
     private List<WmsZones> zoneList;
 
-    public double getWhLengthVal() {
-        return this.whLength == null ? 0 : this.whLength.doubleValue();
+    public Integer getWhLengthVal() {
+        return this.whLength == null ? 0 : this.whLength.intValue();
+    }
+
+    public Integer getWhWidthVal() {
+        return this.whWidth == null ? 0 : this.whWidth.intValue();
     }
-    public double getWhWidthVal() {
-        return this.whWidth == null ? 0 : this.whWidth.doubleValue();
+
+    public Integer getWhHeightVal() {
+        return this.whHeight == null ? 0 : this.whHeight.intValue();
     }
-    public double getWhHeightVal() {
-        return this.whHeight == null ? 0 : this.whHeight.doubleValue();
+
+    public Double getBaseUnitVal() {
+        return this.baseUnit == null ? 0 : this.baseUnit.doubleValue();
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
index 8dd97f8..929b274 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurniture.java
@@ -62,11 +62,6 @@ public class WmsFurniture extends BaseBean {
     @ApiParam(value = "列")
     private Integer fntCol;
 
-
-    public int getIsSaveGoodsVal() {
-        return this.isSaveGoods == null ? 0 : this.isSaveGoods;
-    }
-
     public WmsFurniture() {
     }
 
@@ -81,4 +76,9 @@ public class WmsFurniture extends BaseBean {
         this.storey = storey;
         this.fntCol = fntCol;
     }
+
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods;
+    }
+
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java
index 2ee5b0f..d9dd033 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFurnitureType.java
@@ -37,17 +37,17 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "类型名称")
     private String typeName;
 
-    @Column(name = "FNT_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_LENGTH")
     @ApiParam(value = "长")
-    private Double fntLength;
+    private Integer fntLength;
 
-    @Column(name = "FNT_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_WIDTH")
     @ApiParam(value = "宽")
-    private Double fntWidth;
+    private Integer fntWidth;
 
-    @Column(name = "FNT_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "FNT_HEIGHT")
     @ApiParam(value = "高")
-    private Double fntHeight;
+    private Integer fntHeight;
 
     @Column(name = "STOREY")
     @ApiParam(value = "层")
@@ -61,14 +61,28 @@ public class WmsFurnitureType extends BaseBean {
     @ApiParam(value = "是否储物")
     private Integer isSaveGoods;
 
-    public Double getFntLengthVal() {
-        return this.fntLength == null ? 0 : this.fntLength.doubleValue();
+    public Integer getStoreyVal() {
+        return this.storey == null ? 0 : this.storey.intValue();
     }
-    public Double getFntWidthVal() {
-        return this.fntWidth == null ? 0 : this.fntWidth.doubleValue();
+
+    public Integer getFntColVal() {
+        return this.fntCol == null ? 0 : this.fntCol.intValue();
+    }
+
+    public Integer getFntLengthVal() {
+        return this.fntLength == null ? 0 : this.fntLength.intValue();
+    }
+
+    public Integer getFntWidthVal() {
+        return this.fntWidth == null ? 0 : this.fntWidth.intValue();
+    }
+
+    public Integer getFntHeightVal() {
+        return this.fntHeight == null ? 0 : this.fntHeight.intValue();
     }
-    public Double getFntHeightVal() {
-        return this.fntHeight == null ? 0 : this.fntHeight.doubleValue();
+
+    public Integer getIsSaveGoodsVal() {
+        return this.isSaveGoods == null ? 0 : this.isSaveGoods.intValue();
     }
 
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index ea6891b..a5b6221 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -82,20 +82,20 @@ public class WmsLocate extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Integer z;
 
-    @Column(name = "LC_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcLength;
+    private Integer lcLength;
 
-    @Column(name = "LC_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcWidth;
+    private Integer lcWidth;
 
-    @Column(name = "LC_HEIGHT", columnDefinition = "decimal(18,8)")
+    @Column(name = "LC_HEIGHT")
     @ApiParam(value = "高")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
-    private Double lcHeight;
+    private Integer lcHeight;
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "-1")
@@ -244,18 +244,18 @@ public class WmsLocate extends BaseBean {
         return this.locateType== null ? 0 : this.locateType.intValue();
     }
 
-    public Double getLcLengthVal() {
-        return this.lcLength == null ? 0 : this.lcLength.doubleValue();
+    public Integer getFrequencyVal() {
+        return this.frequency == null ? 0 : this.frequency.intValue();
     }
-    public Double getLcWidthVal() {
-        return this.lcWidth == null ? 0 : this.lcWidth.doubleValue();
+
+    public Integer getLcLengthVal() {
+        return this.lcLength == null ? 0 : this.lcLength.intValue();
     }
-    public Double getLcHeightVal() {
-        return this.lcHeight == null ? 0 : this.lcHeight.doubleValue();
+    public Integer getLcWidthVal() {
+        return this.lcWidth == null ? 0 : this.lcWidth.intValue();
     }
-
-    public Integer getFrequencyVal() {
-        return this.frequency == null ? 0 : this.frequency.intValue();
+    public Integer getLcHeightVal() {
+        return this.lcHeight == null ? 0 : this.lcHeight.intValue();
     }
 
     public Integer getXVal() {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
index c00ff31..e11133a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@@ -103,15 +103,15 @@ public class WmsZones extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2, entityName = "TRUE_OR_FALSE")
     private Integer checkFifo;
 
-    @Column(name = "ZONE_LENGTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_LENGTH")
     @ApiParam(value = "长")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneLength;
+    private Integer zoneLength;
 
-    @Column(name = "ZONE_WIDTH", columnDefinition = "decimal(18,8)")
+    @Column(name = "ZONE_WIDTH")
     @ApiParam(value = "宽")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
-    private Double zoneWidth;
+    private Integer zoneWidth;
 
     @Column(name = "POSITION")
     @ApiParam(value = "三维位置")
@@ -133,10 +133,10 @@ public class WmsZones extends BaseBean {
     public WmsZones() {
     }
 
-    public double getZoneLengthVal() {
-        return this.zoneLength == null ? 0 : this.zoneLength.doubleValue();
+    public Integer getZoneLengthVal() {
+        return this.zoneLength == null ? 0 : this.zoneLength.intValue();
     }
-    public double getZoneWidthVal() {
-        return this.zoneWidth == null ? 0 : this.zoneWidth.doubleValue();
+    public Integer getZoneWidthVal() {
+        return this.zoneWidth == null ? 0 : this.zoneWidth.intValue();
     }
 }

From ac4a8b0ab4a2601e5f82903e40b4f57ee2b2740b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Wed, 11 Mar 2020 15:07:09 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9ptl=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
index b766f3f..8746630 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
@@ -1551,13 +1551,20 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWhereByClear(DdlPackBean packBean, String dateTime) {
+        LOGGER.info("ptl_pcn数据清除查询");
         StringBuffer queryString = new StringBuffer();
-        queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 and model.createDatetime <= " + dateTime + " ");
+        queryString.append("select model from " + persistentClass.getSimpleName()
+                + " as model where 1=1 and model.createDatetime <= " + "'" + dateTime + "'" + " ");
 
         if (packBean != null) {
             queryString.append(packBean.getWhereAppend());
         }
 
-        return entityManager.createQuery(queryString.toString()).getResultList();
+        Query query = entityManager.createQuery(queryString.toString());
+        for (String key : packBean.getHqlPreparedMap().keySet()) {
+            query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
+        }
+
+        return query.getResultList();
     }
 }

From 102af98a75a7aafd4c196da55ca3f3b320cb0e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Wed, 11 Mar 2020 15:53:39 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90PTL=5F=E5=A2=9E=E5=8A=A0=E4=B8=BB?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=92=8C?=
 =?UTF-8?q?=E7=BB=84=E5=86=85=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java     | 10 ++++------
 .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java     |  4 ++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index c7554a2..1b817ca 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -72,19 +72,17 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryNameRdd;
 
-    @Column(name = "PPT_CODE")
-    @ApiParam("产品生产类型")
+@Column(name = "产品生产类型")
+    @ApiParam("产品类型名称")
     private String pptCode;
 
-    @Column(name = "QUEUE_GROUP_NO")
+   @Column(name = "QUEUE_GROUP_NO")
     @ApiParam("分组队列编号")
     private String queueGroupNo;
 
     @Column(name = "GROUP_NO")
     @ApiParam("组内编号")
-    private Integer groupNo;
-
-    @Transient
+    private Integer groupNo;    @Transient
     @ApiParam("队列序号")
     private Double queueSeq;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
index d4961d3..357f9e8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -79,6 +80,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("工步列表")
     private List<StepModel> stepList;
 
+    @ApiParam("生产主队列编号")
+    private String orderNo;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

From cb09776bdbf40e72736430ff6dae1ccb56830095 Mon Sep 17 00:00:00 2001
From: joke lin <jokelin@jokedeMacBook-Pro.local>
Date: Wed, 11 Mar 2020 18:13:16 +0800
Subject: [PATCH 7/9] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A1435=20?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 10 +++--
 .../i3plus/pojo/mes/bean/MesProdScatterDetail.java | 48 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/MesButtonFlagModel.java  |  3 ++
 .../repository/MesProdScatterDetailRepository.java | 13 ++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 25 ++++++++---
 5 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 9683119..5bf74c2 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -2917,7 +2917,8 @@ public class MesEnumUtil {
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
         BH_ORDER(40, "B&H工单"),
-        JIT_ORDER(50, "JIT工单");
+        JIT_ORDER(50, "JIT工单"),
+        STOCK_ORDER(60, "库存工单");
 
         private int value;
         private String description;
@@ -4142,7 +4143,9 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIS_STATUS {
-        CREATE(10, "创建");
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        SHIPMENT(30, "已发运");
 
         private int value;
         private String description;
@@ -4211,7 +4214,8 @@ public class MesEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QUEUE_JIS_DETAIL_STATUS {
-        CREATE(10, "创建");
+        CREATE(10, "创建"),
+        SHIPMENT(20, "已发运");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java
new file mode 100644
index 0000000..097c8d3
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterDetail.java
@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 8:59 上午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PROD_SCATTER_DETAIL")
+@Api("MES_散件产品配置关系")
+public class MesProdScatterDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3602480079910597288L;
+
+    @Column(name = "SP_CFG_CODE")
+    @ApiParam("散件配置编码")
+    private String spCfgCode;
+
+    @Column(name = "PRODUCE_CTGY_CODE")
+    @ApiParam("产品位置代码")
+    private String produceCtgyCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("散件产品代码")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("散件产品名称")
+    private String partName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
index d3ab791..3cd4e8b 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java
@@ -26,6 +26,9 @@ public class MesButtonFlagModel implements Serializable {
     @ApiParam("按配置修改按钮")
     private boolean updateButtonConfig;
 
+    @ApiParam("按散件修改按钮")
+    private boolean updateButtonScatter;
+
     @ApiParam("下达按钮")
     private boolean transmitButton;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java
new file mode 100644
index 0000000..254cfb8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterDetailRepository.java
@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/3/11 9:16 上午
+ * @Modify:
+ */
+public interface MesProdScatterDetailRepository extends BaseRepository<MesProdScatterDetail, Long> {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 9e068c0..914920f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -226,15 +226,28 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getIsValid(), "isValid", packBean);
         }
 
+        if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+        }
+        if (mesQueueOrder.getQueueType() != null) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean);
+        }
+
         // 只查询创建状态的队列
         DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
 
-        // 时间段查询
-        DdlPreparedPack.timeBuilder(
-                mesQueueOrder.getCreateDateTimeStart(),
-                mesQueueOrder.getCreateDateTimeEnd(),
-                "createDatetime", packBean, true);
-
+        if (!StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeStart()) || !StringUtil.isEmpty(mesQueueOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesQueueOrder.getCreateDateTimeStart(),
+                    mesQueueOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
         // DdlPreparedPack.getOrderDefault(mesQueueOrder);
         return packBean;
     }

From a5101960227f43bdfedd06c3236927836521ac95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Wed, 11 Mar 2020 18:49:33 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=BD=AF=E5=88=A0=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/form/bean/BfDataObjectProperty.java     |  8 ++++++++
 .../java/cn/estsh/i3plus/pojo/form/bean/BfElement.java  | 17 ++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
index 8e246ce..54b9201 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfDataObjectProperty.java
@@ -112,6 +112,14 @@ public class BfDataObjectProperty extends BaseBean {
     }
 
     @Transient
+    @ApiParam(value ="是否为数据有效字段")
+    private transient Integer isValidProperty;
+
+    @Transient
+    @ApiParam(value ="是否为弱删除字段")
+    private transient Integer isDeleteWeaklyProperty;
+
+    @Transient
     @ApiParam(value ="元素值")
     private transient Object propertyFormValue;
 
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
index 43874a3..ee72ad6 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java
@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.form.bean;
 
-import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -79,6 +78,22 @@ public class BfElement extends BaseBean {
     @ApiParam(value = "是否删除")
     private Integer isObjectDel;
 
+    @Column(name = "IS_OBJECT_DEL_WEAK")
+    @ApiParam(value = "是否弱删除")
+    private Integer isObjectDelWeak;
+
+    @Column(name = "ELEMENT_DEL_WEAK_ATTR_ID")
+    @ApiParam(value = "元素弱删除属性id")
+    private Long elementDelWeakAttrId;
+
+    @Column(name = "IS_OBJECT_VALID")
+    @ApiParam(value = "是否有效")
+    private Integer isObjectValid;
+
+    @Column(name = "ELEMENT_VALID_ATTR_ID")
+    @ApiParam(value = "元素有效属性id")
+    private Long elementValidAttrId;
+
     @Column(name = "IS_OBJECT_EXPORT")
     @ApiParam(value = "是否导出")
     private Integer isObjectExport;

From 068a0956dbeee70c93d9f346d1da694460ed62ec Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Wed, 11 Mar 2020 19:38:06 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/i3plus-pojo-andon/pom.xml      | 2 +-
 modules/i3plus-pojo-aps/pom.xml        | 2 +-
 modules/i3plus-pojo-base/pom.xml       | 2 +-
 modules/i3plus-pojo-form/pom.xml       | 2 +-
 modules/i3plus-pojo-hardswitch/pom.xml | 2 +-
 modules/i3plus-pojo-jobflow/pom.xml    | 2 +-
 modules/i3plus-pojo-lac/pom.xml        | 2 +-
 modules/i3plus-pojo-mes-pcn/pom.xml    | 2 +-
 modules/i3plus-pojo-mes/pom.xml        | 2 +-
 modules/i3plus-pojo-model/pom.xml      | 2 +-
 modules/i3plus-pojo-platform/pom.xml   | 2 +-
 modules/i3plus-pojo-ptl/pom.xml        | 2 +-
 modules/i3plus-pojo-report/pom.xml     | 2 +-
 modules/i3plus-pojo-softswitch/pom.xml | 2 +-
 modules/i3plus-pojo-sweb/pom.xml       | 2 +-
 modules/i3plus-pojo-wms/pom.xml        | 2 +-
 modules/i3plus-pojo-workflow/pom.xml   | 2 +-
 pom.xml                                | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml
index f8fa98e..ebd53c3 100644
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml
index 1414885..4fa7c5a 100644
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml
index d790ef1..e97c0bb 100644
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml
index c6141da..90e744d 100644
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml
index 23e5bee..0ba3645 100644
--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml
index c1e2cb9..6706323 100644
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml
index 856da5f..ffcac19 100644
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml
index 09f2c4a..e388a1d 100644
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml
index 82fdbe8..62ebe64 100644
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml
index b7b2dfc..39d9423 100644
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml
index ec9e100..e310bfd 100644
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml
index 0db7b7d..92de049 100644
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml
index bd09726..e36fcf7 100644
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml
index 4c96781..81fb02b 100644
--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml
index 2c24e41..1f622d9 100644
--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml
index 18c811c..bc41914 100644
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml
index 1171f4e..93f9732 100644
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index bca9cbb..2ffb2ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>