Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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;
+
 
 }

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;
+
 }

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;