Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -0,0 +1,51 @@
+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 : jimmy.zeng
+ * @CreateDate : 2019-05-06 14:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_BUSI_TYPE")
+@Api("业务类型信息")
+public class WmsBusiType extends BaseBean {
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam(value = "类型编号")
+    private String busiTypeCode;
+
+    @Column(name = "BUSI_TYPE_NAME")
+    @ApiParam(value = "类型名称")
+    private String busiTypeName;
+
+    @Column(name = "SEQ")
+    @ApiParam(value = "序号", example = "-1")
+    private Integer seq;
+
+    /**
+     * 移动类型:IN=入库,OUT=出库,MOVE=移库
+     */
+    @Column(name = "MOVE_TYPE")
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBusiTypeRepository.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.WmsBusiType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 业务类型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2019-05-06 15:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsBusiTypeRepository extends BaseRepository<WmsBusiType,Long> {
+}

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

@@ -1710,4 +1710,24 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 业务类型信息 分页查询
+     *
+     * @param wmsBusiType
+     * @return
+     */
+    public static DdlPackBean packHqlWmsBusiType(WmsBusiType wmsBusiType) {
+        //查询参数封装
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsBusiType.getBusiTypeCode(), "busiTypeCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsBusiType.getBusiTypeName(), "busiTypeName", result);
+        DdlPreparedPack.getNumEqualPack(wmsBusiType.getMoveType(), "moveType", result);
+
+        getStringBuilderPack(wmsBusiType, result);
+
+        return result;
+    }
 }