diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
index 991b3a1..30cbe36 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
@@ -104,4 +104,8 @@ public class IfDismantleRecord extends BaseBean implements Serializable {
     @Column(name = "IF_CODE")
     @ApiParam("接口代码")
     private String ifCode;
+
+    @Column(name = "DEFECT_CODE")
+    @ApiParam("缺陷代码")
+    private String defectCode;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
index 1a8a0d8..ffc36d6 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@@ -220,6 +220,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
         return this.qty == null ? 0.0d : this.qty;
     }
 
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
     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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java
index e159d8e..6d2a731 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
@@ -152,6 +152,10 @@ public class MesStationBom extends BaseBean implements Serializable {
     private Integer length;
 
     @Transient
+    @ApiParam("缺陷代码")
+    private String defectCode;
+
+    @Transient
     @ApiParam("校验内容")
     private String checkContent;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
index 70b769e..b737470 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java
@@ -119,6 +119,15 @@ public class QueueOrderModel implements Serializable {
     public QueueOrderModel() {
     }
 
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getFinsihQtyVal() {
+        return this.finsihQty == null ? 0.0d : this.finsihQty;
+    }
+
+
     public QueueOrderModel(Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) {
         this.queueSeq = queueSeq;
diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
index ff6f6bc..a472e9f 100644
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
@@ -1232,4 +1232,23 @@ public class CoreHqlPack {
         return ddlPackBean;
     }
 
+
+    public static DdlPackBean packHqlCheckSysDepartmentOnly(SysDepartment sysDepartment){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysDepartment);
+
+        DdlPreparedPack.getNumNOEqualPack(sysDepartment.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysDepartment.getDepartmentCode(), "departmentCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    public static DdlPackBean packHqlCheckSysOrganizeOnly(SysOrganize sysOrganize){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysOrganize);
+
+        DdlPreparedPack.getNumNOEqualPack(sysOrganize.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysOrganize.getOrganizeCode(), "organizeCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }
\ No newline at end of file
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 dac4976..b21f150 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
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -54,6 +56,7 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "CASE_TYPE_ID")
     @ApiParam(value = "套件类型id(枚举)")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.CASE_TYPE.class)
     private Integer caseTypeId;
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
@@ -81,8 +84,14 @@ public class BsSuitDataDetail extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
+    public String getProcessStateTxt() {
+        return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
+                BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
+    }
+
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")
     private String processTime;