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

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

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

@@ -0,0 +1,56 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 供应商
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="BAS_VENDOR")
+@Api("供应商")
+public class BasVendor extends BaseBean{
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
+
+    @Column(name="VENDOR_NAME")
+    @ApiParam("供应商简称")
+    private String vendorName;
+
+    @Column(name="VENDOR_DESC")
+    @ApiParam("供应商全称")
+    private String vendorDesc;
+
+    @Column(name="VENDOR_ADDR")
+    @ApiParam("供应商地址")
+    private String vendorAddr;
+
+    @Column(name="VENDOR_OWNER")
+    @ApiParam("联系人")
+    private String vendorOwner;
+
+    @Column(name="VENDOR_EMAIL")
+    @ApiParam("邮箱")
+    private String vendorEmail;
+
+    @Column(name="IS_ASN")
+    @ApiParam("是否发ASN")
+    private Integer isAsn;
+}

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

@@ -0,0 +1,45 @@
+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 org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 作业类型
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:41
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_OP_TYPE")
+@Api("作业类型")
+public class WmsOpType extends BaseBean{
+
+    @Column(name="OP_TYPE_CODE")
+    @ApiParam("类型编号")
+    private String opTypeCode;
+
+    @Column(name="OP_TYPE_NAME")
+    @ApiParam("类型名称")
+    private String opTypeName;
+
+    @Column(name="SEQ")
+    @ApiParam("序号")
+    private Integer seq;
+
+    @Column(name="PROG_CODE")
+    @ApiParam("处理程序")
+    private String proCode;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasVendorRepository.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.BasVendor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:49
+ * @Modify:
+ **/
+@Repository
+public interface BasVendorRepository extends BaseRepository<BasVendor, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsOpTypeRepository.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.WmsOpType;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业类型
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:46
+ * @Modify:
+ **/
+@Repository
+public interface WmsOpTypeRepository extends BaseRepository<WmsOpType, Long> {
+}