Merge branch 'test' into dev

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -8787,78 +8787,4 @@ public class WmsEnumUtil {
             return null;
         }
     }
-
-    /**
-     * 悬挂链库存同步数据来源
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SUSPEN_STOCK_SYNC_DATA_SRC {
-        IP(10, "IP", "IP"),
-        DF(20, "DF", "DF"),
-        DR(30, "DR", "DR");
-
-        int value;
-        private String code;
-        private String description;
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getCode() {
-            return code;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        SUSPEN_STOCK_SYNC_DATA_SRC(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_DATA_SRC codeOf(String code) {
-            if (StringUtils.isEmpty(code)) {
-                return null;
-            } else {
-                for (int i = 0; i < values().length; i++) {
-                    if (values()[i].code.equalsIgnoreCase(code)) {
-                        return values()[i];
-                    }
-                }
-            }
-            return null;
-        }
-    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -60,6 +60,9 @@ public class ProdPackModel implements Serializable {
     @ApiParam("物料号")
     public String parentPartNo;
 
+    @ApiParam("是否封箱")
+    public Integer isSealed;
+
     public ProdPackModel() {
     }
 
@@ -77,4 +80,11 @@ public class ProdPackModel implements Serializable {
         this.printStatus = printStatus;
         this.modifyDatetime = modifyDatetime;
     }
+
+    public ProdPackModel(Integer isSealed,String serialNumber, String packageNo, String createDatetime) {
+        this.isSealed = isSealed;
+        this.serialNumber = serialNumber;
+        this.packageNo = packageNo;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -62,4 +62,7 @@ public class StationResultBean<T> implements Serializable {
 
     @ApiParam("工位参数")
     private Map<String, String> wcpcMap = new HashMap<>();
+
+    @ApiParam("定时秒数")
+    private Integer timer;
 }

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -18,5 +18,7 @@ public class PsetModel {
 
     private Integer psetCount;
 
+    private Integer actualCount;
+
     private boolean torqueStatus;
 }

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

@@ -219,14 +219,14 @@ public class TorqueCollectionModel implements Serializable {
     }
 
     private void assemblePsets() {
-        psets.put("pset1", new PsetModel("pset1", 1, this.pset1, false));
-        psets.put("pset2", new PsetModel("pset2", 2, this.pset2, false));
-        psets.put("pset3", new PsetModel("pset3", 3, this.pset3, false));
-        psets.put("pset4", new PsetModel("pset4", 4, this.pset4, false));
-        psets.put("pset5", new PsetModel("pset5", 5, this.pset5, false));
-        psets.put("pset6", new PsetModel("pset6", 6, this.pset6, false));
-        psets.put("pset7", new PsetModel("pset7", 7, this.pset7, false));
-        psets.put("pset8", new PsetModel("pset8", 8, this.pset8, false));
+        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-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>
+    <version>1.0-TEST-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>