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

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

@@ -1259,6 +1259,15 @@ public class CommonEnumUtil {
             return tmp;
         }
 
+        public static LOG_DETAIL_SHOW_TYPE valueOfEnum(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {

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

@@ -1190,4 +1190,47 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 日志存储
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOG_STORAGE {
+        MONGO(1, "MongoDB"),
+        ELASTICSEARCH(2, "Elasticsearch");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private LOG_STORAGE(int value, String description) {
+            this.value = value;
+            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 LOG_STORAGE valueOfEnum(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -19,4 +19,9 @@ public class WmsJobParamModel implements Serializable {
     private List<String> zonesNoList;//存储区编号
     private Integer snType;//条码类型（虚拟，实物）
     private String devOpsEmail;//运维人员邮箱
+    private Integer minuteDiff;//处理周期(分钟)
+
+    public int getMinuteDiffVal() {
+        return this.minuteDiff == null ? 0 : this.minuteDiff.intValue();
+    }
 }

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/bean/BrPojoFilterAttr.java

@@ -77,6 +77,14 @@ public class BrPojoFilterAttr extends BaseBean {
     @ApiParam(value ="属性显示名称")
     private String attrName;
 
+    @Column(name = "VIEW_ATTR_CONTROL_TYPE")
+    @ApiParam(value = "控件类型")
+    private Integer viewAttrControlType;
+
+    @Column(name = "VIEW_ATTR_CONTROL_REF_KEY")
+    @ApiParam(value = "控件引用RefKey")
+    private String viewAttrControlRefKey;
+
     @Column(name="ATTR_SHOW")
     @ApiParam(value ="属性是否显示")
     private Integer attrShow;

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

@@ -96,6 +96,9 @@ public class WmsActionGroup extends BaseBean {
         return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
+    public int getIsCommitRefMoveVal() {
+        return this.isCommitRefMove == null ? 0 : this.isCommitRefMove.intValue();
+    }
     public int getAutoInitVal() {
         return this.autoInit == null ? 0 : this.autoInit.intValue();
     }

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

@@ -118,8 +118,4 @@ public class WmsDocMovementSn extends BaseBean {
     @Transient
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer itemStatus;
-
-    @Transient
-    @ApiParam("打印模板名称")
-    private String templateName;
 }

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

@@ -282,6 +282,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "是否最早批次")
     public String isFifo;
 
+    @Transient
+    @ApiParam("打印模板名称")
+    private String templateName;
+
     public WmsStockSn() {
     }