基础资料实体类换包名

applications/commons/pom.xml

@@ -10,6 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>commons</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
+    </dependencies>
 
 
 </project>

applications/document/document-dto/pom.xml

@@ -18,6 +18,10 @@
             <artifactId>springfox-swagger2</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>core</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

applications/document/document-server/src/main/java/com/usoftchina/saas/document/po/Product.java → applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Product.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.document.po;
+package com.usoftchina.saas.document.entities;
 
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
@@ -8,7 +8,6 @@ import java.util.Date;
 
 public class Product extends CommonBaseEntity implements Serializable {
 
-    private long pr_id;
     private String pr_code;
     private String pr_detail;
     private String pr_spec;
@@ -37,14 +36,6 @@ public class Product extends CommonBaseEntity implements Serializable {
     private String pr_text3;
     private String pr_text4;
 
-    public long getPr_id() {
-        return pr_id;
-    }
-
-    public void setPr_id(long pr_id) {
-        this.pr_id = pr_id;
-    }
-
     public String getPr_code() {
         return pr_code;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/po/Vendor.java → applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Vendor.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.document.po;
+package com.usoftchina.saas.document.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
@@ -12,10 +12,6 @@ import java.util.Date;
  */
 public class Vendor extends CommonBaseEntity implements Serializable{
 
-    /**
-     * 供应商ID
-     */
-    private long ve_id;
     /**
      * 供应商编号
      */
@@ -105,14 +101,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
      */
     private String ve_text5;
 
-    public long getVe_id() {
-        return ve_id;
-    }
-
-    public void setVe_id(long ve_id) {
-        this.ve_id = ve_id;
-    }
-
     public String getVe_code() {
         return ve_code;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/po/Warehouse.java → applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Warehouse.java

@@ -1,4 +1,4 @@
-package com.usoftchina.saas.document.po;
+package com.usoftchina.saas.document.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
 
@@ -12,7 +12,6 @@ import java.util.Date;
  */
 public class Warehouse extends CommonBaseEntity implements Serializable {
 
-    private long wh_id;
     private String wh_code;
     private String wh_type;
     private String wh_description;
@@ -30,14 +29,6 @@ public class Warehouse extends CommonBaseEntity implements Serializable {
     private String wh_text4;
     private String wh_text5;
 
-    public long getWh_id() {
-        return wh_id;
-    }
-
-    public void setWh_id(long wh_id) {
-        this.wh_id = wh_id;
-    }
-
     public String getWh_code() {
         return wh_code;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/ProductMapper.java

@@ -3,7 +3,7 @@ package com.usoftchina.saas.document.mapper;
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
-import com.usoftchina.saas.document.po.Product;
+import com.usoftchina.saas.document.entities.Product;
 
 import java.util.List;
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorMapper.java

@@ -3,7 +3,7 @@ package com.usoftchina.saas.document.mapper;
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 
 import com.usoftchina.saas.common.dto.DocReqDTO;
-import com.usoftchina.saas.document.po.Vendor;
+import com.usoftchina.saas.document.entities.Vendor;
 
 import java.util.List;
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -1,7 +1,7 @@
 package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
-import com.usoftchina.saas.document.po.Warehouse;
+import com.usoftchina.saas.document.entities.Warehouse;
 
 import java.util.Map;
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/ProductServiceImpl.java

@@ -7,8 +7,8 @@ import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.mapper.ProductMapper;
-import com.usoftchina.saas.document.po.Product;
 import com.usoftchina.saas.document.service.ProductService;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/VendorServiceImpl.java

@@ -5,8 +5,9 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.common.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
+import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
-import com.usoftchina.saas.document.po.Vendor;
+
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/Impl/WarehouseServiceImpl.java

@@ -1,8 +1,9 @@
 package com.usoftchina.saas.document.service.Impl;
 
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
-import com.usoftchina.saas.document.po.Warehouse;
+
 import com.usoftchina.saas.document.service.WarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/ProductService.java

@@ -5,8 +5,9 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.entities.Product;
 import com.usoftchina.saas.document.mapper.ProductMapper;
-import com.usoftchina.saas.document.po.Product;
+
 import com.usoftchina.saas.page.PageRequest;
 
 import java.util.List;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/VendorService.java

@@ -4,8 +4,9 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 
 import com.usoftchina.saas.common.dto.DocReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
+import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
-import com.usoftchina.saas.document.po.Vendor;
+
 import com.usoftchina.saas.page.PageRequest;
 
 import java.util.List;

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/WarehouseService.java

@@ -1,8 +1,9 @@
 package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
-import com.usoftchina.saas.document.po.Warehouse;
+
 
 import java.util.Map;
 

applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.document.mapper.ProductMapper">
     <resultMap id="ProductResultMapper" type="com.usoftchina.saas.document.po.Product">
-        <id column="pr_id" property="pr_id" jdbcType="INTEGER" />
+        <id column="pr_id" property="id" jdbcType="INTEGER" />
         <result column="pr_code" property="pr_code" jdbcType="VARCHAR" />
         <result column="pr_detail" property="pr_detail" jdbcType="VARCHAR" />
         <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />

applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.document.mapper.VendorMapper">
     <resultMap id="VendorResultMapper" type="com.usoftchina.saas.document.po.Vendor">
-        <id column="ve_id" property="ve_id" jdbcType="INTEGER" />
+        <id column="ve_id" property="id" jdbcType="INTEGER" />
         <result column="ve_code" property="ve_code" jdbcType="VARCHAR" />
         <result column="ve_uu" property="ve_uu" jdbcType="VARCHAR" />
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />

applications/document/document-server/src/main/resources/mapper/WarehouseMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.saas.document.mapper.WarehouseMapper">
     <resultMap id="WarehouseResultMapper" type="com.usoftchina.saas.document.po.Warehouse">
-        <id column="wh_id" property="wh_id" jdbcType="INTEGER" />
+        <id column="wh_id" property="id" jdbcType="INTEGER" />
         <result column="wh_code" property="wh_code" jdbcType="VARCHAR" />
         <result column="wh_type" property="wh_type" jdbcType="VARCHAR" />
         <result column="wh_description" property="wh_description" jdbcType="VARCHAR" />