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 10cc3b3..d328625 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
@@ -3656,7 +3656,9 @@ public class MesEnumUtil {
     public enum QUEUE_ORDER_DETAIL_STATUS {
 
         NORMAL(10, "正常"),
-        CLOSE(20, "关闭");
+        CLOSE(20, "关闭"),
+        FINISH(30, "完成"),
+        OFF_LINE_REWORK(40, "线下返修");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
index ca4851d..90569c7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer alreadyLandedNum;
 
     @Transient
+    @ApiParam("当前库存")
+    private Integer currentStock;
+
+    @Transient
     @ApiParam("物料名称")
     private String partName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java
index c6aa422..8048ccc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/SkillsUserModel.java
@@ -28,6 +28,12 @@ public class SkillsUserModel {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @ApiParam(value ="工位")
+    private String workCellCode;
+
+    @ApiParam(value ="产线")
+    private String workCenterCode;
+
     @ApiParam("技能矩阵信息")
     private List<MesUserSkill> mesUserSkillList;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
similarity index 78%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
index fee720e..9827255 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
@@ -5,6 +5,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -13,10 +14,12 @@ import java.util.List;
  * @Modify:
  */
 @Data
-public class BjBoardModel implements Serializable {
+public class MgnBjBoardModel implements Serializable {
 
     @ApiParam("jsa数量")
     private Integer jsaQty;
+    @ApiParam("jsa数量")
+    private Integer jsaRate;
     @ApiParam("完成数量")
     private Integer completeQty;
     @ApiParam("总数量")
@@ -36,6 +39,8 @@ public class BjBoardModel implements Serializable {
     @ApiParam("x坐标内容")
     private List<String> xAxisList;
 
+    private Map<String, Object> resultMap;
+
     @ApiParam("显示数据")
-    private List<BjBoardSeriesModel> seriesModels;
+    private List<MgnBjBoardSeriesModel> seriesModels;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java
similarity index 89%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java
index 3b113ee..63c7999 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java
@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  */
 @Data
-public class BjBoardSeriesModel {
+public class MgnBjBoardSeriesModel {
     @ApiParam("名称")
     private String name;
     @ApiParam("显示数量")
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java
similarity index 89%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java
index 67ed3eb..31a7723 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java
similarity index 89%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java
index 6ea1cca..24c85fc 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java
similarity index 94%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java
index be1576f..3df8072 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java
similarity index 91%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java
index 7b7fdc9..6eddfc7 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java
similarity index 95%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java
index b1219aa..d56f13a 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java
similarity index 69%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java
index e85a236..1975611 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java
@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 
 import java.util.List;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java
similarity index 89%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java
index 45c78ff..a3fb79c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java
similarity index 96%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java
index 63d2725..a1b7261 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java
similarity index 88%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java
index 6916568..833a28c 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java
similarity index 94%
rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java
rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java
index 9822683..b102a5d 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java
@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;
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 6a6e8bc..e8acac3 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
@@ -241,10 +241,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
         }
         if (mesQueueOrder.getQueueType() != null) {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);