Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import io.swagger.annotations.Api;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 甘特图分页查询参数
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-11-22
+ * @Modify:
+ **/
+@Data
+@Api("甘特图分页查询参数")
+public class GanttPager extends Pager {
+    public static class SortData {
+        // 排序对象
+        private String field;
+        // 排序类型，1为升序，0为降序
+        private Boolean ascending;
+
+        public String getField() {
+            return field;
+        }
+
+        public void setField(String field) {
+            this.field = field;
+        }
+
+        public Boolean getAscending() {
+            return ascending;
+        }
+
+        public void setAscending(Boolean ascending) {
+            this.ascending = ascending;
+        }
+    }
+    private String filter;
+    private List<SortData> sorts;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/annotation/UseMongoDb.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.annotation;
+
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/12/25 1:45 下午
+ * @Description:
+ **/
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface UseMongoDb {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.annotation.UseMongoDb;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -33,6 +34,7 @@ import javax.persistence.Transient;
         @Index(columnList = "OBJECT_CODE"),
         @Index(columnList = "MODIFY_DATE_TIME")
 })
+//@UseMongoDb
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repositorymongo/MesProductDataRepository.java

@@ -0,0 +1,15 @@
+//package cn.estsh.i3plus.pojo.mes.repositorymongo;
+//
+//
+//import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
+//import cn.estsh.i3plus.pojo.mes.bean.MesProductData;
+//import org.springframework.stereotype.Repository;
+//
+///**
+// * @Author: Wynne.Lu
+// * @CreateDate: 2019/12/25 1:30 下午
+// * @Description:
+// **/
+//@Repository
+//public interface MesProductDataRepository extends BaseMongoRepository<MesProductData, Long> {
+//}

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

@@ -8,10 +8,7 @@ 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 javax.persistence.UniqueConstraint;
+import javax.persistence.*;
 
 /**
  * @Description : 附件表
@@ -58,4 +55,8 @@ public class WmsFile extends BaseBean{
     @Column(name = "REF_TYPE")
     @ApiParam(value = "关联单据类型")
     private String refType;
+
+    @Transient
+    @ApiParam("预览前缀")
+    public String previewPrefix;
 }

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

@@ -278,6 +278,10 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("是否寄售 1-是 2-否")
     private Integer consignation;
 
+    @Transient
+    @ApiParam(value = "是否最早批次")
+    public String isFifo;
+
     public WmsStockSn() {
     }