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/MesPcnEnumUtil.java

@@ -4378,4 +4378,49 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 选配类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum OPTION_TYPE {
+        OPTION(10, "选配件"),
+        BOM_DISASSEMBLY(20, "BOM拆解");
+
+        private int value;
+        private String description;
+
+        OPTION_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(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 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;
+        }
+    }
 }

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

@@ -8711,4 +8711,80 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 悬挂链库存同步状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUSPEN_STOCK_SYNC_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        HANDLED(20, "HANDLED", "已处理"),
+        HANDLE_ERROR(30, "HANDLE_ERROR", "处理错误"),
+        PLC_HANDLE_OUTITME(40, "PLC_HANDLE_OUTITME", "PLC处理超时"),
+        SRC_DATA_ERROR(50, "SRC_DATA_ERROR", "来源数据解析错误");
+
+        private String code;
+        private String description;
+        int value;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        SUSPEN_STOCK_SYNC_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public static String valueOf(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static SUSPEN_STOCK_SYNC_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -86,37 +86,37 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
     @ApiParam("防错码长度")
     private Integer pokeYokeLength;
 
-    @Column(name = "PEST1")
-    @ApiParam("PEST编码1")
-    private String pest1;
+    @Column(name = "PSET1")
+    @ApiParam("PSET1")
+    private String pset1;
 
-    @Column(name = "PEST2")
-    @ApiParam("PEST编码2")
-    private String pest2;
+    @Column(name = "PSET2")
+    @ApiParam("PSET2")
+    private String pset2;
 
-    @Column(name = "PEST3")
-    @ApiParam("PEST编码3")
-    private String pest3;
+    @Column(name = "PSET3")
+    @ApiParam("PSET3")
+    private String pset3;
 
-    @Column(name = "PEST4")
-    @ApiParam("PEST编码4")
-    private String pest4;
+    @Column(name = "PSET4")
+    @ApiParam("PSET4")
+    private String pset4;
 
-    @Column(name = "PEST5")
-    @ApiParam("PEST编码5")
-    private String pest5;
+    @Column(name = "PSET5")
+    @ApiParam("PSET5")
+    private String pset5;
 
-    @Column(name = "PEST6")
-    @ApiParam("PEST编码6")
-    private String pest6;
+    @Column(name = "PSET6")
+    @ApiParam("PSET6")
+    private String pset6;
 
-    @Column(name = "PEST7")
-    @ApiParam("PEST编码7")
-    private String pest7;
+    @Column(name = "PSET7")
+    @ApiParam("PSET7")
+    private String pset7;
 
-    @Column(name = "PEST8")
-    @ApiParam("PEST编码8")
-    private String pest8;
+    @Column(name = "PSET8")
+    @ApiParam("PSET8")
+    private String pset8;
 
     @Column(name = "TORQUE_NO")
     @ApiParam("扭矩枪编号")

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

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/7/15 21:43
+ * @desc
+ */
+@Data
+@AllArgsConstructor
+public class PsetModel {
+
+    private String psetName;
+
+    private Integer psetNum;
+
+    private Integer psetCount;
+
+    private Integer actualCount;
+
+    private boolean torqueStatus;
+}

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

@@ -5,6 +5,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : MES扭矩采集模型
@@ -38,37 +42,37 @@ public class TorqueCollectionModel implements Serializable {
     private String partName;
 
     @ApiParam("PEST编码1")
-    private Integer pest1;
+    private Integer pset1;
 
     @ApiParam("PEST编码2")
-    private Integer pest2;
+    private Integer pset2;
 
     @ApiParam("PEST编码3")
-    private Integer pest3;
+    private Integer pset3;
 
     @ApiParam("PEST编码4")
-    private Integer pest4;
+    private Integer pset4;
 
     @ApiParam("PEST编码5")
-    private Integer pest5;
+    private Integer pset5;
 
     @ApiParam("PEST编码6")
-    private Integer pest6;
+    private Integer pset6;
 
     @ApiParam("PEST编码7")
-    private Integer pest7;
+    private Integer pset7;
 
     @ApiParam("PEST编码8")
-    private Integer pest8;
+    private Integer pset8;
 
     @ApiParam("扭矩枪编号")
     private Integer torqueNo;
 
     @ApiParam("PEST号")
-    private Integer pestNum;
+    private Integer psetNum;
 
     @ApiParam("PEST数量")
-    private Integer pestCount;
+    private Integer psetCount;
 
     /**
      * 1-未采集， 2-已采集, 3-无需打扭矩
@@ -131,6 +135,11 @@ public class TorqueCollectionModel implements Serializable {
     @ApiParam("是否大枪")
     private Integer isPf;
 
+    @ApiParam("psets总数")
+    private Integer psetSum;
+
+    private Map<String, PsetModel> psets = new LinkedHashMap<>();
+
     /**
      * 大枪查询结果构造方法
      *
@@ -175,34 +184,49 @@ public class TorqueCollectionModel implements Serializable {
      * @param colorCode
      * @param partNo
      * @param partName
-     * @param pest1
-     * @param pest2
-     * @param pest3
-     * @param pest4
-     * @param pest5
-     * @param pest6
-     * @param pest7
-     * @param pest8
+     * @param pset1
+     * @param pset2
+     * @param pset3
+     * @param pset4
+     * @param pset5
+     * @param pset6
+     * @param pset7
+     * @param pset8
      * @param torqueNo
      */
     public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode,
-                                 String colorCode, String partNo, String partName, Integer pest1, Integer pest2,
-                                 Integer pest3, Integer pest4, Integer pest5, Integer pest6, Integer pest7, Integer pest8,
-                                 Integer torqueNo) {
+                                 String colorCode, String partNo, String partName, Integer pset1, Integer pset2,
+                                 Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8,
+                                 Integer torqueNo, Integer sendSeq, Integer checkScanCount) {
         this.vinCode = vinCode;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.gradeCode = gradeCode;
         this.colorCode = colorCode;
         this.partNo = partNo;
         this.partName = partName;
-        this.pest1 = pest1;
-        this.pest2 = pest2;
-        this.pest3 = pest3;
-        this.pest4 = pest4;
-        this.pest5 = pest5;
-        this.pest6 = pest6;
-        this.pest7 = pest7;
-        this.pest8 = pest8;
+        this.pset1 = pset1;
+        this.pset2 = pset2;
+        this.pset3 = pset3;
+        this.pset4 = pset4;
+        this.pset5 = pset5;
+        this.pset6 = pset6;
+        this.pset7 = pset7;
+        this.pset8 = pset8;
         this.torqueNo = torqueNo;
+        this.sendSeq = sendSeq;
+        this.checkScanCount = checkScanCount;
+        assemblePsets();
     }
+
+    private void assemblePsets() {
+        psets.put("pset1", new PsetModel("pset1", 1, this.pset1, 0, false));
+        psets.put("pset2", new PsetModel("pset2", 2, this.pset2, 0, false));
+        psets.put("pset3", new PsetModel("pset3", 3, this.pset3, 0, false));
+        psets.put("pset4", new PsetModel("pset4", 4, this.pset4, 0, false));
+        psets.put("pset5", new PsetModel("pset5", 5, this.pset5, 0, false));
+        psets.put("pset6", new PsetModel("pset6", 6, this.pset6, 0, false));
+        psets.put("pset7", new PsetModel("pset7", 7, this.pset7, 0, false));
+        psets.put("pset8", new PsetModel("pset8", 8, this.pset8, 0, false));
+    }
+
 }

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

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 定时同步悬挂链库存数据JOB
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-15 14:47
+ * @Modify:
+ **/
+@Data
+public class WmsSuspenStockSyncModel implements Serializable {
+
+    private static final long serialVersionUID = -6690672187776424774L;
+
+    private String src;// 来源数据
+    private String serverUrl;//地址
+    private Integer namespaceIndex;//命名空间索引，默认为2
+    private String userName;//用户名
+    private String password;//密码
+    private Double requestInterval;//请求间隔,默认为500
+    private String readTagName;//读的地址
+    private String partTagNameA;//物料号A
+    private String partTagNameB;//物料号B
+    private String qtyTagNameA;//数量A
+    private String qtyTagNameB;//数量B
+    private String lotNoTagNameA;//批次A
+    private String lotNoTagNameB;//批次B
+    private String locateTagName;//库位代码
+    private Integer plcExeOutTime;//超时时间
+    private String ackTagName;//修改的地址
+    private Integer tagValueType;//数据类型
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTime.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_TIME")
+@Api("工步参数")
+public class PtlTime extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6674121566943415827L;
+    @Column(name = "MODULE")
+    @ApiParam("组件")
+    private String module;
+
+    @Column(name = "ELAPSE")
+    @ApiParam("耗时")
+    private Long elapse;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位")
+    private String workCellCode;
+
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoFieldModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : PojoField模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ * @Modify:
+ **/
+@Data
+public class PojoFieldModel implements Serializable {
+
+    private static final long serialVersionUID = 366939009033748970L;
+    @ApiParam(value ="属性名")
+    private String fieldName;
+
+    @ApiParam(value ="属性类型")
+    private String fieldType;
+
+    @ApiParam(value ="属性描述")
+    private String fieldDesc;
+
+    @ApiParam(value ="字段名称")
+    private String fieldColumnName;
+
+    @ApiParam(value = "数据来源")
+    private String dataSrc;
+
+    @ApiParam(value = "开窗列表显示列名称")
+    private String listColumnName;
+
+    @ApiParam(value = "开窗搜索列名称")
+    private String searchColumnName;
+
+    @ApiParam(value = "回显列名")
+    private String explicitColumnName;
+
+    @ApiParam(value = "下拉框规则")
+    private Integer selectRule;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/PojoModel.java

@@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.ptl.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Pojo模型
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2020-04-28
+ * @Modify:
+ **/
+@Data
+public class PojoModel implements Serializable {
+    private static final long serialVersionUID = -3491931203656275910L;
+    @ApiParam(value ="包名")
+    private String packageName;
+
+    @ApiParam(value ="POJO类名")
+    private String simpleName;
+
+    @ApiParam(value ="POJO类全名")
+    private String fullName;
+
+    @ApiParam(value ="表名称名")
+    private String tableName;
+
+    @ApiParam(value ="POJO类描述")
+    private String pojoDesc;
+
+    @ApiParam(value ="属性集合")
+    private List<PojoFieldModel> fieldList;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTimeRepository.java

@@ -0,0 +1,10 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlTime;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PtlTimeRepository extends BaseRepository<PtlTime, Long> {
+}

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

@@ -81,6 +81,7 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("备注")
     public String remark;
 
+
     @Column(name = "LOT_NO")
     @ApiParam("批次编号")
     public String lotNo;
@@ -168,9 +169,9 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编号")
     private String vendorNo;
 
-    @Column(name = "SRC_SN")
-    @ApiParam("原条码")
-    public String srcSn;
+    @Column(name = "SERIAl_SN")
+    @ApiParam("产品条码")
+    public String serialSn;
 
     @Transient
     @ApiParam("业务类型编码")

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

@@ -40,8 +40,8 @@ public class WmsRfidOperateRecord extends BaseBean {
 
     @Column(name="OPERATE_TYPE")
     @ApiParam("操作类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.PACKAGE_TYPE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "PACKAGE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.RFID_OPERATE_TYPE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, dataSrc = "RFID_OPERATE_TYPE")
     public Integer operateType;
 
     @Column(name="SRC_LOCATE")

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

@@ -799,5 +799,15 @@ public class WmsStockSn extends BaseBean {
         this.color = color;
     }
 
+    public WmsStockSn(String packageNo, Double qty, String qualityDate, String lotNo, String dateCode, String leftCode, String fixLotNo) {
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.qualityDate = qualityDate;
+        this.lotNo = lotNo;
+        this.dateCode = dateCode;
+        this.leftCode = leftCode;
+        this.fixLotNo = fixLotNo;
+    }
+
 
 }

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

@@ -0,0 +1,117 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description : 悬挂链库存同步数据
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-14 9:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_SUSPEN_STOCK_SYNC", indexes = {
+        @Index(columnList = "ORGANIZE_CODE")
+})
+@Api("悬挂链库存同步数据")
+public class WmsSuspenStockSync extends BaseBean {
+
+    @Column(name = "SRC")
+    @ApiParam(value = "数据来源")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String src;
+
+    @Column(name = "SERVER_URL")
+    @ApiParam(value = "服务地址")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String serverUrl;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String locateNo;
+
+    @Column(name = "PART_NO_A")
+    @ApiParam(value = "物料号A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNoA;
+
+    @Column(name = "PART_NO_B")
+    @ApiParam(value = "物料号B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String partNoB;
+
+    @Column(name = "QTY_A")
+    @ApiParam(value = "数量A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double qtyA;
+
+    @Column(name = "qty_b")
+    @ApiParam(value = "数量B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private Double qtyB;
+
+    @Column(name = "LOT_NO_A")
+    @ApiParam(value = "批次A")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNoA;
+
+    @Column(name = "LOT_NO_B")
+    @ApiParam(value = "批次B")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNoB;
+
+    @Column(name = "STATUS")
+    @ApiParam(value = "状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SUSPEN_STOCK_SYNC_STATUS.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
+    private Integer status;
+
+    @Column(name = "ERROR_MSG")
+    @ApiParam(value = "错误信息")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String errorMsg;
+
+    @Transient
+    @ApiParam(value = "物料数组集")
+    private String[] partNos;
+
+    @Transient
+    @ApiParam(value = "数量数组集")
+    private Double[] qtys;
+
+    @Transient
+    @ApiParam(value = "批次数组集")
+    private String[] lotNos;
+
+    @Transient
+    @ApiParam(value = "物料数据List")
+    private List<WmsPart> partList;
+
+    @Transient
+    @ApiParam(value = "物料数据Map")
+    private Map<String, WmsPart> partNameMap;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSuspenStockSyncRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsSuspenStockSync;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-07-14 10:33
+ * @Modify:
+ **/
+@Repository
+public interface WmsSuspenStockSyncRepository extends BaseRepository<WmsSuspenStockSync, Long> {
+}