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

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

@@ -6640,4 +6640,113 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 队列 料架摆放位置
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GROUP_SIDE {
+        POSITIVE(10, "A", "正面"),
+        REVERSE_SIDE(20, "B", "背面");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        GROUP_SIDE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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 String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            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/MesJitIssueCfg.java

@@ -36,7 +36,7 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     private String custPlantCode;
 
     @Column(name = "QTY")
-    @ApiParam("数量")
+    @ApiParam("配置数量")
     private Integer qty;
 
     @Column(name = "THRESHOLD_QTY")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable {
     @Column(name = "CNT_QTY")
     @ApiParam("累计数")
     private Integer cntQty;
+
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
 }

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description :MES_QUEUE_GROUP_COUNT
+ * @Description :
  * @Reference :
  * @Author : joke
  * @CreateDate : 2020-03-06 10:16 上午

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

@@ -116,6 +116,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
     @ApiParam("已生产数量")
     private Double finsihQty;
 
+    @Column(name = "GROUP_SIDE")
+    @ApiParam("料架摆放位置")
+    private String groupSide;
+
     @Transient
     @ApiParam("Vin")
     private String vinCode;

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

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

@@ -235,7 +235,7 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus,
                          String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode,
-                         String createDatetime, String createUser, String modifyUser, String modifyDatetime) {
+                         String createDatetime, String createUser, String modifyUser, String modifyDatetime, String refSrc) {
         this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
@@ -256,6 +256,7 @@ public class WmsMoveMaster extends BaseBean {
         this.createUser = createUser;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.refSrc = refSrc;
     }
 
     public WmsMoveMaster(Long itemQty , String transTypeCode , Integer orderStatus){

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

@@ -94,6 +94,10 @@ public class WmsSerialSn extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String packageNo;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    private String lotNo;
+
     public WmsSerialSn() {
 
     }

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

@@ -84,6 +84,11 @@ public class WmsShippingFlag extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String flagFax;
 
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam(value = "存储区")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String destZoneNo;
+
     @Column(name="TEMPLATE_NO")
     @ApiParam("模板编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST,  getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -199,6 +199,7 @@ public class WmsHqlPack {
         //查询参数封装
         DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringLikerPack(wmsPackage.getMemo(), "memo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsPackage.getLocateNo(), "locateNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean);
         DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean);
         DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean);

sonar-project.properties

@@ -6,11 +6,11 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-DEV-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./
 #sonar.java.binaries=target
  
 # Encoding of the source code. Default is default system encoding
-sonar.sourceEncoding=UTF-8
+sonar.sourceEncoding=UTF-8