diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
index bc61bd2..a8890ef 100644
--- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
+++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java
@@ -75,7 +75,7 @@ public class AndonBoardModel implements Serializable {
     private String color;
 
     @ApiParam("停线时间比率")
-    private Integer downtimeRate;
+    private String downtimeRate;
 
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 28db666..fc5f9a9 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@@ -6028,4 +6028,39 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIS_BACKFLUSH_STATUS {
+        BACKFLUSH("BACKFLUSH", "正常回冲扣减"),
+        REPAIR("REPAIR", "返修冲料");
+
+        private String value;
+        private String description;
+
+        JIS_BACKFLUSH_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }
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 9f15432..e79dec4 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
@@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
                            String partNo, String prodCfgTypeCode) {
         this.id = id;
+        this.orderNo = orderNo;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
index c1994c1..ebc4348 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java
@@ -41,6 +41,10 @@ public class MgnBjBoardModel implements Serializable {
     private Integer onceQualityRate = 0;
     @ApiParam("待生产订单数量")
     private Integer waitProduceQty = 0;
+    @ApiParam("低于安全库存")
+    private Integer minStockQty;
+    @ApiParam("超出最大库存")
+    private Integer maxStockQty;
 
     @ApiParam(value = "显示颜色")
     private String color;
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 a960c29..37bdaec 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
@@ -437,7 +437,7 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
-        DdlPreparedPack.getStringLikerPack(mesPackage.getLotNo(), "lotNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean);
 
         // 时间段查询
         DdlPreparedPack.timeBuilder(
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
index 94e14e5..37d66bb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@@ -362,4 +362,14 @@ public class WmsPart extends BaseBean {
         this.snp = snp;
         this.partSpec = partSpec;
     }
+
+    public WmsPart(String partNo, String partName, String partSpec, Double snp, String buyUnit, Integer snControl, Double qty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.partSpec = partSpec;
+        this.snp = snp;
+        this.buyUnit = buyUnit;
+        this.snControl = snControl;
+        this.qty = qty;
+    }
 }