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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -62,7 +62,6 @@ public class BaseOrder extends BaseAPS {
 
     @Column(name="LET")
     @ApiParam(value ="最晚结束时刻")
-    @FieldAnnotation(notEmpty = true)
     private Date let;
 
     @Column(name="CALC_EST")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java

@@ -6,5 +6,6 @@ import lombok.Data;
 public class GanttDragModel {
     private Long workId;
     private Long resId;
+    private Long targetResId;
     private Long targetWorkId;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java

@@ -19,9 +19,9 @@ public class GanttPlanModel {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date endDate;
     private String cls;
-    //private String timeRangeColor;
     private String eventColor;
     private String name;
     private Long workId;
     private List<Long> resIds;
+    private Boolean draggable;
 }

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

@@ -863,8 +863,8 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CALENDAR_TYPE {
-        ENABLE("ENABLE", "启用"),
+        ENABLE("ENABLE", "加班"),
-        DISABLE("DISABLE", "停用");
+        DISABLE("DISABLE", "下班");
 
         private String value;
         private String description;

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-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/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() {
     }