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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java

@@ -71,6 +71,10 @@ public class Operation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="CONS_TYPE")
     @ApiParam(value ="接续方式")
     @FieldAnnotation(defaultValue = "ES")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -17,6 +17,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -126,6 +127,11 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String lockTime;
 
+    @ApiParam(value ="是否存在任务冲突")
+    @FieldAnnotation(property = false)
+    @Transient
+    private boolean hasConflict;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -57,6 +57,10 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="分割批量")
     private Double batch;
 
+    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="分割余数")
+    private Double remainder;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java

@@ -3,16 +3,14 @@ package cn.estsh.i3plus.pojo.aps.model;
 import lombok.Data;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 @Data
 public class ShiftReportModel {
     private List<String> dates = new ArrayList<>();
     private List<String> headers = new ArrayList<>();
-    private Set<String> labels = new HashSet<>();
+    private List<String> labels = new ArrayList<>();
 
     private List<Map<String, List<String>>> datas = new ArrayList<>();
 }

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

@@ -709,7 +709,8 @@ public class ApsEnumUtil {
         NONE("NONE", "不分割"),
         RATIO("RATIO", "按比例分割"),
         COUNT("COUNT", "按数量分割"),
-        BATCH("BATCH", "按批量分割");
+        BATCH("BATCH", "按批量分割"),
+        REMAINDER("REMAINDER", "按余数分割");
 
         private String value;
         private String description;

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

@@ -6691,4 +6691,62 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * QAD 解析对象
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QAD_DATA_OBJECT {
+        BOM("soapenv#Envelope#SyncBOM", "getBomList", "MesBom","BOM"),
+        CUSTOMER_PART("soapenv#Envelope#SyncCustomerItem","getCustomerPartList",  "MesCustomerPart","客户物料号"),
+        CUSTOMER("soapenv#Envelope#SyncCustomer","getCustomerList",  "MesCustomer","客户信息"),
+        PART("soapenv#Envelope#SyncItem","getPartList",  "MesPart","物料信息");
+
+        private String code;
+        private String method;
+        private String objectCode;
+        private String description;
+
+        QAD_DATA_OBJECT(String code, String method, String objectCode, String description) {
+            this.code = code;
+            this.method = method;
+            this.objectCode = objectCode;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getMethod() {
+            return method;
+        }
+
+        public String getObjectCode() {
+            return objectCode;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static QAD_DATA_OBJECT getByCode(String code) {
+            for (QAD_DATA_OBJECT qadDataObject : values()) {
+                if (qadDataObject.getCode().equals(code)) {
+                    return qadDataObject;
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -81,6 +81,10 @@ public class MesBom extends BaseBean implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String effEndTime;
 
+    @Column(name = "BOM_CODE")
+    @ApiParam("BOM代码")
+    private String bomCode;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }

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

@@ -165,4 +165,8 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @Column(name = "MULTIMEDIA_PLUG_QTY")
     @ApiParam("多媒体插头数量")
     private Double multimediaPlusQty;
+
+    @Column(name = "QUALIFIED_COUNT")
+    @ApiParam("应收合格数")
+    private Double qualifiedCount;
 }

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

@@ -88,6 +88,9 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("确认扫描次数")
     private Integer checkScanCount;
 
+    @ApiParam("实际确认扫描次数")
+    private Integer actualCheckScanCount;
+
     @ApiParam("组合码发送顺序")
     private Integer sendSeq;
 
@@ -103,8 +106,31 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("是否黄枪")
     private Integer isYellowGun;
 
+    @ApiParam("应收合格数")
+    private Double qualifiedCount;
+
+    @ApiParam("实际合格数")
+    private Double actualQualifiedCount;
+
+    @ApiParam("工步信息行颜色")
+    private String color;
+
+    @ApiParam("扭矩显示信息")
+    private String torqueInfo;
+    @ApiParam("扭矩颜色")
+    private String torqueColor;
+
+    @ApiParam("绑定关键件信息")
+    private String bindPartKeyInfo;
+    @ApiParam("绑定关键件颜色")
+    private String bindPartKeyColor;
+
+    @ApiParam("是否大枪")
+    private Integer isPf;
+
     /**
      * 大枪查询结果构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode
@@ -120,7 +146,7 @@ public class TorqueCollectionModel implements Serializable {
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo,
                                  String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq,
-                                 Integer yellowGunRule, Integer isEndSeq, String groupCode) {
+                                 Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
@@ -133,10 +159,13 @@ public class TorqueCollectionModel implements Serializable {
         this.yellowGunRule = yellowGunRule;
         this.isEndSeq = isEndSeq;
         this.groupCode = groupCode;
+        this.isPf = isPf;
+        this.qualifiedCount = qualifiedCount;
     }
 
     /**
      * 小枪结果数据构造方法
+     *
      * @param vinCode
      * @param prodCfgTypeCode
      * @param gradeCode