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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java

@@ -1211,7 +1211,7 @@ public class AndonEnumUtil {
         QUALITY("QUALITY_ALARM", 110060105, "质量", "#9084FF"),
         PART("PART_ALARM", 110060104, "物料", "#24BDBA"),
         PROCESS("ROUTING_ALARM", 110060107, "工艺", "#2B97F9"),
-        CHECK("OTHER_ALARM", 110060108, "自处理", "#EAA510"),
+        CHECK("OTHER_ALARM", 110060108, "工装", "#EAA510"),
         FIX_ERROR("FIX_ERROR", 110060109, "自动报警", "#797B7F");
 
         private String value;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -5565,14 +5565,15 @@ public class MesEnumUtil {
 
 
     /**
-     * 运算对象代码
+     * 运算对象代码 Period capacity
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
         ORGANIZE_OEE_HOUR("ORGANIZE_OEE_HOUR", "工厂OEE(小时)"),
         ORGANIZE_OEE_DAY("ORGANIZE_OEE_DAY", "工厂OEE(天)"),
         WORK_CENTER_OEE_DAY("WORK_CENTER_OEE_DAY", "产线OEE(天)"),
-        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)");
+        EQU_OEE_DAY("EQU_OEE_DAY", "设备OEE(天)"),
+        PERIOD_CAPACITY("PERIOD_CAPACITY", "时段产能");
 
         private String value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4566,4 +4566,23 @@ public class MesPcnEnumUtil {
 
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PTL_IS_LIGHT {
+
+        IS_PICK_LIGHT(10, "不需亮灯");
+
+        private int value;
+        private String description;
+
+        MES_PTL_IS_LIGHT(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdWorkCenter.java

@@ -47,4 +47,12 @@ public class MesProdWorkCenter extends BaseBean implements Serializable {
     @Column(name = "PART_SN")
     @ApiParam("料箱条码")
     private String partSn;
+
+    @Column(name = "TARGET_PASS_RATE")
+    @ApiParam("目标合格率")
+    private Double targetPassRate;
+
+    @Column(name = "PRIORITY_ORDER")
+    @ApiParam("优先级顺序")
+    private Integer priorityOder;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java

@@ -72,7 +72,7 @@ public class MesWorkCell extends BaseBean implements Serializable {
 
     @Column(name = "TARGET_PASS_RATE")
     @ApiParam("目标合格率")
-    private Integer targetPassRate;
+    private Double targetPassRate;
 
     @Transient
     @ApiParam(value = "子集列表")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BiModel.java

@@ -59,6 +59,9 @@ public class BiModel {
     @ApiParam(value = "不合格数")
     private double unQualifiedQty = 0;
 
+    @ApiParam("目标合格率")
+    private double targetPassRate;
+
     @ApiParam("客户代码")
     private String customerCode;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BoardModel.java

@@ -55,11 +55,14 @@ public class BoardModel {
     private Integer hourCapacity;
 
     @ApiParam("计划节拍")
-    private Integer planTakt;
+    private Integer planTakt = 0;
 
     @ApiParam("今日完成产量")
     private Integer completeCapacity = 0;
 
+    @ApiParam("时段产能")
+    private Integer periodCapacity = 0;
+
     @ApiParam("看板时段计划产量")
     private List<MesBoardShiftSectionCapacity> boardShiftSectionCapacityList;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/OperateObjectParamModel.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
 /**
  * @Description:
  * @Author: jokelin
@@ -24,10 +25,10 @@ public class OperateObjectParamModel {
     private String oeeDate;
 
     @ApiParam("开始日期")
-    private String startDate;
+    private String startDatetime;
 
     @ApiParam("结束日期")
-    private String endDate;
+    private String endDatetime;
 
     @ApiParam("开始时段")
     private String startTime;