From 335ab2ce510a062d127026228652b7c7ad95bf37 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 20 Dec 2019 11:03:37 +0800
Subject: [PATCH 01/37] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index e9471e8..7eb002d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@@ -53,11 +53,6 @@ public class ProductOrder extends BaseOrder {
     @ApiParam(value ="指定工艺路线")
     private String specifyRouting;
 
-    @Column(name="RESYNCHRONIZE")
-    @ApiParam(value ="是否同步")
-    @FieldAnnotation(defaultValue = "true")
-    private Boolean resynchronize;
-
     @Column(name="RECALC_COUNT")
     @ApiParam(value ="是否重新计算数量")
     @FieldAnnotation(defaultValue = "true")

From 03eeacd2730511a25cc72f11163f39f4ee3a1fda 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: Fri, 20 Dec 2019 11:38:44 +0800
Subject: [PATCH 02/37] =?UTF-8?q?=E3=80=90KT-1298=20=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E3=80=90=E5=A4=84=E7=90=86=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E3=80=91=E4=BC=98=E5=8C=96=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
index 15f6d49..bb300a5 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@@ -114,6 +114,10 @@ public class WmsRoutingRule extends BaseBean {
     @ApiParam(value = "目的库位")
     private String destLocateNo;
 
+    @Column(name = "DEST_MOVE_TYPE")
+    @ApiParam(value = "目的库位")
+    private String destMoveType;
+
     public WmsRoutingRule(){}
 
 }

From b0709aca9737cf42500350adfa3723397776fb10 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Fri, 20 Dec 2019 15:05:41 +0800
Subject: [PATCH 03/37] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++--
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 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 a22ef11..75b5626 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
@@ -3565,8 +3565,8 @@ public class MesEnumUtil {
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL");
-
+        UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index ecda007..38a41e0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -131,8 +131,8 @@ public class MesPcnEnumUtil {
         PCN_MENU(170, "PCN_MENU", ""),
         PCN_MODULE(180, "PCN_MODULE", ""),
         PCN_LOGOUT(190, "PCN_LOGOUT", ""),
-        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL");
-
+        UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"),
+        PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", "");
 
         private int value;
         private String code;

From 996526ac7cd17e41fe71e20e0d5856f58aece9e6 Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Fri, 20 Dec 2019 15:11:40 +0800
Subject: [PATCH 04/37] =?UTF-8?q?=E3=80=90bug7088=20=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=BC=E5=85=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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 5097556..2e16847 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
@@ -3030,8 +3030,8 @@ public class WmsEnumUtil {
 
 
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
-
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"),
+        UTENSIL("50", "器具");
         private String value;
         private String description;
 
@@ -3057,6 +3057,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
 

From 393d3f12b84845f2cc4ca7d9a77bd66ba9adc446 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Fri, 20 Dec 2019 16:44:43 +0800
Subject: [PATCH 05/37] =?UTF-8?q?=E3=80=907055=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B3=A2=E6=AC=A1=E6=8B=A3=E8=B4=A7=E6=B5=81=E7=A8=8B=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java   | 3 +++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java     | 9 +++++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
index 48e8954..1f3d722 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@@ -33,4 +33,7 @@ public class WmsStockFifoModel {
 
     @ApiParam(value = "物料对应的存储区集合")
     Map<String,List<String>> partToZonesMap;
+
+    @ApiParam(value = "波次配料物料清单")
+    boolean collectPicking = false;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 312209b..3ac14cc 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
+    public WmsDocMovementDetails (String partNo) {
+        this.partNo = partNo;
+    }
+
+    public WmsDocMovementDetails (String partNo,String orderNo) {
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+    }
+
 }

From fc9b8629ab54471f551f60056411576e234050ca Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Fri, 20 Dec 2019 18:07:05 +0800
Subject: [PATCH 06/37] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java  | 2 +-
 .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java    | 3 +++
 2 files changed, 4 insertions(+), 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 617148e..9d8a428 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
@@ -1076,7 +1076,7 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CARRIAGE_STATUS {
         CREATE(10, "创建"),
-        PUBLISH(20, "发布"),
+        PUBLISH(20, "已发布"),
         RECEIVE(30, "承运商接收"),
         ARRIVE(40, "车辆到达"),
         INSTALL(50, "装车完成"),
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
index 48e8954..0f5c29e 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
@@ -33,4 +33,7 @@ public class WmsStockFifoModel {
 
     @ApiParam(value = "物料对应的存储区集合")
     Map<String,List<String>> partToZonesMap;
+
+    @ApiParam("默认规则")
+    private String defaultRule;
 }

From dccd104fdd887898046699215da24380fe937e26 Mon Sep 17 00:00:00 2001
From: zcg <gogogoto_dev@126.com>
Date: Sat, 21 Dec 2019 12:55:29 +0800
Subject: [PATCH 07/37] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324=EF=BC=8C?=
 =?UTF-8?q?excel=E5=AF=BC=E5=87=BA]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java |  2 +-
 .../cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java     |  8 ++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java    |  5 +++++
 .../i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java     |  4 ++++
 .../estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 13 +++++++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java |  5 +++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java     |  5 +++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 17 +++++++++++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java     | 12 ++++++++++++
 .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java |  4 ++--
 .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java    | 13 +++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java     |  8 ++++++++
 .../estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java |  9 +++++++++
 .../estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java  |  5 +++++
 .../estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java |  9 +++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java    | 16 ++++++++++++++++
 .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java |  5 +++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java |  9 +++++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java |  5 +++++
 .../estsh/i3plus/pojo/mes/model/MesDatasourceModel.java |  3 +++
 .../i3plus/pojo/mes/model/MesEquTaskPlanModel.java      |  4 ++--
 21 files changed, 156 insertions(+), 5 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 75b5626..325ed75 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
@@ -802,7 +802,7 @@ public class MesEnumUtil {
         public static String valueOfDescription(String val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].value.equals(val)) {
                     tmp = values()[i].description;
                 }
             }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
index 3f7588b..7483771 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java
@@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean {
     @Transient
     @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
     public String orderTimeEnd;
+
+    @Transient
+    @ApiParam("订单类型名称")
+    private String orderTypeName;
+
+    @Transient
+    @ApiParam("状态名称")
+    private String statusName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
index c41888b..6670060 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean {
     @Column(name = "SELF_ADDITION_VALUE")
     @ApiParam("自增列值")
     private Long selfAdditionValue;
+
+    @Transient
+    @ApiParam("操作类型名称")
+    private String operateTypeName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
index 88fb6d1..713dc90 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java
@@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean {
     @ApiParam("对象类型")
     private Integer notifyObjectType;
 
+    @Transient
+    @ApiParam("对象类型名称")
+    private String notifyObjectTypeName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
index b47ef5d..4d4d1b6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :设备作业通知配置
@@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean {
     @ApiParam("通知方式")
     private Integer notifyPattern;
 
+    @Transient
+    @ApiParam("作业类型名称")
+    private String taskTypeName;
+
+    @Transient
+    @ApiParam("通知类型名称")
+    private String notifyTypeName;
+
+    @Transient
+    @ApiParam("通知方式名称")
+    private String notifyPatternName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java
index 8f9fb0c..25545e4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.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:
@@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+    @Transient
+    @ApiParam("绑定规则名称")
+    private String bandRuleName;
+
     public int getLengthVal() {
         return this.length == null ? 0 : this.length;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
index a5ccc00..d9ead26 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean {
     @ApiParam("是否存储")
     private Integer isSave;
 
+    @Transient
+    @ApiParam("是否存储")
+    private String isSaveName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
index 7feb2a8..6db75b4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :包装规格
@@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean {
     @ApiParam("是否混包4")
     private Integer isMixed4;
 
+    @Transient
+    @ApiParam("是否混包名称")
+    private String isMixedName;
+
+    @Transient
+    @ApiParam("是否混包2名称")
+    private String isMixedName2;
+
+    @Transient
+    @ApiParam("是否混包3名称")
+    private String isMixedName3;
+
+    @Transient
+    @ApiParam("是否混包4名称")
+    private String isMixedName4;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index 216e157..65ba2cc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -88,4 +88,16 @@ public class MesPart extends BaseBean {
     @Column(name = "PRODUCT_MATCH_TYPE")
     @ApiParam("产品编码匹配类型")
     private Integer productMatchType;
+
+    @Transient
+    @ApiParam("过程编码匹配类型名称")
+    private String processMatchTypeName;
+
+    @Transient
+    @ApiParam("包装编码匹配类型")
+    private String packageMatchTypeName;
+
+    @Transient
+    @ApiParam("产品编码匹配类型")
+    private String productMatchTypeName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
index c98a0dc..9dac636 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java
@@ -40,7 +40,7 @@ public class MesPcn extends BaseBean {
     private String areaCode;
 
     @Column(name = "AREA_NAME")
-    @ApiParam("区域")
+    @ApiParam("区域名称")
     private String areaName;
 
     @Column(name = "WORK_CENTER_CODE")
@@ -48,7 +48,7 @@ public class MesPcn extends BaseBean {
     private String workCenterCode;
 
     @Column(name = "WORK_CENTER_NAME")
-    @ApiParam("工作中心")
+    @ApiParam("工作中心名称")
     private String workCenterName;
 
     @Column(name = "PCN_VERSION")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
index 7543670..2cf0ddf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value = "同步的时候是否区分工厂")
     private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
 
+    @Transient
+    @ApiParam("同步方式")
+    private String syncPatternName;
+
+    @Transient
+    @ApiParam("同步类型名称")
+    private String syncTypeName;
+
+    @Transient
+    @ApiParam(value = "同步的时候是否区分工厂")
+    private String isIgnoreOrgName;
+
     public int getIsIgnoreOrgVal() {
         return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
index b803060..08c7787 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean {
     public String areaCode;
 
     @Transient
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Transient
+    @ApiParam("计划类型")
+    private String planTypeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
     public String startTimeStart;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java
index cd7e9ee..f3a2b64 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.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:
@@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean {
     @Column(name = "RULE_CODE")
     @ApiParam("编码规则代码")
     private String ruleCode;
+
+    @Transient
+    @ApiParam("编码类型名称")
+    private String codeTypeName;
+
+    @Transient
+    @ApiParam("匹配类型名称")
+    private String matchTypeName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
index 60bea0a..338075d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.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:
@@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("检测项类型")
     private String checkItemType;
 
+    @Transient
+    @ApiParam("检测类型名称")
+    private String checkTypeName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
index a2b7c6d..ce83ab3 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.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 :工序工作单元
@@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean {
     @ApiParam("工作中心")
     private String workCenterCode;
 
+    @Transient
+    @ApiParam("流程代码名称")
+    private String routeCodeName;
+
+    @Transient
+    @ApiParam("工序代码名称")
+    private String processCodeName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index 2813d8a..89abdff 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean {
     @ApiParam(value = "绑定数量")
     private Double boundQty;
 
+    @Transient
+    @ApiParam(value = "是否可重复名称")
+    private String isRepeatName;
+
+    @Transient
+    @ApiParam(value = "是否检查名称")
+    private String isCheckName;
+
+    @Transient
+    @ApiParam(value = "是否投料配置名称")
+    private String isFeedName;
+
+    @Transient
+    @ApiParam(value = "是否绑定关键件名称")
+    private String isBindKeyName;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
index 5bd428a..7fd8998 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java
@@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean {
     @ApiParam(value = "父节点", access = "父节点", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
+
+    @Transient
+    @ApiParam("工位类型名称")
+    private String workCellTypeName;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java
index db71d8e..0baae07 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.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 :工作单元参数
@@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean {
     @Column(name = "PARAM_MODEL")
     @ApiParam("参数模式")
     private Integer paramModel;
+
+    @Transient
+    @ApiParam("参数类型名称")
+    private String paramTypeName;
+
+    @Transient
+    @ApiParam("参数模式名称")
+    private String paramModelName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java
index dd0909a..68d7afa 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.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 :工作单元参数配置
@@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean {
     @Column(name = "IS_CHECK")
     @ApiParam("是否必须校验")
     private Integer isCheck;
+
+    @Transient
+    @ApiParam("是否必须校验名称")
+    private String isCheckName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java
index ddfb036..2900b7f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesDatasourceModel.java
@@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable {
     @ApiParam("数据库名称")
     private String dsDbName;
 
+    @ApiParam("数据源类型名称")
+    private String dsTypeName;
+
     public MesDatasourceModel() {
 
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
index d3ece07..b8e6909 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java
@@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable {
     @ApiParam("修改日期")
     public String modifyDatetime;
 
-    @ApiParam("作业类型")
+    @ApiParam("作业类型名称")
     private String taskTypeName;
 
-    @ApiParam("设备类别")
+    @ApiParam("设备类别名称")
     private String equipmentCategoryName;
 
 

From 9c2dcba09d12c5fa5efb86729e19afe6297f58b5 Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Sat, 21 Dec 2019 14:38:42 +0800
Subject: [PATCH 08/37] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=8D=95=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
index 5357a32..ca012e6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
@@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("回执单地址")
     private String pathUrl;
+
+    @ApiParam("关联单号")
+    private String refOrderNo;
 }

From 4bd0aa8d57eeac4afe802a71ec78c12b5b22dbd2 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Mon, 23 Dec 2019 10:42:31 +0800
Subject: [PATCH 09/37] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE-=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=20=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java       | 1 +
 1 file changed, 1 insertion(+)

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 6c68ff3..bb2b334 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
@@ -1858,6 +1858,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigCode(), "configCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsConfig.getName(), "name", result);
         DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigType(), "configType", result);
         DdlPreparedPack.getStringEqualPack(wmsConfig.getConfigValue(), "configValue", result);
         DdlPreparedPack.getNumEqualPack(wmsConfig.getConfigValueType(), "configValueType", result);

From c7d494c31e69d1d2268c61178923251849c43994 Mon Sep 17 00:00:00 2001
From: zcg <gogogoto_dev@126.com>
Date: Mon, 23 Dec 2019 14:32:00 +0800
Subject: [PATCH 10/37] =?UTF-8?q?[=E9=9C=80=E6=B1=82=EF=BC=9A1324=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BAexcel]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
index 4a3ace4..dc37069 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java
@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Author: Wynne.Lu
@@ -51,4 +52,8 @@ public class MesWcCheck extends BaseBean {
     @ApiParam("检查标准")
     private String standard;
 
+    @Transient
+    @ApiParam("检查类型名称")
+    private String checkTypeName;
+
 }

From d5c1f7a7a3f99c63a011dcfdeaab35767a3b8a62 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: Tue, 24 Dec 2019 11:20:02 +0800
Subject: [PATCH 11/37] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=A8=A1=E6=9D=BF=E8=BD=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20=E8=BD=AF=E9=80=82=E9=85=8Dlist=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java   |  3 ++-
 .../i3plus/pojo/platform/bean/SysLocaleResource.java  |  6 ++++++
 .../i3plus/pojo/softswitch/bean/BsSuitCaseParam.java  | 19 ++++++++++++++++++-
 .../pojo/softswitch/bean/BsSuitRecordParam.java       |  7 +++----
 .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java    |  1 +
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
index b4f4a10..e1d4eae 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
@@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATABASE_OPERATE_TYPE{
         READ(1,"读取"),
-        WRITE(2,"写入");
+        WRITE(2,"写入"),
+        BATCH_WRITE(3,"批量写入");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
index 01fd23c..5555d83 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
@@ -70,6 +70,12 @@ public class SysLocaleResource  extends BaseBean {
     @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp")
     @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false)
     private Integer softType;
+    public int getSoftTypeVal(){
+        if(softType==null){
+            return CommonEnumUtil.SOFT_TYPE.IMPP.getValue();
+        }
+        return softType.intValue();
+    }
 
     //系统自带需要有初始化表，只能修改value，无法删除。
     @Column(name="is_system")
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
index 6257a7b..03ab889 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 适配器出入参
@@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数名称)")
     private String paramName;
 
+    @Column(name = "PARENT_PARAM_Id")
+    @ApiParam(value = "上级参数id")
+    private String parentParamId;
+
     @Column(name = "PARENT_PARAM_NAME")
     @ApiParam(value = "上级参数名称)")
     private String parentParamName;
@@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean {
 
     @Transient
     @ApiParam(value = "参数值")
-    private String paramValue;
+    private Object paramValue;
+
+    public String getParamValueStr() {
+        if (paramValue == null) {
+            return null;
+        }
+        return paramValue.toString();
+    }
+
+    @Transient
+    @ApiParam(value = "子级参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
 
 }
 
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
index e85deb6..c1d94dc 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java
@@ -7,10 +7,8 @@ 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.Index;
-import javax.persistence.Table;
+
+import javax.persistence.*;
 
 /**
  * @Description : 适配记录参数
@@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean {
     @ApiParam(value = "参数名称")
     private String paramName;
 
+    @Lob
     @Column(name = "PARAM_VAL")
     @ApiParam(value = "参数值")
     private String paramVal;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
index e5063c6..b1a9344 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
@@ -338,6 +338,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
+        DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true);
 
         ddlPackBean.setOrderByStr(bsSuitRecord.orderBy());
 

From 894dbed46c08d67c0422b072ae47fef30cc9047a Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Tue, 24 Dec 2019 11:26:14 +0800
Subject: [PATCH 12/37] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
index 79c7f34..65e800d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="COMMIT_DATE")
     @ApiParam("提交日期")
     public String commitDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value = "BOM生效日期")
+    @Column(name = "EFF_START_TIME")
+    private String effStartTime;
 }

From 34e4d837afa629fb220415fd71f0e05acf19d731 Mon Sep 17 00:00:00 2001
From: qianhs <huasheng.qian@estsh.com>
Date: Tue, 24 Dec 2019 18:15:36 +0800
Subject: [PATCH 13/37] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
index c4550f6..086e420 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -28,7 +29,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_CS_DETAILS")
+@Table(name = "WMS_DOC_CS_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "VENDOR_NO"),
+        @Index(columnList = "SN")
+})
 @Api("盘点单冻结信息")
 public class WmsCSOrderDetails extends BaseBean {
     private static final long serialVersionUID = 1054153436116196360L;

From 20f6961dafbf8f42893e9c10c90d442fccc1b283 Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Tue, 24 Dec 2019 19:56:11 +0800
Subject: [PATCH 14/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1327J?=
 =?UTF-8?q?IT=E7=94=9F=E4=BA=A7=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 35 ++++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java |  5 ++++
 .../i3plus/pojo/mes/pcn/model/QueueOrderModel.java |  8 +++++
 .../i3plus/pojo/mes/bean/MesWorkCellPoint.java     |  5 ++++
 4 files changed, 53 insertions(+)

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 a22ef11..fb1bf3e 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
@@ -13,6 +13,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
 
+    /**
+     * 是否解析
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_IS_PARSE {
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        PLC_IS_PARSE(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 CALENDAR_TYPE {
         DAY(10, "日"),
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
index dd2c7da..5a4c0f1 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java
@@ -27,6 +27,11 @@ import javax.persistence.Table;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
index 19694f1..b7f831b 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueOrderModel.java
@@ -40,6 +40,14 @@ public class QueueOrderModel implements Serializable {
     @Transient
     @ApiParam("显示颜色")
     private String color;
+    @ApiParam("工厂代码")
+    private String organizeCode;
+    @ApiParam("展示行数")
+    private Integer prodNum;
+    @ApiParam("产线")
+    private String workCenterCode;
+    @ApiParam("工位")
+    private String workCellCode;
 
     public QueueOrderModel() {
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
index 7343feb..0abb9dd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java
@@ -31,6 +31,11 @@ import java.util.List;
 @Table(name = "MES_WORK_CELL_POINT")
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
     @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

From 04b02c084b893fd960fa4edf87c6c97c30bd9749 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Wed, 25 Dec 2019 09:35:14 +0800
Subject: [PATCH 15/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=98=E7=89=B9?=
 =?UTF-8?q?=E5=9B=BE=E5=8F=AF=E6=8B=96=E6=8B=BD=E8=B5=84=E6=BA=90=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/{ResourceLodaRequest.java => ResourceLoadRequest.java} (95%)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java
similarity index 95%
rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java
rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java
index c35f89e..b7bcac0 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java
@@ -10,7 +10,7 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-public class ResourceLodaRequest {
+public class ResourceLoadRequest {
     private ApsEnumUtil.RESOURCE_LOAD_SPAN span;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)

From 734b54d1b25e232ffb80a469109ab68439c8ecfc Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 25 Dec 2019 11:33:15 +0800
Subject: [PATCH 16/37] =?UTF-8?q?=E3=80=90=20=E9=A2=86=E6=96=99=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?=
 =?UTF-8?q?=E3=80=91bug7024?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../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 a5bf1b0..285778b 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
@@ -239,7 +239,7 @@ public class WmsEnumUtil {
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
         CLOSED(40, "CLOSED", "已关闭"),
         CANCELLED(50, "CANCELLED", "已取消"),
-        FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
+        BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成");
 
         private int value;
         private String code;

From e5452056b619c3f23f16f89321d1bc3cd013923c Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Wed, 25 Dec 2019 15:41:41 +0800
Subject: [PATCH 17/37] =?UTF-8?q?=E3=80=90bug7083=20KT=E5=99=A8=E5=85=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 285778b..1e07422 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
@@ -701,7 +701,8 @@ public class WmsEnumUtil {
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
         KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
-        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
+        UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
 
         private int value;
         private String code;
@@ -885,7 +886,8 @@ public class WmsEnumUtil {
         VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
         VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
+        UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
         private String value;
         private String description;
 

From f857a4065d78a7ce6df02d63add60f5091f026af Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Wed, 25 Dec 2019 17:01:15 +0800
Subject: [PATCH 18/37] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1327J?=
 =?UTF-8?q?IT=E7=94=9F=E4=BA=A7=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java  | 3 ++-
 .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 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 11cf7e3..2a2e426 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
@@ -2895,7 +2895,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;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 38a41e0..d6154b5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil {
         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;

From cfa465817f3c3e8a2e4b77bdfa6c7f56709233ba Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Thu, 26 Dec 2019 09:43:31 +0800
Subject: [PATCH 19/37] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bb2b334..6aa16d4 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
@@ -2427,7 +2427,7 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
 
-        DdlPreparedPack.getStringLeftLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingCode(), "routingCode", result);
         DdlPreparedPack.getStringLikerPack(wmsRouting.getRoutingName(), "routingName", result);
         // DdlPreparedPack.getInPack(wmsRouting.getIsValid(), "isValid", result);
         DdlPreparedPack.getInPack(wmsRouting.getIsDeleted(), "isDeleted", result);

From 019cb91a4c285704eeb197f4ae1197202429107d Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Thu, 26 Dec 2019 09:51:41 +0800
Subject: [PATCH 20/37] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1329?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 111 +++++++--------------
 .../i3plus/pojo/mes/bean/MesButtonStatus.java      |  18 +---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  23 +++++
 3 files changed, 61 insertions(+), 91 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 2a2e426..9c4d8f6 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
@@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+    /**
+     * JIS发运模式类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_JIS_PATTERN_TYPE {
+        ONE(10, "一套发运"),
+        TRUE(20, "多套发运"),
+        FALSE(30, "单产品多套发运");
+
+        private int value;
+        private String description;
+
+        MES_JIS_PATTERN_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;
+        }
+    }
 
     /**
      * 是否解析
@@ -2386,82 +2421,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * mes按钮状态配置 判断符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_JUDGE_FLAG {
-
-        EQUAL("=", "等于"),
-        NOT_EQUAL("!=", "不等于"),
-        GREATER_THAN(">", "大于"),
-        NOT_LESS_THAN(">=", "大于大于"),
-        LESS_THAN("<", "小于"),
-        NOT_GREATER_THAN("<=", "小于等于");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_JUDGE_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * mes按钮状态配置 逻辑符号
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_BUTTON_STATUS_LOGIC_FLAG {
-
-        AND("&&", "逻辑与"),
-        OR("||", "逻辑或");
-
-        private String value;
-        private String description;
-
-        MES_BUTTON_STATUS_LOGIC_FLAG(String value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public String getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(val)) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * MesWorkOrder实体对应的approvalStatus值  审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
index 5c7d7ae..1b7c85c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java
@@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean {
     @ApiParam("实体类名称")
     private String ClassName;
 
-    @Column(name = "STATUS_FIELD")
-    @ApiParam("状态字段")
-    private String statusField;
-
-    @Column(name = "JUDGE_FLAG")
-    @ApiParam("判断符合")
-    private String judgeFlag;
-
-    @Column(name = "STATUS_VALUE")
-    @ApiParam("状态值")
-    private String statusValue;
-
-    @Column(name = "LOGIC_FLAG")
-    @ApiParam("逻辑符合")
-    private String logicFlag;
+    @Column(name = "APPEND_HQL")
+    @ApiParam("拼接HQL")
+    private String appendHql;
 
     @Column(name = "STATUS_DESC")
     @ApiParam("描述")
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 b9eb3ec..8d904cf 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
@@ -2097,4 +2097,27 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * JIS发运模式
+     * @param jisPattern
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
+        if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
+            DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
+        }
+        if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
+            DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
+        }
+        return packBean;
+    }
 }

From fb8b07b2274ec745f1a67abb11cabb03ca582ad2 Mon Sep 17 00:00:00 2001
From: "jhforever.wang@estsh.com" <jhforever.wang@estsh.com>
Date: Thu, 26 Dec 2019 10:01:03 +0800
Subject: [PATCH 21/37] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1329?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 23 +---------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

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 8d904cf..22f0c48 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
@@ -2098,26 +2098,5 @@ public class MesHqlPack {
         return packBean;
     }
 
-    /**
-     * JIS发运模式
-     * @param jisPattern
-     * @param organizeCode
-     * @return
-     */
-    public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode);
-        if (!StringUtils.isEmpty(jisPattern.getPatternNo())) {
-            DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean);
-        }
-        if (!StringUtils.isEmpty(jisPattern.getTopNo())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean);
-        }
-        if (!StringUtils.isEmpty(jisPattern.getHandleNo())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean);
-        }
-        if (!StringUtils.isEmpty(jisPattern.getPatternType())) {
-            DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean);
-        }
-        return packBean;
-    }
+
 }

From 5ea55135dc7d211e12e3893a0784e59b39d54a4f Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Thu, 26 Dec 2019 10:12:29 +0800
Subject: [PATCH 22/37] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java       | 4 ++++
 1 file changed, 4 insertions(+)

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 892693a..422cf79 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
@@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否寄售 1-是 2-否")
     private Integer consignation;
 
+    @Transient
+    @ApiParam(value = "是否最早批次")
+    public String isFifo;
+
     public WmsStockSn() {
     }
 

From 629e2f82706ac469c96ea9e676336767b3b72c01 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 26 Dec 2019 11:11:24 +0800
Subject: [PATCH 23/37] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=88=96=E4=BF=9D=E5=AD=98=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
new file mode 100644
index 0000000..3da5e29
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String field;
+        // 排序类型，1为升序，0为降序
+        private Boolean ascending;
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+
+        public Boolean getAscending() {
+            return ascending;
+        }
+
+        public void setAscending(Boolean ascending) {
+            this.ascending = ascending;
+        }
+    }
+    private String filter;
+    private List<SortData> sorts;
+}

From b5d50af25077c49dd93dfed78c142530c71975a0 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: Thu, 26 Dec 2019 11:34:49 +0800
Subject: [PATCH 24/37] =?UTF-8?q?=E3=80=90KT-1284=20=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
index c37935e..4a71d08 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java
@@ -8,10 +8,7 @@ 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 javax.persistence.UniqueConstraint;
+import javax.persistence.*;
 
 /**
  * @Description : 附件表
@@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
     private String refType;
+
+    @Transient
+    @ApiParam("预览前缀")
+    public String previewPrefix;
 }
\ No newline at end of file

From 32c9bbbe85628523153788ef42aaba537dfa012e Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Thu, 26 Dec 2019 11:39:33 +0800
Subject: [PATCH 25/37] =?UTF-8?q?task=20`1308`=204=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java   | 15 +++++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesProductData.java     |  2 ++
 .../mes/repositorymongo/MesProductDataRepository.java     | 15 +++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
new file mode 100644
index 0000000..e4d90a6
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java
@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface UseMongoDb {
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
index 2b2d84a..602bb21 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java
@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,6 +34,7 @@ import javax.persistence.Transient;
         @Index(columnList = "OBJECT_CODE"),
         @Index(columnList = "MODIFY_DATE_TIME")
 })
+//@UseMongoDb
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
new file mode 100644
index 0000000..2f615de
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java
@@ -0,0 +1,15 @@
+//package cn.estsh.i3plus.pojo.mes.repositorymongo;
+//
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
+//import org.springframework.stereotype.Repository;
+//
+///**
+// * @Author: Wynne.Lu
+// * @CreateDate: 2019/12/25 1:30 下午
+// * @Description:
+// **/
+//@Repository
+//public interface MesProductDataRepository extends BaseMongoRepository<MesProductData, Long> {
+//}

From 1f8885779f840c204858b35892b3a6aa958e3f45 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Thu, 26 Dec 2019 12:50:53 +0800
Subject: [PATCH 26/37] =?UTF-8?q?=E3=80=906714=20FIFO=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=8F=98=E5=8C=96=E6=97=B6=E9=9C=80=E8=A6=81=E6=9C=89=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8A=A0=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E9=80=9A=E7=94=A8=E5=8F=98=E9=87=8F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=84=E4=BB=B6=E4=BF=9D=E5=AD=98=E4=B8=8A=E6=AC=A1?=
 =?UTF-8?q?=E7=9A=84FIFO=E4=BF=A1=E6=81=AF=E3=80=82=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 3ac14cc..813538d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -208,7 +208,11 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam("优先级")
-    private String priority;
+    private Integer priority;
+
+    @Transient
+    @ApiParam("优先级描述")
+    private String priorityStr;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -272,8 +276,10 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
-    public WmsDocMovementDetails (String partNo) {
+    public WmsDocMovementDetails (String partNo,Integer priority,String orderNo) {
         this.partNo = partNo;
+        this.priority = priority;
+        this.orderNo = orderNo;
     }
 
     public WmsDocMovementDetails (String partNo,String orderNo) {

From 7f69df95df33854d25d829f0eec8f2921359bced Mon Sep 17 00:00:00 2001
From: qianhs <huasheng.qian@estsh.com>
Date: Thu, 26 Dec 2019 13:53:17 +0800
Subject: [PATCH 27/37] =?UTF-8?q?=E3=80=90=E5=AD=98=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9=E2=80=9C?=
 =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E6=9D=A1=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E2=80=9D=E3=80=91=E3=80=90bug7060=09?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java   | 17 +++++++++++++++++
 1 file changed, 17 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 14c0486..c08e1eb 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
@@ -181,6 +181,23 @@ public class WmsCSFactTrans extends BaseBean {
         this.srcZoneNo = srcZoneNo;
         this.srcWhNo = srcWhNo;
     }
+
+    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,String vendorNo) {
+        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;
+        this.vendorNo= vendorNo;
+    }
     public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) {
         this.partNo=partNo;
         this.partNameRdd = partNameRdd;

From d34ba5e11428438779b334af054004844d80b117 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Thu, 26 Dec 2019 16:20:56 +0800
Subject: [PATCH 28/37] =?UTF-8?q?=E3=80=90=20=E7=BB=8F=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=85=AD=E5=90=88=E4=B8=80=E5=85=81=E8=AE=B8=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90=E6=88=96=E7=9B=AE=E6=A0=87=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E7=9A=84=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E4=BD=86=E6=98=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=87=E6=9D=A5=E6=BA=90=E6=8B=86=E5=88=86=E6=88=90?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=E5=8D=95=E6=8D=AE=20=E3=80=91bug706?=
 =?UTF-8?q?8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 813538d..6d25a62 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -210,9 +210,6 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("优先级")
     private Integer priority;
 
-    @Transient
-    @ApiParam("优先级描述")
-    private String priorityStr;
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;

From 032bd61b878d974e643a5cc653792b8f99a4c23d 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: Thu, 26 Dec 2019 16:32:59 +0800
Subject: [PATCH 29/37] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=AD=89=E4=BB=BD=E6=8B=86=E5=88=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD+=20=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=E5=86=99?=
 =?UTF-8?q?=E5=85=A5=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E7=9A=84?=
 =?UTF-8?q?=E8=A1=8C=E5=8F=B7=E5=86=99=E5=85=A5=E8=A7=84=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=EF=BC=8C=E4=BC=98=E5=8C=96=E6=80=A7=E8=83=BD+=20?=
 =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F=E4=BA=A4=E6=98=93=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=9A=E6=9C=89=E6=9D=A1=E7=A0=81=E5=B0=B1=E6=89=A3=E5=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E5=8A=A8=E5=8D=95=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E5=A4=84=E7=90=86=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=AE=8C=E6=AF=95=E6=89=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E5=B7=B2=E5=A4=84=E7=90=86=E5=B9=B6=E4=BC=A0=E7=BB=99?=
 =?UTF-8?q?MOVE=5FTO=5FERP=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F+=20?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=BA=93=E5=AD=98=E6=98=8E=E7=BB=86=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=88=97=E2=80=9C=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E9=87=8F=E2=80=9D=EF=BC=88=E5=BE=85=E8=BF=87?=
 =?UTF-8?q?=E8=B4=A6=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java |  4 ++++
 .../estsh/i3plus/pojo/wms/bean/WmsStockQuan.java   | 11 ++++++++---
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 22 ++++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 8e6d27e..f1bf9a0 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -62,6 +62,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "处理数量", example = "0")
     public Double transQty;
 
+    @Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)")
+    @ApiParam(value = "已处理数量", example = "0")
+    public Double handledQty;
+
     public Double getTransQty() {
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 811158c..837cbf2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -124,14 +124,18 @@ public class WmsStockQuan extends BaseBean {
     private String prodCfgTypeName;
 
     @Transient
-    @ApiParam(value = "箱数", example = "-1")
+    @ApiParam(value = "箱数")
     private Integer boxQty;
 
     @Transient
-    @ApiParam(value = "零件数", example = "-1")
+    @ApiParam(value = "零件数")
     private Double partQty;
 
     @Transient
+    @ApiParam(value = "处理中数量")
+    private Double transQty;
+
+    @Transient
     @ApiParam(value = "ERP库存地")
     private String areaNo;
 
@@ -211,7 +215,7 @@ public class WmsStockQuan extends BaseBean {
 
     public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
                         Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
-                        Double consignQty, Double lockQty,Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
+                        Double consignQty, Double lockQty, Double sumQty, String prodCfgTypeCode, String prodCfgTypeName, Double scrapQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
@@ -281,5 +285,6 @@ public class WmsStockQuan extends BaseBean {
         this.consignQty = consignQty;
         this.lockQty = lockQty;
         this.scrapQty = scrapQty;
+        this.totalQty = qty + failQty + holdQty + qcQty + rinQty + freezeQty + consignQty + lockQty + scrapQty;
     }
 }
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 bb2b334..73bfda6 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
@@ -229,13 +229,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getContainerNo(), "containerNo", result);
-        if (wmsPOMaster.getPriorRC()!=null&&wmsPOMaster.getPriorRC()==WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()){
+        if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
             ArrayList<Integer> numList = new ArrayList<>();
             numList.add(0);
             numList.add(wmsPOMaster.getPriorRC());
             numList.add(null);
             DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result);
-        }else{
+        } else {
             DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result);
         }
 
@@ -923,8 +923,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
-        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo",result);
-        DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(),"qualityDate",result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getQualityDate(), "qualityDate", result);
         if (wmsStockSn.getSnStatus() == null) {
             DdlPreparedPack.getInPackArray(new Integer[]{
                     WmsEnumUtil.STOCK_SN_STATUS.QUALITY_CONTROL.getValue(), WmsEnumUtil.STOCK_SN_STATUS.PRE_INSTOCK.getValue(),
@@ -1613,7 +1613,9 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
+        DdlPreparedPack.getOrderByPack(
+                new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
+                new String[]{"sn", "createDatetime"}, result);
         return result;
     }
 
@@ -2007,8 +2009,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
-        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(),"packageNo", result);
-        DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringNotNullPack("locateNo", result);
         result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
 
@@ -2618,15 +2620,15 @@ public class WmsHqlPack {
      * @param wmsPullTaskMaster
      * @return
      */
-    public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
+    public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster, String statusList) {
         DdlPackBean result = new DdlPackBean();
         List<String> stringList = null;
         List<Integer> integerList = null;
         //List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
-        if(StringUtils.isNotBlank(statusList)){
+        if (StringUtils.isNotBlank(statusList)) {
             stringList = Arrays.asList(statusList.split(","));
             integerList = new ArrayList<>();
-            for(String sl : stringList){
+            for (String sl : stringList) {
                 integerList.add(Integer.valueOf(sl));
             }
         }

From 1d9ab80ae812e8188ec6bc65cbb5c27c4056b99e 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: Thu, 26 Dec 2019 16:48:43 +0800
Subject: [PATCH 30/37] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=99=A8=20-=20=E6=89=B9=E9=87=8F=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java   | 5 ++---
 .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java   | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
index e19e6e5..df7fad0 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @Description : 模块表单枚举类
@@ -1973,7 +1972,7 @@ public class BlockFormEnumUtil {
         }
 
         private String getJDBCUrlMySQL(String database,String host,Integer port){
-            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
+            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8&rewriteBatchedStatements=true";
         }
 
         private String getJDBCUrlOracle(String database,String host,Integer port){
@@ -1985,7 +1984,7 @@ public class BlockFormEnumUtil {
         }
 
         private String getJDBCUrlSQLServer(String database,String host,Integer port){
-            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database;
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+"?rewriteBatchedStatements=true";
         }
     }
 
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
index 03ab889..7a8856c 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -68,6 +69,7 @@ public class BsSuitCaseParam extends BaseBean {
     @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE.class)
     private Integer paramValTypeId;
 
+    @JsonIgnore
     public int getParamValTypeIdVal() {
         return paramValTypeId == null ? NumberUtils.INTEGER_MINUS_ONE : paramValTypeId.intValue();
     }
@@ -88,6 +90,7 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数值")
     private Object paramValue;
 
+    @JsonIgnore
     public String getParamValueStr() {
         if (paramValue == null) {
             return null;

From 20ccf65c5c391dec97f3d556a4882eae6902b9bb 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: Thu, 26 Dec 2019 17:13:48 +0800
Subject: [PATCH 31/37] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/LacEnumUtil.java     | 47 +++++++++++++++++-----
 .../i3plus/pojo/lac/bean/LacCommandStackStep.java  |  4 ++
 .../pojo/lac/bean/LacCommandStackStepTask.java     | 10 ++---
 .../i3plus/pojo/lac/bean/LacSuitTaskParam.java     |  1 +
 .../estsh/i3plus/pojo/lac/bean/LacTaskCheck.java   |  8 ++++
 .../pojo/model/lac/LacCommandStackModel.java       |  9 ++++-
 pom.xml                                            |  3 +-
 7 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
index dfb4079..a1db447 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java
@@ -223,7 +223,8 @@ public class LacEnumUtil {
     public enum PARAM_VALUE_TYPE{
         INTEGER(1,"整数"),
         STRING(2,"字符串"),
-        FLOAT(3,"浮点");
+        FLOAT(3,"浮点"),
+        ORGIN(99,"原始数据");
 
         private int value;
         private String description;
@@ -347,15 +348,17 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOGICAL_OPERATOR{
-        OR(10,"或"),
-        AND(20,"与");
+        OR(10,"或","||"),
+        AND(20,"与","&&");
 
         private int value;
         private String description;
+        private String operator;
 
-        LOGICAL_OPERATOR(int value, String description) {
+        LOGICAL_OPERATOR(int value, String description, String operator) {
             this.value = value;
             this.description = description;
+            this.operator = operator;
         }
 
         public int getValue() {
@@ -376,6 +379,16 @@ public class LacEnumUtil {
             return tmp;
         }
 
+        public static String valueOfOperator(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].operator;
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
@@ -383,19 +396,21 @@ public class LacEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RELATIONAL_OPERATOR{
-        GT(10,">"),
-        LT(20,"<"),
-        EQ(20,"=="),
-        NE(20,"!="),
-        GE(20,">="),
-        LE(20,"<=");
+        GT(10,"大于",">"),
+        LT(20,"小于","<"),
+        EQ(30,"等于","=="),
+        NE(40,"不等于","!="),
+        GE(50,"大于等于",">="),
+        LE(60,"小于等于","<=");
 
         private int value;
         private String description;
+        private String operator;
 
-        RELATIONAL_OPERATOR(int value, String description) {
+        RELATIONAL_OPERATOR(int value, String description,String operator) {
             this.value = value;
             this.description = description;
+            this.operator = operator;
         }
 
         public int getValue() {
@@ -416,6 +431,16 @@ public class LacEnumUtil {
             return tmp;
         }
 
+        public static RELATIONAL_OPERATOR valueOf(int val) {
+            RELATIONAL_OPERATOR tmp = EQ;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
     }
 
     /**
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
index e9cacb4..1caf947 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStep.java
@@ -9,6 +9,7 @@ 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;
@@ -84,6 +85,9 @@ public class LacCommandStackStep extends BaseBean {
     @ApiParam(value ="步骤任务列表")
     private List<LacCommandStackStepTask> stepTaskList;
 
+    @Transient
+    @ApiParam(value ="步骤任务检查")
+    private List<LacTaskCheck> taskCheckList;
 
     public LacCommandStackStep() {
     }
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
index 50433f4..63154b6 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackStepTask.java
@@ -85,10 +85,10 @@ public class LacCommandStackStepTask extends BaseBean {
 //    @Column(name="STEP_NAME_RDD")
 //    @ApiParam(value ="步骤名称")
 //    private String stepNameRdd;
-//
-//    @Column(name="STEP_CODE_RDD")
-//    @ApiParam(value ="步骤代码")
-//    private String stepCodeRdd;
+
+    @Column(name="STEP_CODE_RDD")
+    @ApiParam(value ="步骤代码")
+    private String stepCodeRdd;
 
     @Column(name="TASK_ID")
     @ApiParam(value ="任务ID")
@@ -99,7 +99,7 @@ public class LacCommandStackStepTask extends BaseBean {
     @ApiParam(value ="步骤名称")
     private String taskNameRdd;
 
-    @Column(name="STEP_CODE_RDD")
+    @Column(name="TASK_CODE_RDD")
     @ApiParam(value ="任务代码")
     private String taskCodeRdd;
 
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
index 49e34bf..697b68e 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitTaskParam.java
@@ -82,6 +82,7 @@ public class LacSuitTaskParam extends BaseBean {
 
     @Column(name="PARAM_VALUE_TYPE")
     @ApiParam(value ="参数值类型")
+    @AnnoOutputColumn(refClass = LacEnumUtil.PARAM_VALUE_TYPE.class)
     private Integer paramValueType;
 
     @Column(name="PARAM_DEFAULT_VALUE")
diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
index 5c14b36..dd50d24 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacTaskCheck.java
@@ -15,6 +15,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description :
@@ -97,4 +98,11 @@ public class LacTaskCheck extends BaseBean {
     @ApiParam(value ="目标步骤ID")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long targetStepId;
+
+    @Column(name="TARGET_STEP_NAME_RDD")
+    @ApiParam(value ="目标步骤名称")
+    private String targetStepNameRdd;
+
+    @Transient
+    private String value;
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
index 0574386..ddcfd44 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
 import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
+import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
 import lombok.Data;
 import org.slf4j.LoggerFactory;
 
@@ -55,9 +56,13 @@ public class LacCommandStackModel {
         this.recordId = commandStackRecord.getId();
     }
 
-    public Object getTaskRequestParam(String taskCode){
+    public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
         for (Task task : this.getRequest().getTaskList()) {
-            if(task.getCode().equals(taskCode)){
+            // 步骤代码为空时匹配所有任务参数
+            if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
+                return task.getParamList();
+            } else if (task.getStepCode() != null && task.getStepCode().equals(stepTask.getStepCodeRdd())
+                    && task.getCode().equals(stepTask.getTaskCodeRdd())) {
                 return task.getParamList();
             }
         }
diff --git a/pom.xml b/pom.xml
index 9caeb95..5918acc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,8 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>    <modules>
+    <version>1.0-DEV-SNAPSHOT</version>
+    <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>
         <module>modules/i3plus-pojo-model</module>

From 9e47c4ac5af0f221545032199c2e4512dd3bc3fb Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Fri, 27 Dec 2019 10:00:30 +0800
Subject: [PATCH 32/37] =?UTF-8?q?=E3=80=90#1332=20=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=B9=E5=99=A8=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0=E5=A2=9E=E6=9C=9F=E9=99=90?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=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/WmsContainerType.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java
index def0261..3c51124 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsContainerType.java
@@ -47,4 +47,8 @@ public class WmsContainerType extends BaseBean {
     @ApiParam(value = "是否回收")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isRecycle;
+
+    @Column(name = "LIMIT_UOM")
+    @ApiParam(value = "期限单位")
+    private String limitUom;
 }

From 8b1ae09885cad64eaffee168a6744fccb1b82289 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 27 Dec 2019 14:01:53 +0800
Subject: [PATCH 33/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/aps/model/GanttEventModel.java     | 31 ++++++++++++++++
 .../cn/estsh/i3plus/pojo/aps/model/GanttPager.java | 43 ----------------------
 2 files changed, 31 insertions(+), 43 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
 delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
new file mode 100644
index 0000000..05bf634
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventModel.java
@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
+import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttEventModel {
+    private Long[] resourceIds;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date begin;
+    @JsonSerialize(using = CustomDateSerializer.class)
+    @JsonDeserialize(using = CustomDateDeserializer.class)
+    private Date end;
+}
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
deleted file mode 100644
index 3da5e29..0000000
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.model;
-
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import io.swagger.annotations.Api;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Description : 甘特图分页查询参数
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-11-22
- * @Modify:
- **/
-@Data
-@Api("甘特图分页查询参数")
-public class GanttPager extends Pager {
-    public static class SortData {
-        // 排序对象
-        private String field;
-        // 排序类型，1为升序，0为降序
-        private Boolean ascending;
-
-        public String getField() {
-            return field;
-        }
-
-        public void setField(String field) {
-            this.field = field;
-        }
-
-        public Boolean getAscending() {
-            return ascending;
-        }
-
-        public void setAscending(Boolean ascending) {
-            this.ascending = ascending;
-        }
-    }
-    private String filter;
-    private List<SortData> sorts;
-}

From d94ccd5ac57e2da962a5251f1b70dbd6e5e8bace 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: Fri, 27 Dec 2019 14:48:07 +0800
Subject: [PATCH 34/37] =?UTF-8?q?=E4=B8=8B=E7=BA=BF=E6=89=A3=E5=87=8F?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6BUG?=
 =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E5=8F=8C=E7=B2=BE=E5=BA=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=95=B0=E5=80=BC=E6=97=B6=E5=BA=94=E8=AF=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BAgetHandledQtyVal?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index f1bf9a0..3311b77 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -66,10 +66,6 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam(value = "已处理数量", example = "0")
     public Double handledQty;
 
-    public Double getTransQty() {
-        return this.transQty == null ? 0 : this.transQty.doubleValue();
-    }
-
     @Column(name = "REJECT_QTY", columnDefinition = "decimal(18,8)")
     @ApiParam(value = "不合格处理数量", example = "0")
     public Double rejectQty;
@@ -202,17 +198,6 @@ public class WmsMoveDetails extends BaseBean {
         return isSnapshot == null ? 0 : isSnapshot.intValue();
     }
 
-
-   /* @JSONField(name="fPartNo")
-    public String getfPartNo() {
-        return fPartNo;
-    }
-
-    @JSONField(name="fPartName")
-    public String getfPartName() {
-        return fPartName;
-    }*/
-
     public WmsMoveDetails() {
     }
 
@@ -293,4 +278,12 @@ public class WmsMoveDetails extends BaseBean {
         this.modifyDatetime = modifyDatetime;
         this.modifyUser = modifyUser;
     }
+
+    public Double getTransQty() {
+        return this.transQty == null ? 0 : this.transQty.doubleValue();
+    }
+    public Double getHandledQtyVal() {
+        return this.handledQty == null ? 0 : this.handledQty.doubleValue();
+    }
+
 }

From e962a1d22ae75da43ab2a4bdb1e8e2f26e9f5777 Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Fri, 27 Dec 2019 15:24:57 +0800
Subject: [PATCH 35/37] =?UTF-8?q?=E3=80=90#1331=20KT-=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=91=E2=80=9C=E6=A0=87=E5=87=86=E5=8C=85=E8=A3=85=E2=80=9D?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E6=A0=87=E5=8C=85=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index be7ffe3..370667a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -90,7 +90,7 @@ public class WmsPart extends BaseBean {
     private Double pu2su;
 
     @Column(name = "SNP", columnDefinition = "decimal(18,8)")
-    @ApiParam(value = "标准包装", example = "1")
+    @ApiParam(value = "标包", example = "1")
     private Double snp;
 
     @ColumnDefault("2")

From b175de463566ffa50b11d489a3a967801fb656a7 Mon Sep 17 00:00:00 2001
From: E <1565181015@qq.com>
Date: Fri, 27 Dec 2019 15:26:23 +0800
Subject: [PATCH 36/37] =?UTF-8?q?=E3=80=90#1335=20=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E3=80=91"=E9=BB=98=E8=AE=A4=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"=E6=94=B9=E4=B8=BA"=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E7=B1=BB=E5=9E=8B"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
index 4b4a129..71eb010 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackageSpec.java
@@ -54,7 +54,7 @@ public class WmsPackageSpec extends BaseBean {
 
 
     @Column(name = "POCKET_TYPE")
-    @ApiParam(value = "默认容器类型")
+    @ApiParam(value = "容器类型")
     private String pocketType;
 
     @ApiParam(value = "上级规格名称")

From 62c50e04cc8f0c5ae1d5c1b5ef0f1dc9f992650c Mon Sep 17 00:00:00 2001
From: gcj <changjiang.gao@estsh.com>
Date: Fri, 27 Dec 2019 15:48:37 +0800
Subject: [PATCH 37/37] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
index 27a400a..2be688f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@@ -123,4 +123,13 @@ public class WmsBom extends BaseBean {
         this.bomNum = bomNum;
         this.itemQty = itemQty;
     }
+
+    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty,String effStartTime) {
+        this.itemPartNo = itemPartNo;
+        this.itemPartNam = itemPartNam;
+        this.itemUnit = itemUnit;
+        this.bomNum = bomNum;
+        this.itemQty = itemQty;
+        this.effStartTime = effStartTime;
+    }
 }