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 957ed64..b9ad153 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
@@ -514,7 +514,8 @@ public class WmsEnumUtil {
         NC_LOCATE(60, "N", "NC库"),
         SPILLAGE_LOCATE(70, "Y", "溢料库"),
         TRANSIT_LOCATE(80, "T", "在途库"),
-        UTENSIL_LOCATE(90, "U", "器具库");
+        UTENSIL_LOCATE(90, "U", "器具库"),
+        OPERATION_PALTFORM(100, "W", "工作台");
 
         private int value;
         private String code;
@@ -727,9 +728,11 @@ public class WmsEnumUtil {
         EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
         LOADING_ORDER(530, "LOADING_ORDER", "装车单"),
         SALE_ON_WAY(540, "SALE_ON_WAY", "销售在途"),
-        FORK_INSTORE(550, "FORK_INSTORE", "采购入库"),
-        CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "料车出库"),
-        CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "料车入库");
+        FORK_INSTORE(550, "FORK_INSTORE", "叉车入库"),
+        CONTAINER_OUTSTORE(560, "CONTAINER_OUTSTORE", "AGV料车出库"),
+        CONTAINER_INSTORE(570, "CONTAINER_INSTORE", "AGV料车入库"),
+        AGV_PART_NO_OUT(580, "AGV_PART_NO_OUT", "AGV物料出库"),
+        FORKLIFT_PART_NO_OUT(590, "FORKLIFT_PART_NO_OUT", "PAD物料出库");
         private int value;
         private String code;
         private String description;
@@ -924,7 +927,8 @@ public class WmsEnumUtil {
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
         UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"),
-        TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料");
+        TG_PICKING_GOODS("TG_PICKING_GOODS", "TG生产领料"),
+        INTELLIGENT("INTELLIGENT", "智能化");
         private String value;
         private String description;
 
@@ -8254,4 +8258,59 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+
+    /**
+     * 自动入库任务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AUTO_FORK_TASK_TYPE {
+        MOVE(10, "W05", "W05");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AUTO_FORK_TASK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
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
index 41042ca..40939d5 100644
--- 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
@@ -30,6 +30,11 @@ import java.io.Serializable;
 @Api("工位投料信息")
 public class MesCellFeed extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1947971369479107782L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
index cc8aac2..33b0024 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesExtendObjectCfg.java
@@ -51,7 +51,7 @@ public class MesExtendObjectCfg extends BaseBean implements Serializable {
     private Integer fieldType;
 
     @Column(name = "FIELD_LENGTH")
-    @ApiParam("扩展字段类型")
+    @ApiParam("扩展字段长度")
     private String fieldLength;
 
     @Column(name = "DEFAULT_VALUE")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
index 1880189..dac14a4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java
@@ -43,7 +43,7 @@ public class MesPackSpec extends BaseBean implements Serializable {
     @Column(name = "QTY")
     @ColumnDefault("0")
     @ApiParam(value = "包装数量", example = "0")
-    private Double qty;
+    private Double qty = 0d;
 
     @Column(name = "QTY2")
     @ColumnDefault("0")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
index 4b81afd..541d461 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@@ -118,6 +118,11 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
 
+    // 赋值模板代码
+    @Column(name = "PACKAGE_LABEL_TEMPLATE")
+    @ApiParam("包装标签模板")
+    private String packageLabelTemplate;
+
     public MesPackage() {
     }
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
index bc568d7..09296ef 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@@ -140,6 +140,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("产品标签模板")
     private String prodLabelTemplate;
 
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
+
 //    @Version
 //    @Column(name = "LOCK_VERSION")
 //    @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index a2cd693..85e63bf 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
@@ -138,6 +138,14 @@ public class MesStationBom extends BaseBean implements Serializable {
     @ApiParam("产品类型名称")
     private String produceCategoryName;
 
+    @Transient
+    @ApiParam("字符长度")
+    private Integer length;
+
+    @Transient
+    @ApiParam("校验内容")
+    private String checkContent;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
index 27ad0ee..0a67fe0 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
@@ -177,6 +177,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
+    @Column(name = "PARENT_PART_NO")
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
index ac78dd7..7c57d0a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java
@@ -151,6 +151,11 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("首检生成数量")
     private Double fiGenerateQty;
 
+    @Lob
+    @Column(name = "EXTEND")
+    @ApiParam("扩展数据")
+    private String extend;
+
     @Column(name = "RESERVED1")
     @ApiParam("预留字段1")
     private String reserved1;
@@ -167,10 +172,6 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
     @ApiParam("预留字段4")
     private String reserved4;
 
-    @Column(name = "RESERVED5")
-    @ApiParam("预留字段5")
-    private String reserved5;
-
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
new file mode 100644
index 0000000..abf1eff
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPaintSnPrintModel.java
@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: siliter.yuan
+ * @CreateDate: 2020\06\22 15:58
+ * @Modify:
+ **/
+@Data
+public class MesPaintSnPrintModel implements Serializable {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("产品条码")
+    private String produceSn;
+
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("打印模板")
+    private MesLabelTemplate labelTemplate;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java
new file mode 100644
index 0000000..426707f
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageSnLabelTemplateDataModel.java
@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class PackageSnLabelTemplateDataModel {
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    // 工单表.包装规格描述
+    @ApiParam("包装规格")
+    private Double packSpecQty;
+
+    @ApiParam("生产日期")
+    private String prodDate;
+
+    @ApiParam("工单班次")
+    private String workOrderShift;
+
+    @ApiParam("操作人员名称")
+    private String operatorName;
+
+    @ApiParam("工厂名称")
+    private String organizeName;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
new file mode 100644
index 0000000..f1f7d53
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Author: siliter.yuan
+ * @CreateDate: 2020/6/21 8:06 PM
+ * @Description:
+ **/
+@Data
+@Api("涂装上线MODEL")
+public class PaintOnLineModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("工单数量")
+    private Double orderNum;
+
+    @ApiParam("包装数量")
+    private Double packageNum;
+
+    @ApiParam("项目名称")
+    private String productName;
+
+    @ApiParam("创建时间")
+    private String createDateTime;
+
+    @ApiParam("圈数")
+    private Integer rounds;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
new file mode 100644
index 0000000..16a9bfe
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
@@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : 涂装工单条码-展示组件model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("涂装工单条码展示组件model")
+public class PaintWorkOrderSnModel extends BaseBean {
+
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("颜色代码")
+    private String colorCode;
+
+    @ApiParam("颜色名称")
+    private String colorName;
+
+    @ApiParam("工单数量")
+    private Double workOrderQty;
+
+    @ApiParam("包装数量")
+    private Double packageQty;
+
+    @ApiParam("项目名称")
+    private String prodCfgTypeName;
+
+    @ApiParam("圈数")
+    private Integer groupNum;
+
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    // 父阶物料号  -- 涂装客户标签打印
+    @ApiParam("父阶物料号")
+    private String parentPartNo;
+
+    // 父阶物料名称  -- 涂装二次条码打印
+    @ApiParam("父阶物料名称")
+    private String parentPartName;
+
+    private List<ProdPackModel> prodPackageList;
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
new file mode 100644
index 0000000..f4a4de9
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProdPackModel.java
@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description : 涂装工单条码-展示组件(产品包装)model
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-06-21 11:02
+ * @Modify:
+ **/
+@Data
+@Api("产品包装model")
+public class ProdPackModel {
+
+    // 产品条码表--产品条码
+    @ApiParam("产品条码")
+    private String productSn;
+
+    // 包装主表--包装编号
+    @ApiParam("一检箱条码")
+    private String packageNo;
+
+    // 包装明细表--创建时间
+    @ApiParam("一检校验时间")
+    private String createDatetime;
+
+    // 包装主表--打印状态(10：未打印 20：已打印)
+    @ApiParam("箱条码状态")
+    private Integer printStatus;
+
+    // 涂装客户标签打印
+    @ApiParam("客户标签")
+    private String custSn;
+
+    // 涂装客户标签打印
+    @ApiParam("当前工序")
+    private String processCode;
+
+    // 涂装客户标签打印
+    @ApiParam("更新时间")
+    private String modifyDateTime;
+
+    public ProdPackModel(String productSn, String packageNo, String createDatetime, Integer printStatus) {
+        this.productSn = productSn;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+        this.printStatus = printStatus;
+    }
+
+    public ProdPackModel(String productSn, String packageNo, String custSn, String processCode, String modifyDateTime) {
+        this.productSn = productSn;
+        this.packageNo = packageNo;
+        this.custSn = custSn;
+        this.processCode = processCode;
+        this.modifyDateTime = modifyDateTime;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
index 9d81d04..0539818 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesPcnHqlPack.java
@@ -616,4 +616,47 @@ public class MesPcnHqlPack {
         return endIndex;
     }
 
+    /**
+     * 涂装一次箱条码打印获取工单 查询条件封装
+     *
+     * @param mesWorkOrder
+     * @return
+     */
+    public static DdlPackBean getWorkOrderList(MesWorkOrder mesWorkOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkOrder, organizeCode);
+        if (!StringUtils.isEmpty(mesWorkOrder.getOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getWorkOrderStatus())) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
+        }
+        DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
+        // 时间段查询
+        if (!StringUtils.isEmpty(mesWorkOrder.getStartTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getStartTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getStartTimeStart(),
+                    mesWorkOrder.getStartTimeEnd(),
+                    "startTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getEndTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getEndTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getEndTimeStart(),
+                    mesWorkOrder.getEndTimeEnd(),
+                    "endTime", packBean, true);
+        }
+        if (!StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesWorkOrder.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(
+                    mesWorkOrder.getCreateDateTimeStart(),
+                    mesWorkOrder.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+
+        return packBean;
+    }
 }
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 57c8ee6..8055c00 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
@@ -102,6 +102,9 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String createDateTime;
 
+    @Transient
+    public String receiveDateTime;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
index a5a4d10..33bed63 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java
@@ -116,6 +116,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "分组KEY")
     public String groupKey;
 
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index 0600820..00036f6 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -212,6 +212,17 @@ public class WmsASNMaster extends BaseBean {
         this.recStatus = recStatus;
     }
 
+    public WmsASNMaster(String orderNo, Integer asnStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+        this.orderNo = orderNo;
+        this.asnStatus = asnStatus;
+        this.organizeCode = organizeCode;
+        this.vendorNo = vendorNo;
+        this.dock = dockCode;
+        this.zdoc = zdoc;
+        this.createDatetime = createDateTime;
+        this.createDateTimeStart = receiveDateTime;
+    }
+
     public int getAsnStatusVal() {
         return this.asnStatus == null ? 0 : this.asnStatus;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index f149f30..80a7f60 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -232,6 +232,10 @@ public class WmsDocMovementDetails extends BaseBean {
     private String seqNo;
 
     @Transient
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Transient
     @ApiParam(value = "替代物料编码")
     private String subPartNo;
 
@@ -421,4 +425,30 @@ public class WmsDocMovementDetails extends BaseBean {
         this.planDate = poMasterDetails.getPlanDate();
         this.planTime = poMasterDetails.getPlanTime();
     }
+
+    public WmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails,Integer busiType,String srcZoneNo,String destZoneNo,
+                                 String custNo) {
+        this.orderNo = wmsDocMovementDetails.getOrderNo();
+        this.partNo = wmsDocMovementDetails.getPartNo();
+        this.qty = wmsDocMovementDetails.getQty();
+        this.taskGenerateQty = wmsDocMovementDetails.getTaskGenerateQty();
+        this.partNameRdd = wmsDocMovementDetails.getPartNameRdd();
+        this.unit = wmsDocMovementDetails.getUnit();
+        this.custNo = wmsDocMovementDetails.getCustNo();
+        this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo();
+        this.srcWhNo = wmsDocMovementDetails.getSrcWhNo();
+        this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo();
+        this.destWhNo = wmsDocMovementDetails.getDestWhNo();
+        this.destZoneNo = wmsDocMovementDetails.getDestZoneNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo();
+        this.destAreaNo = wmsDocMovementDetails.getDestAreaNo();
+        this.destLocateNo = wmsDocMovementDetails.getDestLocateNo();
+        this.organizeCode = wmsDocMovementDetails.getOrganizeCode();
+        this.busiType = busiType;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.custNo = custNo;
+    }
+
 }
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 e18d087..1dcc9ff 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
@@ -171,6 +171,21 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    public WmsPOMaster() {
+
+    }
+
+    public WmsPOMaster(String orderNo, Integer poStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+        this.orderNo = orderNo;
+        this.poStatus = poStatus;
+        this.organizeCode = organizeCode;
+        this.vendorNo = vendorNo;
+        this.dock = dockCode;
+        this.zdoc = zdoc;
+        this.createDatetime = createDateTime;
+        this.createDateTimeStart = receiveDateTime;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
new file mode 100644
index 0000000..16100ef
--- /dev/null
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java
@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-06-22 18:59
+ * @Modify:
+ **/
+@Data
+public class WmsAutoTaskModel {
+
+    String lockLocacte;
+    String lockCar;
+
+    Integer busiType;
+
+    String srcZoneNo;
+    String descZoneNo;
+    List<String> partList;
+
+    String organizeCode;
+}