diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
index 90d847f..ea3844d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java
@@ -169,12 +169,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.qcStatus = qcStatus;
     }
 
-    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) {
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double qty, String createDatetime) {
         this.workCenterCode = workCenterCode;
         this.partNo = partNo;
         this.partName = partName;
         this.packageNo = packageNo;
-        this.itemQty = itemQty;
+        this.qty = qty;
         this.createDatetime = createDatetime;
     }
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java
index 2e75537..cbc02b8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java
@@ -81,5 +81,9 @@ public class MesBoardLine extends BaseBean implements Serializable {
     @ApiParam("是否展示")
     private Integer isDisplay;
 
+    @Column(name = "OEE_RED_LINE_VALUE")
+    @ApiParam("OEE红线值")
+    private String oeeRedLineValue;
+
 
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
index bd1dd11..ef9dddb 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@@ -109,6 +109,9 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷数量")
     private Integer defectQty;
 
+    @ApiParam("维修状态名称")
+    private String repairStatusName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
index 8315005..ca64a64 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
@@ -22,7 +22,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PACKAGE_NO2")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
 })
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 a024e83..c0b3162 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
@@ -159,11 +159,6 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("Vin")
     private String vinCode;
 
-//    @Version
-//    @Column(name = "LOCK_VERSION")
-//    @ApiParam(value = "乐观锁", example = "1")
-//    public transient Integer lockVersion;
-
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
index 76c61d8..0db7bb7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java
@@ -143,6 +143,22 @@ public class MesProduceSnTravel extends BaseBean implements Serializable {
     @ApiParam("不良处理类型")
     private String defectActionType;
 
+    @Column(name = "PROCESS_LABEL_TEMPLATE")
+    @ApiParam("过程标签模板")
+    private String processLabelTemplate;
+
+    @Column(name = "PROD_LABEL_TEMPLATE")
+    @ApiParam("产品标签模板")
+    private String prodLabelTemplate;
+
+    @Column(name = "CUST_LABEL_TEMPLATE")
+    @ApiParam("客户标签模板")
+    private String custLabelTemplate;
+
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
index fb90c4c..03c2cd2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcOrderDetail.java
@@ -127,4 +127,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
     @ApiParam("检测值")
     private String checkValue;
 
+    @Transient
+    @ApiParam("质检单检测记录id")
+    private Long qcOrderRecordId;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index 2ee9a19..1f1b343 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 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 javax.persistence.*;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -28,7 +25,12 @@ import java.util.Date;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_ACTUAL")
+@Table(name = "MES_QUEUE_JIT_ACTUAL", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "VIN_CODE"),
+        @Index(columnList = "JIT_SEQ")
+})
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
index 93f729c..a73e9fd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java
@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -28,7 +29,12 @@ import java.io.Serializable;
 @AllArgsConstructor
 @Builder
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
+@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("客户JIT生产队列散件清单")
 public class MesQueueJitActualBom extends BaseBean implements Serializable {
     private static final long serialVersionUID = 1604529847020812472L;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
index f0f5944..02a2791 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java
@@ -7,10 +7,7 @@ import lombok.*;
 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 javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,12 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor
 @Builder
-@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL")
+@Table(name = "MES_QUEUE_JIT_ACTUAL_DETAIL", indexes = {
+        @Index(columnList = "JIS_ACTUAL_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PRODUCE_CTGY_CODE")
+})
 @Api("MES_客户JIT生产队列明细")
 public class MesQueueJitActualDetail extends BaseBean implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
index 03b4987..76bf686 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java
@@ -9,11 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -28,7 +24,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN")
+@Table(name = "MES_QUEUE_JIT_PLAN", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "VIN_CODE")
+})
 @Api("MES_客户JIT预装队列")
 public class MesQueueJitPlan extends BaseBean implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
index f7eedab..09e3317 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -26,7 +27,12 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN_BOM")
+@Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_客户JIT预装队列BOM")
 public class MesQueueJitPlanBom extends BaseBean implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
index b2631fb..5c2c766 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java
@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -26,7 +23,12 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL")
+@Table(name = "MES_QUEUE_JIT_PLAN_DETAIL", indexes = {
+        @Index(columnList = "JIS_PLAN_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "PRODUCE_CTGY_CODE"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_客户JIT预装队列明细")
 public class MesQueueJitPlanDetail extends BaseBean implements Serializable {
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
index 4799548..2742925 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.java
@@ -27,7 +27,8 @@ import java.io.Serializable;
 @Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "ORDER_NO"),
-        @Index(columnList = "PART_NO")
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "PRODUCE_CTGY_CODE")
 })
 @Api("MES_生产队列散件清单")
 public class MesQueueOrderBom extends BaseBean  implements Serializable {
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
index 8bcab46..1d95ab2 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MgnBoardListModel.java
@@ -59,4 +59,7 @@ public class MgnBoardListModel {
     @ApiParam("产线集合")
     private List<MgnBoardListColorModel> workCenterList;
 
+    @ApiParam("平均OEE")
+    private Double oeePercent;
+
 }
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 c3d0ad2..b8e2556 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
@@ -2194,39 +2194,40 @@ public class MesHqlPack {
     }
 
     /**
-     * 维修记录
+     * 不良记录
      *
-     * @param mesRepairRecord
+     * @param defectRecord
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesRepairRecord(MesRepairRecord mesRepairRecord, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesRepairRecord, organizeCode);
-        if (!StringUtils.isEmpty(mesRepairRecord.getPartNo())) {
-            DdlPreparedPack.getStringRightLikerPack(mesRepairRecord.getPartNo(), "partNo", packBean);
+    public static DdlPackBean getMesDefectRecord(MesDefectRecord defectRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(defectRecord, organizeCode);
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getSerialNumber())) {
-            DdlPreparedPack.getStringEqualPack(mesRepairRecord.getSerialNumber(), "serialNumber", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getSerialNumber())) {
+            DdlPreparedPack.getStringLikerPack(defectRecord.getSerialNumber(), "serialNumber", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCenterCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCenterCode(), "workCenterCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getWorkCellCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getWorkCellCode(), "workCellCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDefectCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDefectCode(), "defectCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getDefectCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectCode(), "defectCode", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getRepairCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getRepairCode(), "repairCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getWorkOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(defectRecord.getWorkOrderNo(), "workOrderNo", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getDcCode())) {
-            DdlPreparedPack.getStringLikerPack(mesRepairRecord.getDcCode(), "dcCode", packBean);
+        if (!StringUtils.isEmpty(defectRecord.getRepairStatus())) {
+            DdlPreparedPack.getNumEqualPack(defectRecord.getRepairStatus(), "repairStatus", packBean);
         }
-        if (!StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesRepairRecord.getCreateDateTimeEnd())) {
+
+        if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
-                    mesRepairRecord.getCreateDateTimeStart(),
-                    mesRepairRecord.getCreateDateTimeEnd(),
+                    defectRecord.getCreateDateTimeStart(),
+                    defectRecord.getCreateDateTimeEnd(),
                     "createDatetime", packBean, true);
         }
         return packBean;
@@ -2782,8 +2783,8 @@ public class MesHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode);
+    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(mesWorkCellSkill.getOrganizeCode());;
         if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
             DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
         }
@@ -3636,4 +3637,28 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    /**
+     * MES_看板自定义参数配置查询条件封装
+     *
+     * @param boardLineStaffMatrix
+     * @return
+     */
+    public static DdlPackBean getBoardLineStaffMatrix(MesBoardLineStaffMatrix boardLineStaffMatrix) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(boardLineStaffMatrix.getOrganizeCode());
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineStaffMatrix.getUserCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineStaffMatrix.getUserCode(), "userCode", packBean);
+        }
+        return packBean;
+    }
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java
new file mode 100644
index 0000000..f8a5552
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsBjmgnBbacReductModel.java
@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description 北京麦格纳BBAC库存扣减导入MODEL
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2020/11/22 14:46
+ * @Modify
+ */
+@Data
+@Api("北京麦格纳BBAC库存扣减导入MODEL")
+public class WmsBjmgnBbacReductModel implements Serializable {
+    @ApiParam("JIS号")
+    public String jisNo;
+    @ApiParam("物料号")
+    public String partNo;
+    @ApiParam("项目编码")
+    public String projectNo;
+    @ApiParam("客户编码")
+    public String custNo;
+}
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index b0ac2ab..8095d5e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -86,8 +86,6 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam(value = "工单码")
     private String workOrderCode;
 
-    @Column(name = "SEQ_NO")
-    @ApiParam(value = "父位置号")
     private String seqNo;
 
     @Column(name = "SN_TYPE")
@@ -95,13 +93,15 @@ public class WmsDocMovementSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description")
     private Integer snType;
 
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam(value = "目标库位代码")
+    public String destLocateNo;
+
+
     @Transient
     @ApiParam("前端表格编辑使用")
     private Boolean isSet = false;
 
-    @Transient
-    @ApiParam("目标库位代码")
-    public String destLocateNo;
 
     @Transient
     @ApiParam("源库位代码")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
index e34f49c..eac12a1 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
@@ -17,6 +17,7 @@ import javax.persistence.Index;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Version;
+import java.util.List;
 
 /**
  * @Description : PO订单明细信息
@@ -236,6 +237,10 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("汇总收货数量")
     private Double sumRcQty;
 
+    @Transient
+    @ApiParam("单据集合")
+    private List<String> orderNoLst;
+
 
     /**
      * 状态:1=新建,10=收货中,20=收货完成,
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index 23fe0d2..4084304 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -537,6 +537,32 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("原数量")
     private Double srcQty;
 
+    @Transient
+    @ApiParam("库位X")
+    private Integer x;
+
+    @Transient
+    @ApiParam("库位Y")
+    private Integer y;
+
+    @Transient
+    @ApiParam("库位Z")
+    private Integer z;
+
+    public WmsStockSn(String sn, String vendorNo, Integer snStatus, Integer qcStatus, Double qty, String partNo, String partNameRdd, String locateNo, Integer x, Integer y, Integer z) {
+        this.sn = sn;
+        this.vendorNo = vendorNo;
+        this.snStatus = snStatus;
+        this.qcStatus = qcStatus;
+        this.qty = qty;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.locateNo = locateNo;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
     public WmsStockSn() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
index e651958..92d9c88 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoPurchasePartModel.java
@@ -28,7 +28,7 @@ public class WmsAutoPurchasePartModel extends Pager {
     private String unit;
 
     @ApiParam("物料数量")
-    private Integer qty;
+    private Double qty;
 
     @ApiParam("Erp库存地")
     private String erpWarehouse;
@@ -44,8 +44,7 @@ public class WmsAutoPurchasePartModel extends Pager {
 
     private Integer preReceivingDay;
 
-
-    public WmsAutoPurchasePartModel(String partNo, String partName, Integer qty, String warehouse, Integer preReceivingDay) {
+    public WmsAutoPurchasePartModel(String partNo, String partName, Double qty, String warehouse, Integer preReceivingDay) {
         this.partNo = partNo;
         this.partName = partName;
         this.qty = qty;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index cd0c07a..879e3d2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -1753,7 +1753,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
+        //DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
         /*DdlPreparedPack.getOrderByPack(