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..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
@@ -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;
@@ -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 数据库适配服务"),
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-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 a4572cc..406b93f 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-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","")
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-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/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/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/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/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 7c85758..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(
@@ -718,16 +721,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 +1183,7 @@ public class MesHqlPack {
 
     /**
      * 系统业务动作
+     *
      * @param organizeCode
      * @return
      */
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-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")
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..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
@@ -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);
 
@@ -313,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);
@@ -332,8 +339,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);
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();
     }
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/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..6b478cf
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java
@@ -0,0 +1,52 @@
+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;
+
+}
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> {
+
+}