Merge remote-tracking branch 'origin/test' into test

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

@@ -5165,7 +5165,8 @@ public class MesEnumUtil {
         BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
         BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
-        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
+        BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
+        BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板");
 
         private String code;
         private String description;
@@ -6786,4 +6787,50 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -2592,7 +2592,8 @@ public class MesPcnEnumUtil {
         FORM("form", "文本按钮"),
         SPEC_TEXT("spec_text", "工步弹框文本"),
         IMAGE_LIST("image_list", "图片列表"),
-        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
+        SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格"),
+        BACKGROUND_COLOR_TEXT("BACKGROUND_COLOR_TEXT", "背景色文字");
 
         private String value;
         private String description;
@@ -4023,7 +4024,8 @@ public class MesPcnEnumUtil {
         JUMP_PROCESS(10, "跳过工序"),
         JUMP_STEP(20, "跳过工步"),
         JUMP_STATE(30, "跳过状态点"),
-        ABNORMAL_DEDUCTION(40, "扣减异常");
+        ABNORMAL_DEDUCTION(40, "扣减异常"),
+        REDO_STATION(50, "工位重做");
 
         private int value;
         private String description;

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

@@ -56,6 +56,30 @@ public class MesBoardPlanCapacity extends BaseBean implements Serializable {
     @ApiParam("计划产量")
     private Integer planCapacity;
 
+    @Column(name = "MONTH_PLAN_CAPACITY")
+    @ApiParam("月计划产量")
+    private Integer monthPlanCapacity;
+
+    @Column(name = "HOUR_CAPACITY")
+    @ApiParam("时段产能")
+    private Integer hourCapacity;
+
+    @Column(name = "STOP_TIME")
+    @ApiParam("停机时间")
+    private Integer stopTime;
+
+    @Column(name = "ACTUAL_CAPACITY")
+    @ApiParam("今日产量")
+    private Integer actualCapacity;
+
+    @Column(name = "PLAN_TAKT")
+    @ApiParam("计划节拍")
+    private Integer planTakt;
+
+    @Column(name = "IS_MANUAL")
+    @ApiParam("是否手工展示")
+    private Integer isManual;
+
     @Transient
     @ApiParam("班次名称")
     private String shiftName;

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

@@ -39,14 +39,22 @@ public class MesCustomerPart extends BaseBean implements Serializable {
     private String partNo;
 
     @Column(name = "CUSTOMER_PART_NO")
-    @ApiParam("客户零件号")
+    @ApiParam("客户物料号")
     private String customerPartNo;
 
     @Column(name = "CUSTOMER_PART_NAME")
-    @ApiParam("客户零件描述")
+    @ApiParam("客户物料名称")
     private String customerPartName;
 
+    @Column(name = "CUSTOMER_PART_COLOR")
+    @ApiParam("客户物料颜色")
+    private String customerPartColor;
+
+    @Column(name = "QTY")
+    @ApiParam("用量")
+    private Double qty;
+
     @Column(name = "CUSTOMER_CFG_CODE")
-    @ApiParam("客戶配置代碼")
+    @ApiParam("客户配置代码")
     private String customerCfgCode;
 }

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

@@ -108,6 +108,14 @@ public class MesOee extends BaseBean implements Serializable {
     @ApiParam("OEE")
     private Double oee;
 
+    @Column(name = "TARGET_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE目标值")
+    private Double targetOee;
+
+    @Column(name = "MIN_OEE", columnDefinition = "decimal(18,3)")
+    @ApiParam("OEE警戒值")
+    private Double minOee;
+
     @Column(name = "BUSI_DATA")
     @ApiParam("自定义数据")
     private String busiData;

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

@@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/7/28 2:37 下午
+ * @Modify:
+ */
+@Data
+public class BiModel {
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @ApiParam("运行状态")
+    private String runningStatus;
+
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @ApiParam(value = "物料名称")
+    private String partName;
+
+    @ApiParam(value = "计划数量")
+    private double planQty;
+
+    @ApiParam(value = "产量")
+    private double outputQty;
+
+    @ApiParam(value = "完成率")
+    private double completeRate;
+
+    @ApiParam(value = "合格数量")
+    private double passQty = 0;
+
+    @ApiParam(value = "不良数量")
+    private double ngQty = 0;
+
+    @ApiParam(value = "实际数量")
+    private double actualQty = 0;
+
+    @ApiParam(value = "合格率")
+    private double passRate;
+
+    @ApiParam(value = "不良率")
+    private double ngRate;
+
+    @ApiParam(value = "警戒值")
+    private double sentinelValue;
+
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxis;
+
+    @ApiParam("一些携带值 eg:异常类型，异常次数")
+    private Map<String, Object> carryMap;
+
+    @ApiParam("图表显示的数据")
+    private List<ProductBiSeriesModel> series;
+
+    @ApiParam("列名")
+    private Map<String, String> colMap;
+
+    @Deprecated
+    public double getCompleteRate() {
+        if (this.planQty != 0) {
+            this.completeRate = outputQty / planQty;
+        } else {
+            this.completeRate = 0;
+        }
+        return this.completeRate;
+    }
+}

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

@@ -3,8 +3,6 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Transient;
-
 /**
  * @Description:
  * @Author: jokelin
@@ -25,10 +23,15 @@ public class OperateObjectParamModel {
     @ApiParam("日期")
     private String oeeDate;
 
+    @ApiParam("开始日期")
+    private String startDate;
+
+    @ApiParam("结束日期")
+    private String endDate;
+
     @ApiParam("开始时段")
     private String startTime;
 
-    @Transient
     @ApiParam("结束时段")
     private String endTime;
 

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.mes;
 
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -143,6 +144,10 @@ public class TorqueCollectionModel implements Serializable {
 
     private Map<String, PsetModel> psets = new LinkedHashMap<>();
 
+    public TorqueCollectionModel(String vinCode) {
+        this.vinCode = vinCode;
+    }
+
     /**
      * 大枪查询结果构造方法
      *

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/BaseComponetsParam.java

@@ -36,4 +36,6 @@ public abstract class BaseComponetsParam implements Serializable {
 
     @ApiParam(value = "工厂代码")
     public String organizeCode;
+
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java

@@ -52,4 +52,7 @@ public class TransSnModle extends BaseComponetsParam implements Serializable {
 
     @ApiParam(value = "新条码")
     public WmsStockSn NewWmsStockSn;
+
+    @ApiParam(value = "拆分条码")
+    public Integer splitSn;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsModeTransport.java

@@ -1,3 +1,4 @@
+
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
@@ -36,11 +37,6 @@ public class WmsModeTransport extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String organizeName;
 
-    @Column(name = "ORGANIZE_CODE")
-    @ApiParam(value = "工厂代码")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
-    private String organizeCode;
-
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输方式")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, dataSrc = "TRANSPORT_TYPE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsDocMovementMasterDto.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :单据
+ * @Reference :
+ * @Author :puxiao.liao
+ * @CreateDate : 2020-07-21 2:37 下午
+ * @Modify:
+ **/
+@Data
+@Api("单据")
+public class WmsDocMovementMasterDto implements Serializable {
+
+    private static final long serialVersionUID = -1388177116144308137L;
+
+    @ApiParam("工厂编号")
+    private String organizeCode;
+
+    @ApiParam("单据明细")
+    private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
+
+}