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

7 years ago · 42b8443073
parent 952d88c5f1 10939f8087
commit 42b8443073
10 changed files with 12 additions and 40 deletions
--- a/modules/i3plus-pojo-base/pom.xml
+++ b/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>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@ -120,16 +120,6 @@ public class CommonEnumUtil {
            }
            return tmp;
        }
-
-        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;
-        }
    }

    /**
--- a/modules/i3plus-pojo-mes/pom.xml
+++ b/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>
--- a/modules/i3plus-pojo-model/pom.xml
+++ b/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>
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/CheckPointModel.java
@ -41,4 +41,5 @@ public class CheckPointModel {
     *实际抽点数量【从前端输入获取】
     */
    private Integer actQty;
+
 }
--- a/modules/i3plus-pojo-platform/pom.xml
+++ b/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>
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;

 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@ -15,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;

 /**
 * @Description : 单号规则
@ -61,36 +58,20 @@ public class SysOrderNoRule extends BaseBean {
    private Long serialNoLength;

    @Column(name = "IS_CYCLE")
-    @ApiParam(value = "达到最大值后是否循环",example = "1",hidden = true)
+    @ApiParam(value = "达到最大值后是否循环",example = "1")
    private Integer isCycle;

-    @Transient
-    @ApiParam(value = "达到最大值后是否循环",example = "否")
-    private String isCycleName;
-
-    public String getIsCycleName() {
-        if(isCycle != null){
-            CommonEnumUtil.TRUE_OR_FALSE.valueOf(isCycle);
-        }
-        return isCycleName;
-    }
-
-    public void setIsCycleName(String isCycleName) {
-        this.isCycleName = isCycleName;
-        this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName);
-    }
-
    @Column(name = "SERIAL_NO")
-    @ApiParam(value = "当前流水号",example = "-1",hidden = true)
+    @ApiParam(value = "当前流水号",example = "-1")
    @JsonSerialize(using = ToStringSerializer.class)
    private Long serialNo;

    @Column(name = "ORDER_NO")
-    @ApiParam(value = "当前单号",hidden = true)
+    @ApiParam(value = "当前单号")
    private String orderNo;

    @Column(name = "ORDER_NO_RULE_STATUS")
-    @ApiParam(value = "单号规则状态",hidden = true)
+    @ApiParam(value = "单号规则状态")
    private Integer orderNoRuleStatus;

    @Column(name="ORDER_NO_RULE_DESCRIPTION")
--- a/modules/i3plus-pojo-wms/pom.xml
+++ b/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>
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
@ -18,7 +18,7 @@ import javax.persistence.Table;
 * @Author : hansen.ke
 * @CreateDate : 2018-11-28 15:20
 * @Modify:
- *  2018-12-10 10:39:46
+ *  2018-12-10 10:39:46 Test
 **/
@Data
@Entity
--- a/pom.xml
+++ b/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>