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

5 years ago · 0ddd92e4f8
parent 0bafa0de52 222ba4f8a4
commit 0ddd92e4f8
22 changed files with 46 additions and 24 deletions
--- a/modules/i3plus-pojo-andon/pom.xml
+++ b/modules/i3plus-pojo-andon/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-andon</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-aps/pom.xml
+++ b/modules/i3plus-pojo-aps/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-aps</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/modules/i3plus-pojo-base/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-base</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -2565,17 +2565,19 @@ public class MesEnumUtil {
    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
    public enum MES_QC_CHECK_TYPE {

-        IN_MATERIAL_CHECK(5, "来料检验"),
-        FIRST_CHECK(10, "首检"),
-        ON_SITE_CHECK(20, "巡检"),
-        END_CHECK(30, "尾检"),
-        EDELIVERY_CHECK(40, "发货");
+        IN_MATERIAL_CHECK(5, "IN_MATERIAL_CHECK", "来料检验"),
+        FIRST_CHECK(10, "FIRST_CHECK", "首检"),
+        ON_SITE_CHECK(20, "ON_SITE_CHECK", "巡检"),
+        END_CHECK(30, "END_CHECK", "尾检"),
+        EDELIVERY_CHECK(40, "EDELIVERY_CHECK", "发货");

        private int value;
+        private String code;
        private String description;

-        MES_QC_CHECK_TYPE(int value, String description) {
+        MES_QC_CHECK_TYPE(int value, String code, String description) {
            this.value = value;
+            this.code = code;
            this.description = description;
        }

@ -2583,6 +2585,8 @@ public class MesEnumUtil {
            return value;
        }

+        public String getCode() {return code;}
+
        public String getDescription() {
            return description;
        }
--- a/modules/i3plus-pojo-form/pom.xml
+++ b/modules/i3plus-pojo-form/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-form</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-hardswitch/pom.xml
+++ b/modules/i3plus-pojo-hardswitch/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-hardswitch</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>
--- a/modules/i3plus-pojo-ics/pom.xml
+++ b/modules/i3plus-pojo-ics/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-ics</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-jobflow/pom.xml
+++ b/modules/i3plus-pojo-jobflow/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-jobflow</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>
--- a/modules/i3plus-pojo-lac/pom.xml
+++ b/modules/i3plus-pojo-lac/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-lac</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-mes-pcn/pom.xml
+++ b/modules/i3plus-pojo-mes-pcn/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-mes-pcn</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/modules/i3plus-pojo-mes/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-mes</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java
@ -130,6 +130,10 @@ public class MesPlc extends BaseBean implements Serializable {
    @ApiParam("密码")
    private String password;

+    @Column(name = "DEFAULT_RULE")
+    @ApiParam("默认赋值属性")
+    private String defaultRule;
+
    @Transient
    @ApiParam("设备名称")
    private String equipmentName;
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderDetailRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderDetailRepository extends BaseRepository<MesQcOrderDetail, Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderRepository.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesQcOrderRepository extends BaseRepository<MesQcOrder, Long> {
+}
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/modules/i3plus-pojo-model/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-model</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/modules/i3plus-pojo-platform/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-platform</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-ptl/pom.xml
+++ b/modules/i3plus-pojo-ptl/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-ptl</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-report/pom.xml
+++ b/modules/i3plus-pojo-report/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-report</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-softswitch/pom.xml
+++ b/modules/i3plus-pojo-softswitch/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-softswitch</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>

--- a/modules/i3plus-pojo-sweb/pom.xml
+++ b/modules/i3plus-pojo-sweb/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-sweb</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/modules/i3plus-pojo-wms/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-wms</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <dependencies>
        <dependency>
--- a/modules/i3plus-pojo-workflow/pom.xml
+++ b/modules/i3plus-pojo-workflow/pom.xml
@ -12,7 +12,6 @@

    <artifactId>i3plus-pojo-workflow</artifactId>
    <packaging>jar</packaging>
-    <version>1.0-DEV-SNAPSHOT</version>

    <profiles>
        <profile>