Jenkins自动合并

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

@@ -196,7 +196,7 @@ public class WmsMoveDetails extends BaseBean {
 
     @Column(name = "CONSIGNATION")
     @ApiParam("是否寄售 1-是 2-否")
-    private Integer consignation;
+    private Integer consignation = 2;
 
     public Integer getIsSnapshot() {
         return isSnapshot == null ? 0 : isSnapshot.intValue();

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

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 物料组信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PART_GROUP")
+@Api("物料组信息")
+public class WmsPartGroup extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072864436L;
+    @Column(name="PART_GROUP_NO")
+    @ApiParam("物料组编号")
+    private String partGroupNo;
+
+    @Column(name="PART_GROUP_NAME")
+    @ApiParam("物料组名称")
+    private String partGroupName;
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 物料组明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PART_GROUP_DETAILS")
+@Api("物料组明细信息")
+public class WmsPartGroupDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072864444L;
+    @Column(name="PART_GROUP_NO")
+    @ApiParam("物料组编号")
+    private String partGroupNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编号")
+    private String partNo;
+
+    @Column(name = "PART_NAME_RDD")
+    @ApiParam(value = "物料名称")
+    private String partNameRdd;
+}

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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;
+
+/**
+ * @Description : 物料组物流路线信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PART_GROUP_ROUTE")
+@Api("物料组物流路线信息")
+public class WmsPartGroupRoute extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072864438L;
+    @Column(name="PART_GROUP_NO")
+    @ApiParam("物料组编号")
+    private String partGroupNo;
+
+    @Column(name = "ROUTING_CODE")
+    @ApiParam(value = "线路代码")
+    private String routingCode;
+
+    @Column(name = "ROUTING_NAME")
+    @ApiParam(value = "线路名称")
+    private String routingName;
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物料组明细信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartGroupDetailsRepository extends BaseRepository<WmsPartGroupDetails,Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物料组信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartGroupRepository extends BaseRepository<WmsPartGroup,Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :物料组物流路线信息
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-01-15 15:17
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartGroupRouteRepository extends BaseRepository<WmsPartGroupRoute,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2771,4 +2771,54 @@ public class WmsHqlPack {
         getStringBuilderPack(searchElementFunction, result);
         return result;
     }
+
+    /**
+     * 物料组信息分页查询条件
+     *
+     * @param wmsPartGroup
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartGroup(WmsPartGroup wmsPartGroup) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupNo(), "partGroupNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupName(), "partGroupName", result);
+
+        getStringBuilderPack(wmsPartGroup, result);
+
+        return result;
+    }
+
+    /**
+     * 物料组物流路线信息分页查询条件
+     *
+     * @param wmsPartGroupRoute
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartGroupRoute(WmsPartGroupRoute wmsPartGroupRoute) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsPartGroupRoute.getPartGroupNo(), "partGroupNo", result);
+
+        getStringBuilderPack(wmsPartGroupRoute, result);
+
+        return result;
+    }
+
+    /**
+     * 物料组物流路线信息分页查询条件
+     *
+     * @param wmsPartGroupDetails
+     * @return
+     */
+    public static DdlPackBean packHqlWmsPartGroupDetails(WmsPartGroupDetails wmsPartGroupDetails) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(wmsPartGroupDetails.getPartGroupNo(), "partGroupNo", result);
+
+        getStringBuilderPack(wmsPartGroupDetails, result);
+
+        return result;
+    }
+
 }