Jenkins自动合并

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

@@ -0,0 +1,113 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 包材BOM信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 14:40
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="QAD_BOP")
+@Api("包材BOM信息")
+public class QadBop  implements Serializable {
+
+    private static final long serialVersionUID = 4673217061075875734L;
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="BOP_CODE")
+    @ApiParam("BOP编号")
+    public String bopCode;
+
+    @Column(name="BOP_DESC")
+    @ApiParam("BOP描述")
+    public String bopDesc;
+
+    @Column(name="BOP_DOMAIN")
+    @ApiParam("BOP所属Domain")
+    public String bopDomain;
+
+    @Column(name="PARENT_PART")
+    @ApiParam("父层级packcode对应的qad零件号")
+    public String parentPart;
+
+    @Column(name="PARENT_RETURN_PART")
+    @ApiParam("父层级packcode对应的可回用零件号")
+    public String parentReturnPart;
+
+    @Column(name="BOPDW_QTY")
+    @ApiParam("默认1 不考虑")
+    public String bopdwQty;
+
+    @Column(name="SUB_BOP_CODE")
+    @ApiParam("子层级packcode代码或者是物料零件号")
+    public String subBopCode;
+
+    @Column(name="SUB_BOP_PART")
+    @ApiParam("子层级packcode对应的qad零件号，如果是物料零件这里为空")
+    public String subBopPart;
+
+    @Column(name="SUB_ITEM_PART")
+    @ApiParam("子层级packcode对应的可回用零件号，如果是物料零件这里为空")
+    public String subItemPart;
+
+    @Column(name="SUB_QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "该层级在父层级中的个数", example = "0")
+    public String subQty;
+
+    @Column(name="SUB_UNIT")
+    @ApiParam("单位")
+    public String subUnit;
+
+    @Column(name="CREATE_DATE_TIME")
+    @ApiParam("创建时间")
+    public String createDateTime;
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description : 零件包装主数据信息
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 14:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="QAD_ITEM_PACKING")
+@Api("零件包装主数据信息")
+public class QadItemPacking implements Serializable {
+
+    private static final long serialVersionUID = -9204074690166851001L;
+
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name="ID")
+    @ApiParam(value = "主键",example = "0")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @AnnoOutputColumn(hidden = true)
+    @FieldAnnotation(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER)
+    public Long id;
+
+    //get单独处理
+    public Long getId() {
+        if(id != null) {
+            return id.longValue();
+        }else{
+            return id;
+        }
+    }
+
+    /**
+     * MonogoDB _id映射
+     * @param id
+     */
+    @JSONField(name="_id")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Column(name="IN_ADDR")
+    @ApiParam("收货时是供应商编号，发运时是客户发往地")
+    public String inAddr;
+
+    @Column(name="IN_BOP_CODE")
+    @ApiParam("BOP编号")
+    public String inBopCode;
+
+    @Column(name="IN_DOMAIN")
+    @ApiParam("所属Domain")
+    public String inDomain;
+
+    @Column(name="IN_PART")
+    @ApiParam("物料代码")
+    public String inPart;
+
+    @Column(name="IN_SITE")
+    @ApiParam("工厂代码")
+    public String inSite;
+
+    @Column(name="IN_TRANS_TYPE")
+    @ApiParam("交易类型")
+    public String inTransType;
+
+    @Column(name="CREATE_DATE_TIME")
+    @ApiParam("创建时间")
+    public String createDateTime;
+}

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

@@ -50,7 +50,7 @@ public class WmsDataMigrationConfig extends BaseBean{
 
     @Column(name="LAST_MRGRATION_QTY")
     @ApiParam(value = "末次迁移记录数", example = "0")
-    private Integer LastmMigrationQty;
+    private Integer lastmMigrationQty;
 
     @Column(name="NEXT_EXECUTION_TIME")
     @ApiParam("下次执行时间")

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -33,7 +34,7 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "PUSH_NAME")
     private String pushName;
 
-    @ApiParam("规则类型")
+    @ApiParam("规则表达式")
     @Column(name = "QUARTZ_CRON")
     private String quartzCron;
 
@@ -61,10 +62,12 @@ public class WmsPushConfig extends BaseBean{
     @Column(name = "SCRIPT_NO")
     private String scriptNo;
 
+    @Lob
     @ApiParam("标题模板")
     @Column(name = "TITLE_TEMPLATE")
     private String titleTemplate;
 
+    @Lob
     @ApiParam("消息体模板")
     @Column(name = "CONTENT_TEMPLATE")
     private String contentTemplate;

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

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -29,24 +30,23 @@ import javax.persistence.Table;
 public class WmsPushLog extends BaseBean{
 
     private static final long serialVersionUID = -1708833666516164845L;
-    @Column(name = "EXE_HQL")
-    @ApiParam("执行Hql")
-    private String exeHql;
 
     @Column(name = "PUSH_TITLE")
     @ApiParam("推送标题")
     private String pushTitle;
 
+    @Lob
     @Column(name = "PUSH_CONTENT")
     @ApiParam("推送内容")
     private String pushContent;
 
     @Column(name = "PUSH_TYPE")
     @ApiParam("推送类型")
-    private String pushType;
+    private Integer pushType;
+
+    @Column(name = "PATH_URL")
+    @ApiParam("推送地址")
+    private String pathUrl;
 
-    @Column(name = "PUSH_RESULT")
-    @ApiParam("推送结果")
-    private String pushResult;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java

@@ -1,15 +1,16 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
 import java.util.Map;
 
 @Data
 public class MailMessageModel extends PushMessageModel {
 
-
+    //推送数据
-    //附加，value 文件的绝对地址/动态模板数据
+    @ApiParam("推送数据集合")
-    private Map<String, Object> attachment;
+    List dataList;
-
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.modelbean;
 
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
@@ -9,17 +11,23 @@ import java.util.Map;
 public class PushMessageModel {
 
 
-    //标题
+    @ApiParam("标题")
     public String title;
-    //内容
+
+    @ApiParam("内容")
     public String content;
 
-    //推送类型
+    //推送类型-枚举 ：WmsEnumUtil.PUSH_TYPE
+    @ApiParam("推送类型")
     public String pushType;
 
-    //推送地址
+    //推送地址，邮箱以逗号分割
+    @ApiParam("推送地址")
     public String pathUrl;
 
-    //推送数据
+
-    List<Map<Object,Object>> dataList;
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadBopRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QadBop;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 15:06
+ * @Modify:
+ **/
+public interface QadBopRepository extends BaseRepository<QadBop, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/QadItemPackingRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.QadItemPacking;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-01-09 15:06
+ * @Modify:
+ **/
+public interface QadItemPackingRepository extends BaseRepository<QadItemPacking, Long> {
+}