From 787f12387de6c772a50d29c86b5128be9ae1b51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Tue, 17 Sep 2019 17:04:13 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=EF=BC=9A=E5=85=B3=E8=81=94=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E7=9B=98=E7=82=B9=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B6=E5=AE=83=E7=A7=BB=E5=8A=A8=E5=8D=95?=
 =?UTF-8?q?+=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E8=B4=A8=E6=A3=80=E6=97=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=B3=E8=81=94=E7=A7=BB=E5=8A=A8=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E7=89=B9=E6=AE=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index eb2a646..921d32d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -210,4 +210,7 @@ public class WmsMoveMaster extends BaseBean {
     public Double getTransQty(){
         return this.transQty == null ? 0 : this.transQty.doubleValue();
     }
+    public int getBusiTypeCodeVal(){
+        return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
+    }
 }

From 271a26d2b8604a44e7e6750d02e6b100f9779bce Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Tue, 17 Sep 2019 18:06:05 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java      | 71 ++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesProcessBom.java    | 21 ++++++
 .../pojo/mes/pcn/bean/MesProdBindRecord.java       | 28 +++++---
 .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java     | 75 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 72 +++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesProcessBom.java  | 33 ++++++++--
 .../i3plus/pojo/mes/bean/MesProdBindRecord.java    | 28 +++++---
 .../estsh/i3plus/pojo/mes/bean/MesRawPartSn.java   | 75 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  | 22 ++++---
 9 files changed, 395 insertions(+), 30 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java

diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
new file mode 100644
index 0000000..7b4d5df
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java
@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED")
+@Api("工位投料信息")
+public class MesCellFeed extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("特殊批次")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
index 951036a..f71bcdb 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcessBom.java
@@ -34,6 +34,18 @@ public class MesProcessBom extends BaseBean {
     @ApiParam("零件号")
     private String partNo;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
     @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;
@@ -55,6 +67,10 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否检查")
     private Integer isCheck;
 
+    @Column(name = "IS_FEED")
+    @ApiParam(value = "是否检查")
+    private Integer isFeed;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;
@@ -80,6 +96,10 @@ public class MesProcessBom extends BaseBean {
         return this.isBind == null ? false : this.isBind;
     }
 
+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
     @Override
     public String toString() {
         return "MesProcessBom{" +
@@ -89,6 +109,7 @@ public class MesProcessBom extends BaseBean {
                 ", qty=" + qty +
                 ", isRepeat=" + isRepeat +
                 ", isCheck=" + isCheck +
+                ", isFeed=" + isFeed +
                 ", isBind=" + isBind +
                 ", color='" + color + '\'' +
                 ", id=" + id +
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
index 9a32f70..9cb5b70 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java
@@ -25,20 +25,20 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD")
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
     @ApiParam(value = "产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("产品条码零件号")
     private String partNo;
 
-    @Column(name="WORK_ORDER")
+    @Column(name = "WORK_ORDER_NO")
     @ApiParam("工单号")
-    private String  workOrder;
+    private String workOrderNo;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")
@@ -52,11 +52,11 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "工步代码")
     private String stepCode;
 
-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
     @ApiParam("原材料零件号")
     private String itemPartNo;
 
-    @Column(name="KP_SN")
+    @Column(name = "KP_SN")
     @ApiParam("原材料条码")
     private String kpSn;
 
@@ -65,11 +65,19 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "原材料数量", example = "0")
     private Double kpQty;
 
-    @Column(name="SUPPLIER_CODE")
+    @Column(name = "SUPPLIER_CODE")
     @ApiParam("供应商")
     private String supplierCode;
 
-    @Column(name="VERSION")
+    @Column(name = "LOT_NO")
+    @ApiParam
+    private String lotNo;
+
+    @Column(name = "IS_FEED")
+    @ApiParam
+    private Integer isFeed;
+
+    @Column(name = "VERSION")
     @ApiParam("版本")
     private String version;
 
@@ -77,6 +85,10 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
     public double getQtyVal() {
         return this.kpQty == null ? 0.0d : this.kpQty;
     }
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
new file mode 100644
index 0000000..7f01147
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java
@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_RAW_PART_SN")
+@Api("原材料信息")
+public class MesRawPartSn extends BaseBean {
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("数量")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name = "FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name = "STATUS")
+    @ApiParam("原料状态")
+    private Integer status;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
new file mode 100644
index 0000000..dccf4fb
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java
@@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CELL_FEED")
+@Api("工位投料信息")
+public class MesCellFeed extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name = "RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name = "RAW_QTY")
+    @ApiParam("特殊批次")
+    private Long rawQty;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("关联批次")
+    private String lotNo;
+
+    @Column(name = "SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
index 92a58dc..41f30ea 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java
@@ -29,18 +29,31 @@ import java.util.Date;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROCESS_BOM")
+@Table(name = "MES_PROCESS_BOM")
 @Api("工序物料清单")
 public class MesProcessBom extends BaseBean {
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;
 
-    @Column(name="PROCESS_CODE")
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+
+    @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;
 
-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
     @ApiParam("子零件")
     private String itemPartNo;
 
@@ -57,6 +70,11 @@ public class MesProcessBom extends BaseBean {
     @ApiParam(value = "是否检查")
     private Integer isCheck;
 
+
+    @Column(name = "IS_FEED")
+    @ApiParam(value = "是否检查")
+    private Integer isFeed;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;
@@ -71,13 +89,17 @@ public class MesProcessBom extends BaseBean {
     }
 
     public int getIsRepeatVal() {
-        return  this.isRepeat == null ? 0 : this.isRepeat;
+        return this.isRepeat == null ? 0 : this.isRepeat;
     }
 
     public int getIsCheckVal() {
         return this.isCheck == null ? 0 : this.isCheck;
     }
 
+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
     public boolean getIsBindVal() {
         return this.isBind == null ? false : this.isBind;
     }
@@ -91,6 +113,7 @@ public class MesProcessBom extends BaseBean {
                 ", qty=" + qty +
                 ", isRepeat=" + isRepeat +
                 ", isCheck=" + isCheck +
+                ", isFeed=" + isFeed +
                 ", isBind=" + isBind +
                 ", color='" + color + '\'' +
                 ", id=" + id +
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
index 23731fd..6f31b49 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java
@@ -26,20 +26,20 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD")
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
     @ApiParam(value = "产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("产品条码零件号")
     private String partNo;
 
-    @Column(name="WORK_ORDER")
+    @Column(name = "WORK_ORDER_NO")
     @ApiParam("工单号")
-    private String  workOrder;
+    private String workOrderNo;
 
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam(value = "工作中心")
@@ -53,11 +53,11 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "工步代码")
     private String stepCode;
 
-    @Column(name="ITEM_PART_NO")
+    @Column(name = "ITEM_PART_NO")
     @ApiParam("原材料零件号")
     private String itemPartNo;
 
-    @Column(name="KP_SN")
+    @Column(name = "KP_SN")
     @ApiParam("原材料条码")
     private String kpSn;
 
@@ -66,11 +66,19 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "原材料数量", example = "0")
     private Double kpQty;
 
-    @Column(name="SUPPLIER_CODE")
+    @Column(name = "SUPPLIER_CODE")
     @ApiParam("供应商")
     private String supplierCode;
 
-    @Column(name="VERSION")
+    @Column(name = "LOT_NO")
+    @ApiParam
+    private String lotNo;
+
+    @Column(name = "IS_FEED")
+    @ApiParam
+    private Integer isFeed;
+
+    @Column(name = "VERSION")
     @ApiParam("版本")
     private String version;
 
@@ -78,6 +86,10 @@ public class MesProdBindRecord extends BaseBean {
     @ApiParam(value = "结果")
     private String result;
 
+    public int getIsFeedVal() {
+        return this.isFeed == null ? 0 : this.isFeed;
+    }
+
     public double getQtyVal() {
         return this.kpQty == null ? 0.0d : this.kpQty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
new file mode 100644
index 0000000..6a7254d
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java
@@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-12
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_RAW_PART_SN")
+@Api("原材料信息")
+public class MesRawPartSn extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name="RAW_TYPE")
+    @ApiParam("原料类型")
+    private String rawType;
+
+    @Column(name="RAW_SN")
+    @ApiParam("原材料条码")
+    private String rawSn;
+
+    @Column(name="RAW_QTY")
+    @ApiParam("数量")
+    private Long rawQty;
+
+    @Column(name="LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
+    @Column(name="FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    private String fixLotNo;
+
+    @Column(name="STATUS")
+    @ApiParam("原料状态")
+    private Integer status;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public long getRawQtyVal() {
+        return this.rawQty == null ? 0l : this.rawQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+}
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 7c85758..19d1974 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
@@ -718,16 +718,19 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
-        if (StringUtils.isNotEmpty(processBom.getPartNo())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
-        }
-        if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
-        }
-        if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
-            DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
-        }
+        DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
+        return packBean;
+    }
 
+    public static DdlPackBean getMesProcessBomExcludeById(MesProcessBom mesProcessBom, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
         return packBean;
     }
 
@@ -1177,6 +1180,7 @@ public class MesHqlPack {
 
     /**
      * 系统业务动作
+     *
      * @param organizeCode
      * @return
      */

From 564deb4d6be480f010eeabb6e3609ebcade314ec 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, 17 Sep 2019 19:35:53 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82=E9=85=8D=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/enumutil/BlockSoftSwitchEnumUtil.java     | 12 ++--
 .../pojo/model/softswitch/SuitClientModel.java     | 33 ++++++++-
 .../i3plus/pojo/softswitch/bean/BsSuitCase.java    | 78 +++++++++++++++++++++-
 .../pojo/softswitch/bean/BsSuitDataDetail.java     |  9 +++
 .../i3plus/pojo/softswitch/bean/BsSuitRecord.java  | 14 ++++
 .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 13 +++-
 6 files changed, 145 insertions(+), 14 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 b387a47..922653c 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
@@ -20,12 +20,12 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CASE_TYPE{
-        SOCKET(10,"SOCKET"),
-        RESTFUL(20,"RESTFUL"),
-        DATASOURCE(30,"数据源"),
-        WEB_SERVICE(40,"WebService"),
-        MQ(50,"消息队列"),
-        WEB_SOCKET(60,"WebSocket");
+        SOCKET(10,"SOCKET套件"),
+        RESTFUL(20,"RESTFUL套件"),
+        DATASOURCE(30,"数据源套件"),
+        WEB_SERVICE(40,"WebService套件"),
+        MQ(50,"消息队列套件"),
+        WEB_SOCKET(60,"WebSocket套件");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
index 51de22a..bf14618 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
@@ -1,16 +1,14 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
-import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import java.util.HashMap;
-
 /**
  * @Description :
  * @Reference :
@@ -41,6 +39,11 @@ public class SuitClientModel {
     private BsSuitCaseModel suitCaseModel;
 
     /**
+     * 适配记录
+     */
+    private BsSuitRecord bsSuitRecord;
+
+    /**
      * 适配结果信息
      */
     private String suitMessage;
@@ -53,6 +56,13 @@ public class SuitClientModel {
      * 适配方式
      */
     private Integer suitMethodId;
+
+    public int getSuitMethodIdVal(){
+        if(suitMethodId == null){
+            return -1;
+        }
+        return suitMethodId.intValue();
+    }
     /**
      * 适配状态码
      */
@@ -97,4 +107,21 @@ public class SuitClientModel {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
+
+    public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) {
+        this.requestSource = requestSource;
+        this.suitMethodId = suitMethodId;
+
+        this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
+        this.suitCaseModel = suitCaseModel;
+
+        // 设置默认
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        // 设置默认
+        this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        // 设置默认
+        this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
index ab512fc..396a89a 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
@@ -108,22 +108,96 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sslKeyId;
 
-    @Column(name = "TIMING_SUIT_NUM")
+    @Column(name = "REGULAR_SUIT_NUM")
     @ApiParam(value = "定时适配次数")
-    private Integer timingSuitNum;
+    private Integer regularSuitNum;
+
+    public int getRegularSuitNumVal(){
+        if(regularSuitNum == null){
+            return -1;
+        }
+        return regularSuitNum.intValue();
+    }
+
+    public int addRegularSuitNum(){
+        if(regularSuitNum == null){
+            return 0;
+        }
+        return ++regularSuitNum;
+    }
 
     @Column(name = "INITIATIVE_SUIT_NUM")
     @ApiParam(value = "主动适配测试")
     private Integer initiativeSuitNum;
 
+    public int getInitiativeSuitNumVal(){
+        if(initiativeSuitNum == null){
+            return -1;
+        }
+        return initiativeSuitNum.intValue();
+    }
+
+    public int addInitiativeSuitNum(){
+        if(initiativeSuitNum == null){
+            initiativeSuitNum = 0;
+        }
+        return ++regularSuitNum;
+    }
+
     @Column(name = "SUCCESS_NUM")
     @ApiParam(value = "成功次数")
     private Integer successNum;
 
+    public int getSuccessNumVal(){
+        if(successNum == null){
+            successNum = -1;
+        }
+        return successNum.intValue();
+    }
+
+    public int addSuccessNum(){
+        if(successNum == null){
+            successNum = 0;
+        }
+        return ++successNum;
+    }
+
     @Column(name = "FAIL_NUM")
     @ApiParam(value = "失败次数")
     private Integer failNum;
 
+    public int getFailNumVal(){
+        if(failNum == null){
+            return -1;
+        }
+        return failNum;
+    }
+
+    public int addFailNum(){
+        if(failNum == null){
+            failNum =0;
+        }
+        return ++failNum;
+    }
+
+    @Column(name = "COUNT_NUM")
+    @ApiParam(value = "总次数")
+    private Integer countNum;
+
+    public int getCountNumVal(){
+        if(countNum == null){
+            countNum = -1;
+        }
+        return countNum.intValue();
+    }
+
+    public int addCountNum(){
+        if(countNum == null){
+            countNum = 0;
+        }
+        return ++countNum;
+    }
+
     @Column(name = "SUIT_CASE_DESCRIPTION")
     @ApiParam(value = "适配器描述")
     private String suitCaseDescription;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
index 0ba342b..e5863a8 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java
@@ -42,6 +42,15 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "适配套件代码")
     private String suitCaseCodeRdd;
 
+    @Column(name = "SUIT_TYPE_ID")
+    @ApiParam(value = "适配类型id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitTypeId;
+
+    @Column(name = "CASE_TYPE_ID")
+    @ApiParam(value = "套件类型id(枚举)")
+    private Integer caseTypeId;
+
     @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
     private String suitTypeNameRdd;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
index 7702cdd..93ec29a 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java
@@ -12,6 +12,8 @@ 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 : 适配记录
@@ -105,5 +107,17 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    @Transient
+    @ApiParam(value = "适配记录参数")
+    private List<BsSuitRecordParam> bsSuitRecordParamList;
+
+    @Transient
+    @ApiParam(value = "适配记录报文")
+    private BsSuitDataDetail bsSuitDataDetail;
+
+    @Transient
+    @ApiParam(value = "适配请求记录")
+    private BsSuitRequestRecord bsSuitRequestRecord;
+
 }
 
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 8956ae4..c865be3 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
@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.softswitch.sqlpack;
 
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.softswitch.bean.*;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description :
@@ -101,7 +103,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
 
         return ddlPackBean;
     }
@@ -276,6 +278,10 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
 
+        bsSuitCaseDataSourceTable.setOrderByParam("operateSort");
+        bsSuitCaseDataSourceTable.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
+        ddlPackBean.setOrderByStr(bsSuitCaseDataSourceTable.orderBy());
+
         return ddlPackBean;
     }
 
@@ -287,7 +293,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
 
@@ -332,8 +338,9 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitDataDetail(BsSuitDataDetail bsSuitDataDetail){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
-        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitDataDetail.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitDataDetail.getProcessState(),"processState",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getGetDateTime(), "getDateTime", ddlPackBean, false, true);
         DdlPreparedPack.timeBuilder(bsSuitDataDetail.getProcessTime(), "processTime", ddlPackBean, false, true);

From 2460fbc3b462141d0ddc0bc3785eed90187c0910 Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Tue, 17 Sep 2019 20:43:06 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 10 ++++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java     |  2 +-
 .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java   |  4 +++
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  2 +-
 .../mes/model/MesPlanOrderExcelErrorModel.java     | 35 +++++++++++++++++++
 .../mes/model/MesPlanOrderExcelResultModel.java    | 39 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java  |  3 ++
 7 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index f8cc7c4..08da054 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
@@ -459,6 +459,16 @@ public class MesEnumUtil {
             }
             return tmp;
         }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
     /**
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
index 4bcccee..6a15c4d 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@@ -88,7 +88,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")
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 c4fcecf..51a686b 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
@@ -95,6 +95,10 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     /**********************  冗余字段 *********************************/
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 973555a..0b77fc4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -102,7 +102,7 @@ public class MesWorkOrder extends BaseBean {
     private String scheduleDate;
 
     @Column(name="CUST_PROD_LINE_CODE")
-    @ApiParam("客户禅产线代码")
+    @ApiParam("客户产线代码")
     private String custProdLineCode;
 
     @Column(name="SHIFT_CODE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java
new file mode 100644
index 0000000..00ac219
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入异常结果model")
+public class MesPlanOrderExcelErrorModel implements Serializable {
+
+    @ApiParam("错误的行号")
+    private int rowNum;
+
+    @ApiParam("错误数量")
+    private int errorNum;
+
+    @ApiParam("错误列号")
+    private String cellNum;
+
+    @ApiParam("错误描述")
+    private String errorInfo;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java
new file mode 100644
index 0000000..e7d3068
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java
@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author: wangjie
+ * @CreateDate: 2019/8/21 9:19 AM
+ * @Description:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("mes生产计划导入结果model")
+public class MesPlanOrderExcelResultModel implements Serializable {
+
+    @ApiParam("结果")
+    private boolean result;
+
+    @ApiParam("成功数量")
+    private int successNum;
+
+    @ApiParam("失败数量")
+    private int errorNum;
+
+    @ApiParam("错误信息集合")
+    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+
+    @ApiParam("错误的行号")
+    private String errorRows;
+
+}
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 19d1974..b8d2acb 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
@@ -77,6 +77,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
 
         // 时间段查询
         DdlPreparedPack.timeBuilder(

From f17c1d3d25f077133ff972d21e3db0059d7db179 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 17 Sep 2019 22:37:26 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=85=A5=E5=BA=93=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java  |  9 +++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java    | 11 +++++++++++
 2 files changed, 20 insertions(+)

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 4b8c2ce..9fb689f 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
@@ -422,6 +422,15 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static LOCATE_TYPE codeOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 32831c7..372cdaa 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -102,10 +102,21 @@ public class WmsLocate extends BaseBean {
     @Transient
     private String factory;
 
+    @Transient
+    @ApiParam(value = "入库箱数", example = "-1")
+    private Integer destBoxQty;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;
 
+    public WmsLocate() {
+    }
+    public WmsLocate(String locateNo,Integer destBoxQty) {
+        this.locateNo = locateNo;
+        this.destBoxQty = destBoxQty;
+    }
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

From 6cbcea7c2cc980d95aee105cd649f70adb659238 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 18 Sep 2019 10:09:46 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E5=80=BC=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
index a839741..ff5adbd 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
@@ -74,7 +74,7 @@ public class SysMenu extends BaseBean {
     @Column(name="MENU_SORT")
     @ApiParam(value ="资源排序", example = "0")
     @AnnoOutputColumn(required = false)
-    private Integer menuSort;
+    private Integer menuSort = 0;
 
     @Column(name="MENU_URL")
     @ApiParam(value ="资源 url" , access ="资源 url")

From 512ebb495ceed3c4ae19946bbd67854e377d9b0c Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 18 Sep 2019 10:34:15 +0800
Subject: [PATCH 07/19] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=20=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/engine/rule/GenerateLocateRule.java   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
new file mode 100644
index 0000000..e18e45e
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : VDA收货 推荐入库
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-09-17 19:50
+ * @Modify:
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateLocateRule {
+
+    List<String> zonesList;
+
+    Integer locateType;
+
+    String organizeCode;
+
+    String locateNo;
+
+    Integer destQty;
+
+    String partNo;
+
+}

From 9e2169fa87cc8028c11df460ca5bccfd72193392 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 18 Sep 2019 10:42:25 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=85=A5=E5=BA=93=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/engine/rule/GenerateLocateRule.java       | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
index e18e45e..6b478cf 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -19,16 +19,34 @@ import java.util.List;
 @NoArgsConstructor
 public class GenerateLocateRule {
 
+    /**
+     * 存储区
+     */
     List<String> zonesList;
 
+    /**
+     * 库位类型
+     */
     Integer locateType;
 
+    /**
+     * 工厂代码
+     */
     String organizeCode;
 
+    /**
+     * 库位代码
+     */
     String locateNo;
 
+    /**
+     * 入库箱数
+     */
     Integer destQty;
 
+    /**
+     * 物料名称
+     */
     String partNo;
 
 }

From e52c310d38b126161416412d4ec3cf15117a0158 Mon Sep 17 00:00:00 2001
From: "bleakney.liu" <bleakney.liu@estsh.com>
Date: Wed, 18 Sep 2019 13:35:35 +0800
Subject: [PATCH 09/19] =?UTF-8?q?add=20=E5=85=A5=E5=BA=93pojo=20=E5=92=8Cr?=
 =?UTF-8?q?esponse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 45 ++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java  | 62 ++++++++++++++++
 .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 85 ++++++++++++++++++++++
 .../wms/repository/WmsPartRoutingRepository.java   | 18 +++++
 .../pojo/wms/repository/WmsRoutingRepository.java  | 17 +++++
 .../wms/repository/WmsRoutingRoleRepository.java   | 17 +++++
 6 files changed, 244 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
new file mode 100644
index 0000000..0be04b6
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_PART_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物料线路关系表",description = "物料线路关系表")
+public class WmsPartRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路编号")
+    private String areaNo;
+ 
+
+    public WmsPartRouting(){}
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
new file mode 100644
index 0000000..0b9f58c
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java
@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路信息表",description = "物流线路信息表")
+public class WmsRouting extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "线路名称")
+    private String routingName;
+
+    @Column(name = "ROUTING_DESC")
+    @ApiParam(value = "线路描述")
+    private String routingDesc;
+
+    @Column(name = "FOR_PROUCT_CLASS")
+    @ApiParam(value = "适用产品分类")
+    private Integer forProductClass;
+
+    @Column(name = "FOR_WAREHOUSE")
+    @ApiParam(value = "适用仓库", example ="1")
+    private Integer forWareHouse;
+
+    @Column(name = "FOR_PRODUCT")
+    @ApiParam(value = "适用产品")
+    private Integer forProduct;
+
+   
+
+    public WmsRouting(){}
+
+}
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
new file mode 100644
index 0000000..d013c16
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java
@@ -0,0 +1,85 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ROUTING_RULE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api(value="物流线路规则表",description = "物流线路规则表")
+public class WmsRoutingRule extends BaseBean {
+
+    private static final long serialVersionUID = 7759454799191378612L;
+    @Column(name = "RULE_CODE")
+    @ApiParam(value = "规则编号")
+    private String ruleCode;
+
+    @Column(name = "RULE_NAME")
+    @ApiParam(value = "规则名称")
+    private String ruleName;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam(value = "规则描述")
+    private String ruleDesc;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "排序号")
+    private Integer seq;
+
+    @Column(name = "RULE_TYPE")
+    @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10")
+    private Integer ruleType;
+
+    @Column(name = "ZONE_NO_SRC")
+    @ApiParam(value = "源存储区")
+    private String zoneNoSrc;
+
+    @Column(name = "ZONE_NO_TARGET")
+    @ApiParam(value = "目标存储区" , example = "2")
+    private String zoneNoTarget;
+
+    @Column(name = "OP_TYPE_CODE")
+    @ApiParam(value = "作业类型" , example = "2")
+    private String opTypeCode;
+
+    @Column(name = "TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型" , example = "1")
+    private String transTypeCode;
+
+    @Column(name = "MODE_CODE")
+    @ApiParam(value = "处理模式(10:生成任务,20:自动操作,30手工操作，40:自动操作 无交易)" , example = "1")
+    private Integer modeCode;
+
+    @Column(name = "DELAY_TIME")
+    @ApiParam(value = "延迟时间" , example = "1")
+    private Integer dalayTime;
+
+    @Column(name = "DELAY_UNIT")
+    @ApiParam(value = "延迟时间单位(M:分钟，D:天)")
+    private String delayUnit;
+
+   
+    public WmsRoutingRule(){}
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java
new file mode 100644
index 0000000..2ecd401
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRoutingRepository.java
@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartRoutingRepository extends BaseRepository<WmsPartRouting ,Long> {
+
+ 
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java
new file mode 100644
index 0000000..86212fd
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsRouting;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRepository extends BaseRepository<WmsRouting ,Long> {
+
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java
new file mode 100644
index 0000000..f081961
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsRoutingRoleRepository.java
@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsRoutingRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsRoutingRoleRepository extends BaseRepository<WmsRoutingRule ,Long> {
+
+}

From b31162c5d6fa8729b3e1ffc2e6e97adf18ea0be4 Mon Sep 17 00:00:00 2001
From: crish <570360737@qq.com>
Date: Wed, 18 Sep 2019 13:37:00 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B7=A5=E4=BD=8D?=
 =?UTF-8?q?=E6=94=BE=E8=A1=8C=EF=BC=8C=20=E5=AE=89=E7=81=AF=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86=E7=95=8C=E9=9D=A2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: crish <570360737@qq.com>
---
 .../estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
index 0e53b60..17335f3 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@@ -211,9 +211,10 @@ public class AndonEnumUtil {
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销"),
-        COMMIT(5,"50","提交"),
-        PASS(6,"60","审批"),
-        REJECT(7,"70","驳回");
+        COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
+        PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
+        REJECT(7,"70","驳回"),
+        CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举
 
         private int value;
         private String code;
@@ -245,6 +246,16 @@ public class AndonEnumUtil {
             return tmp;
         }
 
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
         public static int descriptionOfValue(String val) {
             int tmp = -1;
             for (int i = 0; i < values().length; i++) {

From 83f400a36b3d7b0d7eb7034135807ed608f4f841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Wed, 18 Sep 2019 14:07:53 +0800
Subject: [PATCH 11/19] =?UTF-8?q?sql=20=E6=B3=A8=E5=85=A5=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=9C=E6=9D=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
index 0e8af5f..4823179 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java
@@ -25,7 +25,7 @@ public class HqlPack {
 		return data.toString().replaceAll(";","")
 					.replaceAll("'","")
 					.replaceAll("\"","")
-					.replaceAll("/","")
+//					.replaceAll("/","")
 					.replaceAll("\\\\","")
 					.replaceAll("delete","")
 					.replaceAll("update","")

From c7ed8613d658da3f84f6d2a30df005f8b087de0e Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 18 Sep 2019 14:52:38 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0WebService=20=E9=BB=98=E8=AE=A4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 1 +
 1 file changed, 1 insertion(+)

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 922653c..3d850d5 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
@@ -114,6 +114,7 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
         CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+        CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),

From c6badc59c60a3c9123317b64fe858b9da6a0d35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Wed, 18 Sep 2019 15:01:36 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E9=80=82=E9=85=8D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0id=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java  | 1 +
 1 file changed, 1 insertion(+)

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 c865be3..d999d66 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
@@ -319,6 +319,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitRecord(BsSuitRecord bsSuitRecord){
         DdlPackBean ddlPackBean = new DdlPackBean();
 
+        DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);

From d8bc8d713dd2abd6e23bfbe3ad081bbd2e221646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Wed, 18 Sep 2019 17:03:05 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0model?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     |  3 +-
 .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 32 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java |  3 ++
 .../pojo/wms/modelbean/WmsDataAuthModel.java       |  3 ++
 4 files changed, 40 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 4b8c2ce..a4572cc 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
@@ -1879,7 +1879,8 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
+        BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象");
 
         private String code;
         private String description;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
index ce22558..c9a988d 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable {
     @ApiParam(value = "移库单主表")
     public WmsDocMovementMaster movementMaster;
 
+    @ApiParam(value = "状态")
+    @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorName;
+
+    @ApiParam(value = "供应商编码")
+    @Transient
+    public String vendorNo;
+
+    @ApiParam(value = "客户编码")
+    @Transient
+    public String custNo;
+
+    @ApiParam(value = "ERP编号")
+    @Transient
+    public String erpSrcNo;
+
+    @ApiParam(value = "联系人")
+    @Transient
+    public String vendorOwner;
+
+    @ApiParam(value = "供应商邮箱")
+    @Transient
+    public String vendorEmail;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index a545be8..8b24b26 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer poStatus;
 
     @Column(name = "VENDOR_NO")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
index 20c7692..2079deb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
@@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean {
     @ApiParam("交易代码列表")
     private List<String> transTypeList;
 
+    @ApiParam("业务类型列表")
+    private List<String> busiTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"

From baf39dc0ce32805f1854b5e18c1f3da7dec7e867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Wed, 18 Sep 2019 17:09:18 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/bean/WmsProductReturnMovement.java    | 60 ++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java
new file mode 100644
index 0000000..9122049
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsProductReturnMovement.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+* @Description : 生产退料导入模板
+* @Reference :
+* @author: amy.liu
+* @date: 2019/9/17 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产退料导入模板",description = "生产退料导入模板")
+public class WmsProductReturnMovement implements Serializable{
+
+    @ApiParam(value = "单号")
+    @AnnoOutputColumn
+    private String orderNo;
+
+    @ApiParam(value = "物料编码")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "源存储区")
+    @AnnoOutputColumn
+    private String srcZoneNo;
+
+    @ApiParam(value = "目标存储区")
+    @AnnoOutputColumn
+    private String destZoneNo;
+
+    @ApiParam(value = "业务类型")
+    @AnnoOutputColumn
+    private String busiType;
+
+    @ApiParam(value = "工厂")
+    @AnnoOutputColumn
+    private String factory;
+
+    @ApiParam(value = "计划日期")
+    @AnnoOutputColumn
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @AnnoOutputColumn
+    private String planTime;
+
+
+}

From 5d1e6e847437b99f37aa919f9c2a2e2820e53beb Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Wed, 18 Sep 2019 17:24:05 +0800
Subject: [PATCH 16/19] =?UTF-8?q?VDA=E6=94=B6=E8=B4=A7=20=E5=BA=93?=
 =?UTF-8?q?=E4=BD=8D=E6=8E=A8=E8=8D=90=E5=85=A5=E5=BA=93=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java  |  4 ++++
 .../i3plus/pojo/wms/engine/rule/GenerateLocateRule.java     | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
index 372cdaa..fad9c66 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@@ -106,6 +106,10 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "入库箱数", example = "-1")
     private Integer destBoxQty;
 
+    @Transient
+    @ApiParam(value = "错误信息", example = "-1")
+    private String errorMsg;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
index 6b478cf..480fb35 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -22,31 +22,30 @@ public class GenerateLocateRule {
     /**
      * 存储区
      */
-    List<String> zonesList;
+    private List<String> zonesList;
 
     /**
      * 库位类型
      */
-    Integer locateType;
+    private Integer locateType;
 
     /**
      * 工厂代码
      */
-    String organizeCode;
+    private String organizeCode;
 
     /**
      * 库位代码
      */
-    String locateNo;
+    private String locateNo;
 
     /**
      * 入库箱数
      */
-    Integer destQty;
+    private Integer destQty;
 
     /**
      * 物料名称
      */
-    String partNo;
-
+    private String partNo;
 }

From 1e01f621887eb071022be4b628c25c7f1e9bde39 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Wed, 18 Sep 2019 19:05:57 +0800
Subject: [PATCH 17/19] =?UTF-8?q?Bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index 0c99c73..4beffc1 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -159,7 +159,7 @@ public class CoreHqlPack {
 
         // String Like
         DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
-        DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
         // Number In
         DdlPreparedPack.getInPackList(idList,"id",result);
         return result;

From 9ed873422ef869d02bd5a630076f614a73dabcad Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Wed, 18 Sep 2019 21:33:40 +0800
Subject: [PATCH 18/19] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/mes/bean/MesPlanOrder.java   | 20 +++---------
 .../estsh/i3plus/pojo/mes/bean/MesShiftGroup.java  | 37 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   |  4 +++
 ...xcelErrorModel.java => MesExcelErrorModel.java} |  4 +--
 ...elResultModel.java => MesExcelResultModel.java} | 17 ++++++----
 .../mes/repository/MesShiftGroupRepository.java    | 16 ++++++++++
 6 files changed, 74 insertions(+), 24 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
 rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesPlanOrderExcelErrorModel.java => MesExcelErrorModel.java} (83%)
 rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesPlanOrderExcelResultModel.java => MesExcelResultModel.java} (61%)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java

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 51a686b..53478dc 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
@@ -100,6 +100,11 @@ public class MesPlanOrder extends BaseBean {
     private String workCenterCode;
 
     /**********************  冗余字段 *********************************/
+
+    @Transient
+    @ApiParam(value="区域")
+    public String areaCode;
+
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@@ -122,21 +127,6 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
-    }
-
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> getPlanOrderStatusEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values());
-    }
-
     public double getPlanQtyVal() {
         return this.planQty == null ? 0.0d : this.planQty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
new file mode 100644
index 0000000..f31bdf6
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 0b77fc4..ba6525c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -125,6 +125,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java
similarity index 83%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java
index 00ac219..a65e891 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelErrorModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelErrorModel.java
@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入异常结果model")
-public class MesPlanOrderExcelErrorModel implements Serializable {
+@Api("mes导入异常结果model")
+public class MesExcelErrorModel implements Serializable {
 
     @ApiParam("错误的行号")
     private int rowNum;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java
similarity index 61%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java
index e7d3068..491dfc6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlanOrderExcelResultModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesExcelResultModel.java
@@ -18,22 +18,25 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入结果model")
-public class MesPlanOrderExcelResultModel implements Serializable {
+@Api("mes导入结果model")
+public class MesExcelResultModel<T> implements Serializable {
 
     @ApiParam("结果")
     private boolean result;
 
-    @ApiParam("成功数量")
-    private int successNum;
+    @ApiParam("成功行数量")
+    private int successRowNum;
 
-    @ApiParam("失败数量")
-    private int errorNum;
+    @ApiParam("失败行数量")
+    private int failRowNum;
 
     @ApiParam("错误信息集合")
-    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+    private List<MesExcelErrorModel> mesExcelErrorModel;
 
     @ApiParam("错误的行号")
     private String errorRows;
 
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java
new file mode 100644
index 0000000..6949ba8
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.java
@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
+}

From 24a31c0bdf4da933b9ca8aa24a3675268412bedb Mon Sep 17 00:00:00 2001
From: wangjie <jhforever.wang@estsh.com>
Date: Thu, 19 Sep 2019 09:47:23 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 37 ++++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesShiftGroup.java    | 37 ++++++++++++++++++++++
 .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java     | 12 +++++++
 .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java   | 34 +++++---------------
 4 files changed, 94 insertions(+), 26 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 08da054..eca112e 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,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * MesWorkOrder实体对应的approvalStatus值  审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_APPROVAL_STATUS {
+
+        WAIT_APPROVAL(10, "待审批"),
+        COMPLETE_APPROVAL(20, "已审批"),
+        REJECT_APPROVAL(30, "驳回");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_APPROVAL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * mes-pcn定时任务状态
      *
      */
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java
new file mode 100644
index 0000000..bf6bb5e
--- /dev/null
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
index 6a15c4d..e28e0e0 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java
@@ -111,6 +111,14 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -138,4 +146,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index ba6525c..81037ba 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -129,6 +128,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("班组")
     private String shiftGroup;
 
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
@@ -171,31 +174,6 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-
-    @Transient
-    @ApiParam("工单类型枚举")
-    private List<MesEnumUtil.WORK_ORDER_TYPE> workOrderTypeDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_TYPE> getWorkOrderTypeDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values());
-    }
-
-    @Transient
-    @ApiParam("工单状态枚举")
-    private List<MesEnumUtil.WORK_ORDER_STATUS> workOrderStatusDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_STATUS> getWorkOrderStatusDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values());
-    }
-
-    @Transient
-    @ApiParam("工单来源枚举")
-    private List<MesEnumUtil.WORK_ORDER_SOURCE> workOrderSourceDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_SOURCE> getWorkOrderSourceDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
-    }
-
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
@@ -228,4 +206,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }