init from phab

README.md

@@ -0,0 +1,174 @@
+# 说明
+  - saas-platform项目(`ssh://dev@10.10.100.21/source/saas-platform.git`)的all in one版本，
+  用于小规模开发部署
+  - [接口文档 https://doc.ubtob.com/web/#/7](https://doc.ubtob.com/web/#/7)
+  
+# 项目结构
+
+```
+├─saas-one
+│  │  
+│  ├─applications-----------------------------业务应用
+│  |  ├─app-document--------------------------基础资料
+│  |  |  |─app-document-api-------------------基础资料api
+│  |  |  |─app-document-dto-------------------基础资料数据传输对象
+│  |  |  |─app-document-server----------------基础资料服务
+│  |  ├─app-money-----------------------------资金
+│  |  |  |─app-money-dto----------------------资金服务数据传输对象
+│  |  |  |─app-money-server-------------------资金服务
+│  |  ├─app-purchase--------------------------采购
+│  |  |  |─app-purchase-api-------------------采购服务api
+│  |  |  |─app-purchase-dto-------------------采购服务数据传输对象
+│  |  |  |─app-purchase-server----------------采购服务
+│  |  ├─app-sale------------------------------销售
+│  |  |  |─app-sale-dto-----------------------销售服务数据传输对象
+│  |  |  |─app-sale-server--------------------销售服务
+│  |  ├─app-storage---------------------------库存
+│  |  |  |─app-storage-dto--------------------库存服务数据传输对象
+│  |  |  |─app-storage-server-----------------库存服务
+│  │ 
+│  ├─base-------------------------------------基础服务
+│  |  ├─base-account--------------------------账户中心
+│  |  |  |─base-account-api-------------------账户中心api
+│  |  |  |─base-account-dto-------------------账户中心数据传输对象
+│  |  |  |─base-account-server----------------账户中心服务
+│  |  ├─base-auth-----------------------------鉴权中心
+│  |  |  |─base-auth-client-------------------鉴权中心客户端
+│  |  |  |─base-auth-common-------------------鉴权中心公共包
+│  |  |  |─base-auth-dto----------------------鉴权中心数据传输对象
+│  |  |  |─base-auth-server-------------------鉴权中心服务
+│  |  ├─base-biz------------------------------业务基础
+│  |  |  |─base-biz-api-----------------------业务基础api
+│  |  |  |─base-biz-dto-----------------------业务基础数据传输对象
+│  |  |  |─base-biz-server--------------------业务基础服务
+│  |  ├─base-file-----------------------------文件服务
+│  |  |  |─base-file-api----------------------文件服务api
+│  |  |  |─base-file-dto----------------------文件服务数据传输对象
+│  |  |  |─base-file-server-------------------文件服务
+│  |  ├─base-mail-----------------------------邮件服务
+│  |  |  |─base-mail-api----------------------邮件服务api
+│  |  |  |─base-mail-dto----------------------邮件服务数据传输对象
+│  |  |  |─base-mail-server-------------------邮件服务
+│  |  ├─base-message--------------------------消息队列服务
+│  |  |  |─base-message-api-------------------消息队列服务api
+│  |  |  |─base-message-server----------------消息队列服务
+│  |  ├─base-sms------------------------------短信服务
+│  |  |  |─base-sms-api-----------------------短信服务api
+│  |  |  |─base-sms-dto-----------------------短信服务数据传输对象
+│  |  |  |─base-sms-server--------------------短信服务
+│  |  ├─base-socket---------------------------web socket服务
+│  |  |  |─base-socket-api--------------------web socket服务api
+│  |  |  |─base-socket-server-----------------web socket服务
+│  |  ├─base-ui-------------------------------UI服务
+│  |  |  |─base-ui-server---------------------UI服务
+│  │
+│  ├─external---------------------------------业务扩展模块
+│  |  ├─ext-dingtalk--------------------------钉钉对接
+│  |  |  |─ext-dingtalk-service---------------钉钉对接服务
+│  |  ├─ext-qywx------------------------------企业微信对接
+│  |  |  |─ext-qywx-service-------------------企业微信对接服务
+│  |  ├─ext-weixin----------------------------微信对接
+│  |  |  |─ext-weixin-service-----------------微信对接服务
+│  |  ├─ext-yry-------------------------------优软云对接
+│  |  |  |─ext-b2b-sdk------------------------优软云B2B接口SDK
+│  |  |  |─ext-b2b-service--------------------优软云B2B对接服务
+│  |  |  |─ext-inquiry-sdk--------------------优软云公共询价接口SDK
+│  |  |  |─ext-mall-sdk-----------------------优软云商城接口SDK
+│  |  |  |─ext-product-sdk--------------------优软云公共物料接口SDK
+│  |  |  |─ext-sso-sdk------------------------优软云账户中心接口SDK
+│  │
+│  ├─framework--------------------------------框架部分
+│  |  ├─framework-core------------------------框架基础
+│  │
+│  ├─frontend---------------------------------前端
+│  |  ├─operation-web-------------------------后台前端
+│  |  ├─saas-portal-web-----------------------门户前端
+│  |  ├─saas-web------------------------------系统前端
+│  │
+│  ├─runtime----------------------------------运行时
+│  |  ├─saas-server---------------------------saas业务运行时服务
+│  │
+```
+
+# 测试环境
+
+> 数据库
+
+| 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
+| --------   | :-----: | :-----:  | :----:  | :----: | :------  |
+| saas_account | mysql | 10.1.81.79:3306 |  root  | select111*** |  账户中心  |
+| saas_auth | mysql | 10.1.81.79:3306 |  root  | select111*** |  鉴权系统  |
+| saas_file | mysql | 10.1.81.79:3306 |  root  | select111*** |  文件系统  |
+| saas_mail | mysql | 10.1.81.79:3306 |  root  | select111*** |  邮件系统  |
+| saas_biz | mysql | 10.1.81.79:3306 |  root  | select111*** |  业务系统  |
+| saas_ui | mongo | 10.1.81.63:27017 |    |  |  UI配置  |
+
+> 中间件
+
+| 类型 | 地址 | 账号 | 密码 | 说明 |
+| ---- | :----: | :----: | :----: | ---- |
+| rabbitmq | 10.1.81.75:5672 | saas | select123*** | 消息中间件 [控制台](http://10.1.81.75:15672)|
+| redis | 10.1.81.62:6379 | | | 内存数据库 |
+
+
+> 服务器
+
+| IP      |  账号  |  密码  |  环境  |  资源  |
+| --------   | :----:  | :----: | :------:  | :------:  |
+| 10.1.81.79 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.61 |  root  | select123*** |  CentOS7, Docker  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.62 |  root  | select123*** |  CentOS7, Redis  | Cpu: 2, Mem: 8G, Disk: 20G |
+| 10.1.81.63 |  root  | select123*** |  CentOS7, Mongo  | Cpu: 4, Mem: 8G, Disk: 50G |
+
+> 构建
+
+* [jenkins](http://10.1.81.61:8080/job/saas) **账号** admin **密码** select123***
+
+> 访问
+
+* [门户 https://saas-test.usoftchina.com:5443](https://saas-test.usoftchina.com:5443)
+* [系统 https://saas-test.usoftchina.com:5443/trade](https://saas-test.usoftchina.com:5443/trade)
+* [打印 https://saas-report-dev.usoftchina.com:5443](https://saas-report-dev.usoftchina.com:5443)
+* [接口 https://saas-api-test.usoftchina.com:5443](https://saas-api-test.usoftchina.com:5443)
+
+# 生产环境
+
+> 数据库
+
+| 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
+| --------   | :-----: | :-----:  | :----:  | :----: | :------  |
+| saas_account | mysql | 10.10.100.18:3306 |  saas  | select111*** |  账户中心  |
+| saas_auth | mysql | 10.10.100.18:3306 |  saas  | select111*** |  鉴权系统  |
+| saas_file | mysql | 10.10.100.18:3306 |  saas  | select111*** |  文件系统  |
+| saas_mail | mysql | 10.10.100.18:3306 |  saas  | select111*** |  邮件系统  |
+| saas_biz | mysql | 10.10.100.18:3306 |  saas  | select111*** |  业务系统  |
+| saas_ui | mongo | 10.10.100.40:27017 |    |  |  UI配置  |
+
+> 中间件
+
+| 类型 | 地址 | 账号 | 密码 | 说明 |
+| ---- | :----: | :----: | :----: | ---- |
+| rabbitmq | 10.10.100.40:5672 | saas | select123*** | 消息中间件 [控制台](http://10.10.100.40:15672)|
+| redis | 10.10.100.23:6379 | | | 内存数据库 |
+
+
+> 服务器
+
+| IP      |  账号  |  密码  |  环境  |  资源  |
+| --------   | :----:  | :----: | :------:  | :------:  |
+| 10.10.100.40 |  centos  | mykey.key |  CentOS6, RabbitMQ, ELK, MongoDB, Nginx  | Cpu: 40, Mem: 128G, Disk: 600G |
+| 10.10.100.23 |  root  | 62cddbcc624b1b072d84117cc0e5a4db |  CentOS7, Docker, Redis  | Cpu: 40, Mem: 128G, Disk: 800G |
+| 10.10.100.24 |  root  | 4fd19c28ee472ef9ebc3c06de9277c1b |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
+| 10.10.100.25 |  root  | 61a12a65cd42ef77a52dfef8e436bacc |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
+| 10.10.100.26 |  root  | 8743e445c7a308edf4588b7997b21c73 |  CentOS7, Docker  | Cpu: 40, Mem: 128G, Disk: 800G |
+
+> 构建
+
+* [jenkins](http://10.10.100.200:5001/job/saas/job/prod) **账号** admin **密码** select123***
+
+> 访问
+
+* [门户 https://saas.usoftchina.com](https://saas.usoftchina.com)
+* [系统 https://saas.usoftchina.com/trade](https://saas.usoftchina.com/trade)
+* [打印 https://saas-report.usoftchina.com](https://saas-report.usoftchina.com)
+* [接口 https://saas-api.usoftchina.com](https://saas-api.usoftchina.com)

applications/app-document/app-document-api/build.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile project(":applications:app-document:app-document-dto")
+}

applications/app-document/app-document-api/lombok.config

@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.equalsAndHashCode.callSuper = call

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/AddressApi.java

@@ -0,0 +1,13 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.entity.Address;
+
+public interface AddressApi {
+
+    /**
+     * 获取默认地址
+     *
+     * @return
+     */
+    Address getDefault();
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/BankApi.java

@@ -0,0 +1,20 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.DepartmentDTO;
+import com.usoftchina.saas.document.dto.DocBankImformationDTO;
+
+public interface BankApi {
+    /**
+     * 根据ID 查找account
+     * @param id
+     * @return
+     */
+    DocBankImformationDTO selectByPrimaryKey(Long id);
+
+    /**
+     * 根据科目ID 查找银行账户
+     * @param id
+     * @return
+     */
+    DocBankImformationDTO selectByCategoryKey(Long id);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/CurrencyApi.java

@@ -0,0 +1,65 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.CurrencyDTO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface CurrencyApi {
+
+    /**
+     * 设置本位币
+     *
+     * @param currencyDTO
+     * @return
+     */
+    void setStandard(CurrencyDTO currencyDTO);
+
+    /**
+     * 获取本位币
+     *
+     * @return
+     */
+    CurrencyDTO getStandard();
+
+    CurrencyDTO getByName(String name);
+
+    /**
+     * 外币列表
+     *
+     * @return
+     */
+    List<CurrencyDTO> getForeignList();
+
+    /**
+     * 批量保存
+     *
+     * @param currencyList
+     */
+    void saveAll(List<CurrencyDTO> currencyList);
+
+    /**
+     * 币种列表
+     *
+     * @return
+     */
+    List<CurrencyDTO> getAll();
+
+    void resetCurrencyRate(String crName);
+
+    /***
+     * 币种所有本位币
+     * @return list
+     * */
+    List<CurrencyDTO> getAllDefault();
+
+    /**
+     * 更新其他外币汇率
+     * @param defaultCurrency 默认币种
+     * @param rates 汇率
+     * */
+    void updateCurrencyRateByDefault(String defaultCurrency, Map<String,Double> rates);
+
+
+    CurrencyDTO getStandardByCompany(Long companyId);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/CustAramountApi.java

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.entity.CustAramount;
+
+public interface CustAramountApi {
+    CustAramount getCustArByCustCodeAndCurrency(String custCode, String currency);
+    void updateSelective(CustAramount  record);
+    int insertSelective(CustAramount record);
+    Double getArLeftamount(String custCode, String currency);
+    Double getPreLeftamount(String custCode, String currency);
+
+    CustAramount getSumCustArByCustCodeAndCurrency(String custcode, String currency);
+
+    CustAramount getSumCustArByCurrency(String currency);
+
+    /**
+     * 按照客户分组获取发出商品成本金额
+     * @param custcode
+     * @return
+     */
+    CustAramount getSumGoodsSendByCust(String custcode);
+
+    Double getSumGoodsSend();
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/CustomerApi.java

@@ -0,0 +1,38 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.dto.CustomerDTO;
+import com.usoftchina.saas.document.dto.CustomerFormDTO;
+import com.usoftchina.saas.util.BeanMapper;
+
+public interface CustomerApi {
+    CustomerFormDTO getFormData(Long id);
+    int updateCustleftamountByPrimaryKey(Long cu_id);
+
+    /**
+     * 按客户编号查询
+     *
+     * @param code
+     * @return
+     */
+    CustomerDTO findByCode(String code);
+
+    void updateAllCustleftamount();
+
+    /**
+     * 按客户uu查询
+     *
+     * @param
+     * @return
+     */
+    CustomerDTO findByUU(String uu);
+
+    /**
+     * 按客户名称查询
+     *
+     * @param name
+     * @return
+     */
+    CustomerDTO findByName(String name);
+
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/DepartmentApi.java

@@ -0,0 +1,52 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.DepartmentDTO;
+
+import java.util.List;
+
+/**
+ * @author yingp
+ * @date 2020/4/20
+ */
+public interface DepartmentApi {
+
+    /**
+     * 按账户中心账户查找具体人事部门
+     *
+     * @param accountId
+     * @param companyId
+     * @return
+     */
+    List<DepartmentDTO> findByAccountIdAndCompanyId(Long accountId, Long companyId);
+
+    List<DepartmentDTO> findByAccountId(Long accountId);
+
+    /**
+     * 查找当前企业部门资料
+     * */
+
+    List<DepartmentDTO> findByCompanyId();
+
+    /**
+     * 根据ID 查找部门资料
+     * @param id
+     * @return
+     */
+    DepartmentDTO selectByPrimaryKey(Long id);
+
+    /**
+     * 按编号查找
+     *
+     * @param code
+     * @return
+     */
+    DepartmentDTO findByCode(String code);
+
+    /**
+     * 查找根级部门
+     *
+     * @param companyId
+     * @return
+     */
+    List<DepartmentDTO> findRoot(Long companyId);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/EmployeeApi.java

@@ -0,0 +1,51 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.EmployeeDTO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface EmployeeApi {
+
+    Map<String, Object> getEmployeeByAccount();
+
+    /**
+     * 按ID查找
+     *
+     * @param empId
+     * @return
+     */
+    EmployeeDTO getById(Long empId);
+
+    /**
+     * 按编号查找
+     *
+     * @param code
+     * @return
+     */
+    EmployeeDTO findByCode(String code);
+
+    /**
+     * 按账户查找员工资料
+     *
+     * @param accountId
+     * @param companyId
+     * @return
+     */
+    EmployeeDTO findByAccount(Long accountId, Long companyId);
+
+    /**
+     * 保存
+     *
+     * @param employee
+     */
+    void save(EmployeeDTO employee);
+
+    /**
+     * 更新员工资料中的开户银行和银行账号
+     * @param id
+     */
+    void updateBank(Long id, String bank, String bankaccount);
+
+    List<EmployeeDTO> selectEmployeeListByCondition(String con,Long companyId);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/ProductApi.java

@@ -0,0 +1,54 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.dto.ProductListDTO;
+import com.usoftchina.saas.document.dto.ProductUploadDTO;
+
+import java.util.List;
+
+public interface ProductApi {
+
+    /**
+     * @Description 更新最新采购单价
+     * @Param: [pu_id]
+     * @return: void
+     * @Author: guq
+     * @Date: 2018/10/16
+     */
+    void updateLatestPurchasePrice(Long pu_id);
+
+    /**
+     * 获取需要上传的物料数据
+     *
+     * @return
+     */
+    List<ProductUploadDTO> getUploadData(Long companyId);
+
+    /**
+     * 批量更新物料上传状态
+     *
+     * @param ids
+     * @param status
+     * @return
+     */
+    void updateStatus(String ids, String status);
+
+    /**
+     * 通过code查找物料信息
+     *
+     * @param code
+     * @return
+     */
+    ProductDTO getByProdCode(String code);
+
+    /**
+     * 上传至B2B平台
+     *
+     * @return
+     */
+    void uploadToB2B();
+
+    ProductListDTO getDataById(Long id);
+
+    void updateLeadTime(Long prodid,Integer leadtime,Long companyId);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/ProjectApi.java

@@ -0,0 +1,25 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.dto.ProjectDTO;
+
+/**
+ * @author yingp
+ * @date 2020/6/11
+ */
+public interface ProjectApi {
+    /**
+     * 按编号查找
+     *
+     * @param code
+     * @return
+     */
+    ProjectDTO findByCode(String code);
+
+    /**
+     * 按ID查找
+     *
+     * @param id
+     * @return
+     */
+    ProjectDTO getById(Long id);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/VendApamountApi.java

@@ -0,0 +1,31 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.document.entity.VendApamount;
+
+public interface VendApamountApi {
+    VendApamount getVendApByVendCodeAndCurrency(String vendCode, String currency);
+    void updateSelective(VendApamount record);
+    int insertSelective(VendApamount record);
+
+    Double getApLeftamount(String vendCode, String currency);
+    Double getPreLeftamount(String vendCode, String currency);
+
+    VendApamount getSumVendApByVendCodeAndCurrency(String vendcode, String currency);
+
+    VendApamount getSumVendApByCurrency(String currency);
+
+    /**
+     * 根据供应商和币别分组获取不含税金额
+     * @param vendcode
+     * @param currency
+     * @return
+     */
+    VendApamount getSumEsByVendCodeAndCurrency(String vendcode, String currency);
+
+    /**
+     * 根据币别分组获取不含税金额
+     * @param currency
+     * @return
+     */
+    Double getSumEsByCurrency(String currency);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/VendorApi.java

@@ -0,0 +1,76 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.document.dto.VendPayListDTO;
+import com.usoftchina.saas.document.dto.VendorDTO;
+import com.usoftchina.saas.document.dto.VendorListDTO;
+import com.usoftchina.saas.document.entity.Vendorcontact;
+
+public interface VendorApi {
+
+    /**
+     * 通过供应商ID查找  供应商主从表数据
+     *
+     * @param id
+     * @return
+     */
+    VendorListDTO getDataById(Long id);
+
+    /**
+     * 通过供应商UU号查找  供应商信息
+     *
+     * @param uu
+     * @return
+     */
+    VendorDTO findByUU(Long uu);
+
+    /**
+     * 通过供应商名称查找供应商信息
+     *
+     * @param name
+     * @return
+     */
+    VendorDTO findByName(String name);
+
+    /**
+     * 保存供应商
+     *
+     * @param vendorListDTO
+     * @return
+     */
+    DocBaseDTO saveFormData(VendorListDTO vendorListDTO);
+
+    int updateVendleftamountByPrimaryKey(Long ve_id);
+
+    /**
+     * 按编号查找
+     *
+     * @param code
+     * @return
+     */
+    VendorDTO findByCode(String code);
+
+    /**
+     * 按ID查找
+     *
+     * @param id
+     * @return
+     */
+    VendorDTO findById(Long id);
+
+    void updateAllVendleftamount();
+
+    /**
+     * 获取默认联系人
+     * @param id
+     * @return
+     */
+    Vendorcontact getVendorcontactDefault(Long id);
+
+    /**
+     * 根据供应商uu获取供应商应付余额 分币别信息
+     * @param uu
+     * @return
+     */
+    VendPayListDTO findVendPayListByUU(Long companyId,Long uu);
+}

applications/app-document/app-document-api/src/main/java/com/usoftchina/saas/document/api/WarehouseApi.java

@@ -0,0 +1,14 @@
+package com.usoftchina.saas.document.api;
+
+import java.util.Map;
+
+public interface WarehouseApi {
+
+    void post(Map<String, Object> map);
+
+    void unPost(Map<String, Object> map);
+
+    void postProdInout(Map<String, Object> map);
+
+    void unPostProdInout(Map<String, Object> map);
+}

applications/app-document/app-document-dto/build.gradle

@@ -0,0 +1,4 @@
+dependencies {
+    compile project(":base:base-biz:base-biz-dto")
+    compile project(':base:base-account:base-account-dto')
+}

applications/app-document/app-document-dto/lombok.config

@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.equalsAndHashCode.callSuper = call

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/CurrencyDTO.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+
+import java.io.Serializable;
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/04
+ */
+public class CurrencyDTO extends CommonBaseDTO implements Serializable {
+
+    private String cr_name;
+    private Double cr_rate;
+    private Long cr_standard;
+
+    public String getCr_name() {
+        return cr_name;
+    }
+
+    public void setCr_name(String cr_name) {
+        this.cr_name = cr_name;
+    }
+
+    public Double getCr_rate() {
+        return cr_rate;
+    }
+
+    public void setCr_rate(Double cr_rate) {
+        this.cr_rate = cr_rate;
+    }
+
+    public Long getCr_standard() {
+        return cr_standard;
+    }
+
+    public void setCr_standard(Long cr_standard) {
+        this.cr_standard = cr_standard;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/CustomerDTO.java

@@ -0,0 +1,82 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * Created by zdw
+ * 2018-10-23 17:21.
+ */
+@Data
+public class CustomerDTO extends CommonBaseDTO implements Serializable {
+    private String cu_code;
+
+    private String cu_shortname;
+
+    private String cu_name;
+
+    private String cu_uu;
+
+    private String cu_type;
+
+    private Date cu_begindate;
+
+    private Double cu_beginaramount;
+
+    private Double cu_beginprerecamount;
+
+    private Double cu_promisedays;
+
+    private Double cu_taxrate;
+
+    private Integer cu_sellerid;
+
+    private String cu_sellercode;
+
+    private String cu_sellername;
+
+    private Double cu_credit;
+
+    private String cu_status;
+
+    private String cu_statuscode;
+
+    private String cu_text1;
+
+    private String cu_text2;
+
+    private String cu_text3;
+
+    private String cu_text4;
+
+    private String cu_text5;
+
+    private Double cu_leftamount;
+
+    private Double cu_recamount;
+
+    private Double cu_preamount;
+
+    private String cu_remark;
+
+    private String cu_currency;
+
+    private Double cr_rate;
+
+    private Integer cu_paymentsid;
+
+    private String cu_payments;
+
+    private String cu_paymentscode;
+
+    private String cu_nsrzh;
+
+    private String cu_invoiceinfo;
+
+    private String cu_bankaccount;
+    
+    private String cu_bankcode;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/CustomerFormDTO.java

@@ -0,0 +1,20 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.biz.dto.BaseFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-10-23 17:26.
+ */
+@Data
+public class CustomerFormDTO extends BaseFormDTO implements Serializable {
+
+    private CustomerDTO main;
+    private List<CustomercontactDTO> items1;
+    private List<CustomeraddressDTO> items2;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/CustomeraddressDTO.java

@@ -0,0 +1,33 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CustomeraddressDTO extends CommonBaseDTO implements Serializable {
+
+    private Long ca_cuid;
+
+    private Integer ca_detno;
+
+    private String ca_person;
+
+    private String ca_phone;
+
+    private Integer ca_default;
+
+    private String ca_text1;
+
+    private String ca_text2;
+
+    private String ca_text3;
+
+    private String ca_text4;
+
+    private String ca_text5;
+
+    private String ca_address;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/CustomercontactDTO.java

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CustomercontactDTO extends CommonBaseDTO implements Serializable {
+
+    private Long cc_cuid;
+
+    private Integer cc_detno;
+
+    private String cc_name;
+
+    private String cc_tel;
+
+    private String cc_qq;
+
+    private String cc_email;
+
+    private String cc_text1;
+
+    private String cc_text2;
+
+    private String cc_text3;
+
+    private String cc_text4;
+
+    private String cc_text5;
+
+    private Integer cc_default;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/DepartmentDTO.java

@@ -0,0 +1,19 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class DepartmentDTO  extends CommonBaseDTO implements Serializable {
+    private String dp_code;
+    private String dp_name;
+    private Long dp_subof;
+    private Long dp_headmanid;
+    private String dp_headmanname;
+    private String dp_qywx;
+    private String dp_ding;
+    private String dp_status;
+    private Long  companyId;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/DocBankImformationDTO.java

@@ -0,0 +1,58 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class DocBankImformationDTO extends CommonBaseDTO {
+        private String bk_bankcode;
+
+        private String bk_bankname;
+
+        private Date bk_date;
+
+        private String bk_type;
+
+        private Double bk_beginamount;
+
+        private Double bk_thisamount;
+
+        private String bk_status;
+
+        private String bk_statuscode;
+
+        private Integer bk_ym;
+
+        private String bk_text1;
+
+        private String bk_text2;
+
+        private String bk_text3;
+
+        private String bk_text4;
+
+        private String bk_text5;
+
+        private String bk_remark;
+
+        private Double bk_income;
+
+        private Double bk_spending;
+
+        private String bk_currency;
+
+        private Double cr_rate;
+
+        private String bk_code;
+
+        private String bk_name;
+
+        private String bk_cacode;
+
+        private String bk_caname;
+
+        private Long bk_caid;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/EmployeeDTO.java

@@ -0,0 +1,81 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.account.dto.RoleBaseDTO;
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import com.usoftchina.saas.document.entity.Department;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-11-12 11:18.
+ */
+@Data
+public class EmployeeDTO extends CommonBaseDTO implements Serializable {
+  private Long id ;
+
+  private Long em_id ;
+
+  private String em_code;
+
+  private String em_name;
+
+  private String em_class;
+
+  private String em_mobile;
+
+  private String em_email;
+
+  private String em_text1;
+
+  private String em_text2;
+
+  private String em_text3;
+
+  private String em_text4;
+
+  private String em_text5;
+
+  private Long accountId;
+
+  private Long em_dpid;
+
+  private Long companyId;
+
+  private Integer updaterId;
+
+  private Date updateTime;
+
+  private String em_bank;
+
+  private String em_bankaccount;
+  private Long account_id;
+
+  private String dp_name;
+  /***
+   * 人员资料关联账户对应的角色信息
+   */
+  private List<RoleBaseDTO> roles;
+
+  /**
+   * 人员资料关联部门信息
+   *   private List<Department> departs;
+   * */
+
+
+  /**
+   * 角色资源
+   * */
+  private String roleIds;
+
+  /**
+   * 是否注册优软云
+   * */
+  private Boolean hasRegister;
+
+  private DepartmentDTO departmentDTO;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/EmployeeFormDTO.java

@@ -0,0 +1,23 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.document.entity.Employee;
+
+import java.io.Serializable;
+
+/**
+ * Created by zdw
+ * 2018-11-12 15:49.
+ */
+public class EmployeeFormDTO implements Serializable {
+
+    private Employee main;
+
+    public Employee getMain() {
+        return main;
+    }
+
+    public void setMain(Employee main) {
+        this.main = main;
+    }
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/EmployeeImportDTO.java

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.account.dto.RoleBaseDTO;
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by CJX
+ * 2020-5-11
+ */
+@Data
+public class EmployeeImportDTO extends CommonBaseDTO implements Serializable {
+
+  private String em_name;
+
+  private String em_mobile;
+
+  private String em_email;
+
+  private String dp_name;
+
+  private String name;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProdStorageDTO.java

@@ -0,0 +1,108 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 产品库列表
+ * @Author chenwei
+ * @Date 2019/01/10
+ */
+public class ProdStorageDTO implements Serializable {
+
+    private Long prodId;
+    private String prodName;
+    private String prodCode;
+    private String prodOrispeccode;
+    private String prodSpec;
+    private String prodBrand;
+    private String prodUnit;
+    private String prodLeadtime;
+    /**
+     * 上传状态
+     */
+    private String b2bStatus;
+    /**
+     * 绑定状态
+     */
+    private Short status;
+
+    public Long getProdId() {
+        return prodId;
+    }
+
+    public void setProdId(Long prodId) {
+        this.prodId = prodId;
+    }
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode;
+    }
+
+    public String getProdOrispeccode() {
+        return prodOrispeccode;
+    }
+
+    public void setProdOrispeccode(String prodOrispeccode) {
+        this.prodOrispeccode = prodOrispeccode;
+    }
+
+    public String getProdSpec() {
+        return prodSpec;
+    }
+
+    public void setProdSpec(String prodSpec) {
+        this.prodSpec = prodSpec;
+    }
+
+    public String getProdBrand() {
+        return prodBrand;
+    }
+
+    public void setProdBrand(String prodBrand) {
+        this.prodBrand = prodBrand;
+    }
+
+    public String getProdUnit() {
+        return prodUnit;
+    }
+
+    public void setProdUnit(String prodUnit) {
+        this.prodUnit = prodUnit;
+    }
+
+    public String getProdLeadtime() {
+        return prodLeadtime;
+    }
+
+    public void setProdLeadtime(String prodLeadtime) {
+        this.prodLeadtime = prodLeadtime;
+    }
+
+    public String getB2bStatus() {
+        return b2bStatus;
+    }
+
+    public void setB2bStatus(String b2bStatus) {
+        this.b2bStatus = b2bStatus;
+    }
+
+    public Short getStatus() {
+        return status;
+    }
+
+    public void setStatus(Short status) {
+        this.status = status;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductDTO.java

@@ -0,0 +1,55 @@
+package com.usoftchina.saas.document.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+public class ProductDTO implements Serializable {
+
+    private Long id;
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private long pr_zxbzs;
+    private long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
+    private Double pr_safetystock;
+    private String pr_manutype;
+    private Double pr_lossrate;
+    private String pr_serial;
+    private Double pr_dailycapacity;
+    protected Date createTime;
+    protected String creatorName;
+    protected Date updateTime;
+    protected String updaterName;
+    //productonhand
+    private Double po_onhand;
+
+
+    private Double po_avprice;
+    private String pr_remark;
+    private String b2bStatus;
+    //productunit
+    private Integer pu_decimal;
+    private String pr_taxcode;
+    private String pr_billitemname;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductListDTO.java

@@ -0,0 +1,30 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.biz.dto.BaseFormDTO;
+import com.usoftchina.saas.document.entity.Product;
+import com.usoftchina.saas.document.entity.ProductDetail;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ProductListDTO extends BaseFormDTO implements Serializable {
+
+    private Product main;
+    private List<ProductDetail> items;
+
+    public List<ProductDetail> getItems() {
+        return items;
+    }
+
+    public void setItems(List<ProductDetail> items) {
+        this.items = items;
+    }
+
+    public Product getMain() {
+        return main;
+    }
+
+    public void setMain(Product main) {
+        this.main = main;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductReserveCostDTO.java

@@ -0,0 +1,65 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 物料库存数量金额表
+ */
+@Data
+public class ProductReserveCostDTO extends CommonBaseDTO implements Serializable {
+
+    /**
+     * 物料编号
+     */
+    private String rc_prodCode;
+    /**
+     * 物料名称
+     */
+    private String rc_prodDetail;
+    /**
+     * 物料规格
+     */
+    private String rc_prodSpec;
+    /**
+     * 物料单位
+     */
+    private String rc_prodUnit;
+    /**
+     * 仓库编号
+     */
+    private String rc_whCode;
+    /**
+     * 仓库名称
+     */
+    private String rc_whName;
+    /**
+     * 数量
+     */
+    private Double rc_number;
+    /**
+     * 单价
+     */
+    private Double rc_price;
+    /**
+     * 金额
+     */
+    private Double rc_amount;
+
+    /**
+     * 物料品牌
+     */
+    private String rc_prodBrand;
+
+    /**
+     * 型号
+     * */
+    private String rc_prodOrispec;
+
+    /**
+     * 类型
+     * */
+    private String rc_prodKind;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductSalerDTO.java

@@ -0,0 +1,47 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 个人物料库
+ * @Author chenwei
+ * @Date 2019/01/10
+ */
+public class ProductSalerDTO implements Serializable {
+    /**
+     * 物料ID
+     */
+    private Long prodId;
+    /**
+     * 物料编号
+     */
+    private String prodCode;
+    /**
+     * 操作类型, 0:解绑 1:绑定
+     */
+    private Short operate;
+
+    public Long getProdId() {
+        return prodId;
+    }
+
+    public void setProdId(Long prodId) {
+        this.prodId = prodId;
+    }
+
+    public String getProdCode() {
+        return prodCode;
+    }
+
+    public void setProdCode(String prodCode) {
+        this.prodCode = prodCode;
+    }
+
+    public Short getOperate() {
+        return operate;
+    }
+
+    public void setOperate(Short operate) {
+        this.operate = operate;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductSalerUploadDTO.java

@@ -0,0 +1,71 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 个人物料库上传B2B传输对象
+ * @Author chenwei
+ * @Date 2019/01/10
+ */
+public class ProductSalerUploadDTO implements Serializable {
+    /**
+     * 主键id
+     */
+    private Long ps_id;
+
+    /**
+     * 物料code
+     */
+    private String ps_code;
+
+    /**
+     * 个人uu号
+     */
+    private Long em_uu;
+    /**
+     * 企业uu号
+     */
+    private Long en_uu;
+
+    public Long getPs_id() {
+        return ps_id;
+    }
+
+    public void setPs_id(Long ps_id) {
+        this.ps_id = ps_id;
+    }
+
+    public String getPs_code() {
+        return ps_code;
+    }
+
+    public void setPs_code(String ps_code) {
+        this.ps_code = ps_code;
+    }
+
+    public Long getEm_uu() {
+        return em_uu;
+    }
+
+    public void setEm_uu(Long em_uu) {
+        this.em_uu = em_uu;
+    }
+
+    public Long getEn_uu() {
+        return en_uu;
+    }
+
+    public void setEn_uu(Long en_uu) {
+        this.en_uu = en_uu;
+    }
+
+    public ProductSalerUploadDTO(Long ps_id, String ps_code, Long em_uu, Long en_uu) {
+        this.ps_id = ps_id;
+        this.ps_code = ps_code;
+        this.em_uu = em_uu;
+        this.en_uu = en_uu;
+    }
+
+    public ProductSalerUploadDTO() {
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProductUploadDTO.java

@@ -0,0 +1,105 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 上传B2B 物料对象
+ * @Author chenwei
+ * @Date 2019/01/10
+ */
+public class ProductUploadDTO implements Serializable {
+
+    private String pr_code;
+    private String pr_detail;
+    private Double pr_leadtime;
+    private String pr_spec;
+    private String pr_unit;
+    private Double pr_zxbzs;
+    private Long pr_id;
+    private Double pr_zxdhl;
+    private String pr_orispeccode;
+    /**
+     * 物料品牌
+     */
+    private String pr_brand;
+
+    public String getPr_code() {
+        return pr_code;
+    }
+
+    public void setPr_code(String pr_code) {
+        this.pr_code = pr_code;
+    }
+
+    public String getPr_detail() {
+        return pr_detail;
+    }
+
+    public void setPr_detail(String pr_detail) {
+        this.pr_detail = pr_detail;
+    }
+
+    public Double getPr_leadtime() {
+        return pr_leadtime;
+    }
+
+    public void setPr_leadtime(Double pr_leadtime) {
+        this.pr_leadtime = pr_leadtime;
+    }
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_unit() {
+        return pr_unit;
+    }
+
+    public void setPr_unit(String pr_unit) {
+        this.pr_unit = pr_unit;
+    }
+
+    public Double getPr_zxbzs() {
+        return pr_zxbzs;
+    }
+
+    public void setPr_zxbzs(Double pr_zxbzs) {
+        this.pr_zxbzs = pr_zxbzs;
+    }
+
+    public Long getPr_id() {
+        return pr_id;
+    }
+
+    public void setPr_id(Long pr_id) {
+        this.pr_id = pr_id;
+    }
+
+    public Double getPr_zxdhl() {
+        return pr_zxdhl;
+    }
+
+    public void setPr_zxdhl(Double pr_zxdhl) {
+        this.pr_zxdhl = pr_zxdhl;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
+    public String getPr_brand() {
+        return pr_brand;
+    }
+
+    public void setPr_brand(String pr_brand) {
+        this.pr_brand = pr_brand;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/ProjectDTO.java

@@ -0,0 +1,22 @@
+package com.usoftchina.saas.document.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yingp
+ * @date 2020/6/11
+ */
+@Data
+public class ProjectDTO implements Serializable {
+    private Long id;
+    /**
+     * 编号
+     */
+    private String code;
+    /**
+     * 名称
+     */
+    private String name;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/VendPayDetailDTO.java

@@ -0,0 +1,12 @@
+package com.usoftchina.saas.document.dto;
+
+import lombok.Data;
+
+@Data
+public class VendPayDetailDTO {
+
+    String currency;
+
+    Double amount;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/VendPayListDTO.java

@@ -0,0 +1,13 @@
+package com.usoftchina.saas.document.dto;
+
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class VendPayListDTO {
+    String veName;
+
+    String veUU;
+
+    List<VendPayDetailDTO> details;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/VendorDTO.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.base.dto.CommonBaseDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class VendorDTO extends CommonBaseDTO implements Serializable{
+
+
+    private String ve_code;
+
+    private String ve_shortname;
+
+    private String ve_name;
+
+    private String ve_type;
+
+    private String ve_status;
+
+    private String ve_remark;
+
+    private Long ve_buyerid;
+
+    private String ve_buyercode;
+
+    private String ve_buyername;
+
+    private String ve_address;
+
+    private Integer ve_paymentsid;
+
+    private String ve_payments;
+
+    private String ve_paymentscode;
+
+    private Double ve_taxrate;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/VendorListDTO.java

@@ -0,0 +1,30 @@
+package com.usoftchina.saas.document.dto;
+
+import com.usoftchina.saas.biz.dto.BaseFormDTO;
+import com.usoftchina.saas.document.entity.Vendor;
+import com.usoftchina.saas.document.entity.Vendorcontact;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class VendorListDTO extends BaseFormDTO implements Serializable {
+
+    private Vendor main;
+    private List<Vendorcontact> items;
+
+    public Vendor getMain() {
+        return main;
+    }
+
+    public void setMain(Vendor main) {
+        this.main = main;
+    }
+
+    public List<Vendorcontact> getItems() {
+        return items;
+    }
+
+    public void setItems(List<Vendorcontact> items) {
+        this.items = items;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/dto/WarehouseDTO.java

@@ -0,0 +1,11 @@
+package com.usoftchina.saas.document.dto;
+
+import java.io.Serializable;
+
+public class WarehouseDTO implements Serializable {
+
+    private long wh_id;
+    private String wh_code;
+    private String wh_name;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Address.java

@@ -0,0 +1,78 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Address extends CommonBaseEntity implements Serializable {
+
+    private String ad_text1;
+
+    private String ad_text2;
+
+    private String ad_text3;
+
+    private String ad_text4;
+
+    private String ad_text5;
+
+    private String ad_address;
+
+    private Long ad_default;
+
+    public Long getAd_default() {
+        return ad_default;
+    }
+
+    public void setAd_default(Long ad_default) {
+        this.ad_default = ad_default;
+    }
+
+    public String getAd_text1() {
+        return ad_text1;
+    }
+
+    public void setAd_text1(String ad_text1) {
+        this.ad_text1 = ad_text1 == null ? null : ad_text1.trim();
+    }
+
+    public String getAd_text2() {
+        return ad_text2;
+    }
+
+    public void setAd_text2(String ad_text2) {
+        this.ad_text2 = ad_text2 == null ? null : ad_text2.trim();
+    }
+
+    public String getAd_text3() {
+        return ad_text3;
+    }
+
+    public void setAd_text3(String ad_text3) {
+        this.ad_text3 = ad_text3 == null ? null : ad_text3.trim();
+    }
+
+    public String getAd_text4() {
+        return ad_text4;
+    }
+
+    public void setAd_text4(String ad_text4) {
+        this.ad_text4 = ad_text4 == null ? null : ad_text4.trim();
+    }
+
+    public String getAd_text5() {
+        return ad_text5;
+    }
+
+    public void setAd_text5(String ad_text5) {
+        this.ad_text5 = ad_text5 == null ? null : ad_text5.trim();
+    }
+
+    public String getAd_address() {
+        return ad_address;
+    }
+
+    public void setAd_address(String ad_address) {
+        this.ad_address = ad_address == null ? null : ad_address.trim();
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Currency.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/04
+ */
+public class Currency extends CommonBaseEntity implements Serializable{
+
+    private String cr_name;
+    private Double cr_rate;
+    private Long cr_standard;
+
+    public String getCr_name() {
+        return cr_name;
+    }
+
+    public void setCr_name(String cr_name) {
+        this.cr_name = cr_name;
+    }
+
+    public Double getCr_rate() {
+        return cr_rate;
+    }
+
+    public void setCr_rate(Double cr_rate) {
+        this.cr_rate = cr_rate;
+    }
+
+    public Long getCr_standard() {
+        return cr_standard;
+    }
+
+    public void setCr_standard(Long cr_standard) {
+        this.cr_standard = cr_standard;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/CustArInit.java

@@ -0,0 +1,59 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户币别期初及余额表
+ * @author hey
+ * @Date 2019/03/11
+ */
+
+@Data
+public class CustArInit extends CommonBaseEntity implements Serializable{
+    private String ca_code;
+    /**
+     * 客户id
+     */
+    private long ca_custid;
+
+    /**
+     * 客户编号
+     */
+    private String ca_custcode;
+    /**
+     * 客户名称
+     */
+    private String ca_custname;
+    /**
+     * 币别
+     */
+    private String ca_currency;
+    private int ca_ym;
+    /**
+     * 期初日期
+     */
+    private Date ca_begindate;
+    /**
+     * 期初应收
+     */
+    private Double ca_beginaramount;
+    /**
+     * 期初预收
+     */
+    private Double ca_beginprerecamount;
+    /**
+     * 期初应收已核销
+     */
+    private Double sl_yamount;
+    /**
+     * 备注
+     */
+    private String ca_remark;
+    private int ca_emid;
+    private String ca_emcode;
+    private String ca_emname;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/CustArInitList.java

@@ -0,0 +1,81 @@
+package com.usoftchina.saas.document.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CustArInitList implements Serializable {
+
+    /* 主表字段 */
+    private Long id;
+    /**
+     * 编号
+     */
+    private String ca_code;
+    /**
+     * 客户id
+     */
+    private long ca_custid;
+
+    /**
+     * 客户编号
+     */
+    private String ca_custcode;
+
+    /**
+     * 客户名称
+     */
+    private String ca_custname;
+    /**
+     * 币别
+     */
+    private String ca_currency;
+    /**
+     * 期初日期
+     */
+    private Date ca_begindate;
+    /**
+     * 期初应收
+     */
+    private Double ca_beginaramount;
+    /**
+     * 期初预收
+     */
+    private Double ca_beginprerecamount;
+    /**
+     * 应收已核销
+     */
+    private Double ca_beginarverify;
+    /**
+     * 预收已核销
+     */
+    private Double ca_beginprerecverify;
+
+    private Integer companyId;
+
+    private Integer updaterId;
+
+    private Date updateTime;
+
+    private String creatorName;
+
+    private Integer creatorId;
+
+    private Date createTime;
+
+    private String updaterName;
+
+    private Integer ca_emid;
+
+    private String ca_emcode;
+
+    private String ca_emname;
+
+    private String ca_remark;
+    private Double arverify;
+    private Double preverify;
+    private Double leftamount;
+    private Integer ca_ym;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/CustAramount.java

@@ -0,0 +1,72 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户币别期初及余额表
+ * @author hey
+ * @Date 2019/03/11
+ */
+
+@Data
+public class CustAramount extends CommonBaseEntity implements Serializable{
+
+    /**
+     * 客户id
+     */
+    private long ca_custid;
+
+    /**
+     * 客户编号
+     */
+    private String ca_custcode;
+    /**
+     * 客户名称
+     */
+    private String ca_custname;
+    /**
+     * 币别
+     */
+    private String ca_currency;
+    /**
+     * 期初日期
+     */
+    private Date ca_begindate;
+    /**
+     * 期初应收
+     */
+    private Double ca_beginaramount;
+    /**
+     * 期初预收
+     */
+    private Double ca_beginprerecamount;
+    /**
+     * 应收金额
+     */
+    private Double ca_recamount;
+    /**
+     * 预收金额
+     */
+    private Double ca_preamount;
+    /**
+     * 应付余额
+     */
+    private Double ca_leftamount;
+
+    /**
+     * 发出商品金额
+     */
+    private Double ca_gsamount;
+
+    /**
+     * 发出商品成本金额
+     */
+    private Double ca_gscostamount;
+    private  Double ca_add_bill;
+    private  Double ca_reduce_bill;
+    private  Double ca_leftamount_bill;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/CustAramountList.java

@@ -0,0 +1,94 @@
+package com.usoftchina.saas.document.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CustAramountList implements Serializable {
+
+    /* 主表字段 */
+    private Long id;
+
+    /**
+     * 客户id
+     */
+    private long ca_custid;
+
+    /**
+     * 客户编号
+     */
+    private String ca_custcode;
+    /**
+     * 客户名称
+     */
+    private String ca_custname;
+    /**
+     * 币别
+     */
+    private String ca_currency;
+    /**
+     * 期初日期
+     */
+    private Date ca_begindate;
+    /**
+     * 期初应收
+     */
+    private Double ca_beginaramount;
+    /**
+     * 期初预收
+     */
+    private Double ca_beginprerecamount;
+    /**
+     * 应收金额
+     */
+    private Double ca_recamount;
+    /**
+     * 预收金额
+     */
+    private Double ca_preamount;
+    /**
+     * 应付余额
+     */
+    private Double ca_leftamount;
+    private Double ca_leftamount_bill;
+    private Integer companyId;
+
+    private Integer updaterId;
+
+    private Date updateTime;
+
+    private String creatorName;
+
+    private Integer creatorId;
+
+    private Date createTime;
+
+    private String updaterName;
+
+    private Integer ca_emid;
+
+    private String ca_emcode;
+
+    private String ca_emname;
+
+    private Double recamount;
+
+    private Double preamount;
+
+    private String cu_sellername;
+
+
+    //
+    private String sl_kind;
+    private String sl_code;
+    private Date sl_date;
+    private Double sl_amount;
+    private Double yrec;
+    private Double recleft;
+    private Double sl_preamount;
+    private Double ypre;
+    private Double preleft;
+    private Date sl_paydate;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Customer.java

@@ -0,0 +1,78 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+@Data
+public class Customer extends CommonBaseEntity implements Serializable {
+
+    private String cu_code;
+
+    private String cu_shortname;
+
+    private String cu_name;
+
+    private String cu_uu;
+
+    private String cu_type;
+
+    private Date cu_begindate;
+
+    private Double cu_beginaramount;
+
+    private Double cu_beginprerecamount;
+
+    private Double cu_promisedays;
+
+    private Double cu_taxrate;
+
+    private Integer cu_sellerid;
+
+    private String cu_sellercode;
+
+    private String cu_sellername;
+
+    private Double cu_credit;
+
+    private String cu_status;
+
+    private String cu_statuscode;
+
+    private String cu_text1;
+
+    private String cu_text2;
+
+    private String cu_text3;
+
+    private String cu_text4;
+
+    private String cu_text5;
+
+    private Double cu_leftamount;
+
+    private Double cu_recamount;
+
+    private Double cu_preamount;
+
+    private String cu_remark;
+
+    private String cu_currency;
+
+    private Double cr_rate;
+
+    private Integer cu_paymentsid;
+
+    private String cu_payments;
+
+    private String cu_paymentscode;
+
+    private String cu_nsrzh;
+
+    private String cu_invoiceinfo;
+
+    private String cu_bankaccount;
+
+    private String cu_bankcode;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/CustomerList.java

@@ -0,0 +1,128 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by zdw
+ * 2018-10-23 15:35.
+ */
+
+@Data
+public class CustomerList extends CommonBaseEntity{
+//customer
+    private String cu_code;
+
+    private String cu_shortname;
+
+    private String cu_name;
+
+    private String cu_uu;
+
+    private String cu_type;
+
+    private Date cu_begindate;
+
+    private Double cu_beginaramount;
+
+    private Double cu_beginprerecamount;
+
+    private Double cu_promisedays;
+
+    private Double cu_taxrate;
+
+    private Integer cu_sellerid;
+
+    private String cu_sellercode;
+
+    private String cu_sellername;
+
+    private Double cu_credit;
+
+    private String cu_status;
+
+    private String cu_statuscode;
+
+    private String cu_text1;
+
+    private String cu_text2;
+
+    private String cu_text3;
+
+    private String cu_text4;
+
+    private String cu_text5;
+
+    private Double cu_leftamount;
+
+    private Double cu_recamount;
+
+    private Double cu_preamount;
+
+    private String cu_remark;
+
+    private String cu_currency;
+
+    private Integer cu_paymentsid;
+
+    private String cu_payments;
+
+    private String cu_paymentscode;
+
+    private String cu_bankaccount;
+
+    private String cu_bankcode;
+
+    //currencys
+    private Double cr_rate;
+//customeraddress
+
+    private Long ca_cuid;
+
+    private Integer ca_detno;
+
+    private String ca_person;
+
+    private String ca_phone;
+
+    private Integer ca_default;
+
+    private String ca_text1;
+
+    private String ca_text2;
+
+    private String ca_text3;
+
+    private String ca_text4;
+
+    private String ca_text5;
+
+    private String ca_address;
+//    CustomercontactDTO
+
+    private Long cc_cuid;
+
+    private Integer cc_detno;
+
+    private String cc_name;
+
+    private String cc_tel;
+
+    private String cc_qq;
+
+    private String cc_email;
+
+    private String cc_text1;
+
+    private String cc_text2;
+
+    private String cc_text3;
+
+    private String cc_text4;
+
+    private String cc_text5;
+
+    private Integer cc_default;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Customeraddress.java

@@ -0,0 +1,32 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class Customeraddress extends CommonBaseEntity implements Serializable {
+
+    private Long ca_cuid;
+
+    private Integer ca_detno;
+
+    private String ca_person;
+
+    private String ca_phone;
+
+    private Integer ca_default;
+
+    private String ca_text1;
+
+    private String ca_text2;
+
+    private String ca_text3;
+
+    private String ca_text4;
+
+    private String ca_text5;
+
+    private String ca_address;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Customercontact.java

@@ -0,0 +1,34 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class Customercontact extends CommonBaseEntity implements Serializable {
+
+    private Long cc_cuid;
+
+    private Integer cc_detno;
+
+    private String cc_name;
+
+    private String cc_tel;
+
+    private String cc_qq;
+
+    private String cc_email;
+
+    private String cc_text1;
+
+    private String cc_text2;
+
+    private String cc_text3;
+
+    private String cc_text4;
+
+    private String cc_text5;
+
+    private Integer cc_default;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Customerkind.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Customerkind extends CommonBaseEntity implements Serializable {
+    private String ck_name;
+
+    public String getCk_name() {
+        return ck_name;
+    }
+
+    public void setCk_name(String ck_name) {
+        this.ck_name = ck_name == null ? null : ck_name.trim();
+    }
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Department.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+import java.io.Serializable;
+
+@Data
+public class Department extends CommonBaseEntity implements Serializable {
+    private String dp_code;
+    private String dp_name;
+    private Long dp_subof;
+    private Long dp_headmanid;
+    private String dp_headmanname;
+    private String dp_qywx;
+    private String dp_ding;
+    private String dp_status;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/DocBankInformation.java

@@ -0,0 +1,71 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class DocBankInformation extends CommonBaseEntity implements Serializable {
+
+    private String bk_bankcode;
+
+    private String bk_bankname;
+
+    private Date bk_date;
+
+    private String bk_type;
+
+    private Double bk_beginamount;
+
+    private Double bk_thisamount;
+
+    private String bk_status;
+
+    private String bk_statuscode;
+
+    private Integer bk_ym;
+
+    private String bk_text1;
+
+    private String bk_text2;
+
+    private String bk_text3;
+
+    private String bk_text4;
+
+    private String bk_text5;
+
+    private String bk_remark;
+
+    private Double bk_income;
+
+    private Double bk_spending;
+
+    private String bk_currency;
+
+    private Double cr_rate;
+
+    private String bk_code;
+
+    private String bk_name;
+
+    private String bk_cacode;
+
+    private String bk_caname;
+
+    private Long bk_caid;
+
+    private Double bb_doublebalance;
+
+    private Double bb_doublebegin;
+
+    private Double bb_balance;
+
+    private String bb_currency;
+
+    private String ca_forcurrency;
+
+    private String ca_desc;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/DocBankSubledger.java

@@ -0,0 +1,195 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author hx
+ * @createtime 2018-10-19 15:58
+ */
+@Data
+public class DocBankSubledger extends CommonBaseEntity implements Serializable {
+    private Integer bl_id;  //ID
+
+    private Integer bl_ym;  //期间
+
+    private Integer bl_bankid;  //账户ID
+
+    private String bl_bankcode; //账户编号
+
+    private String bl_bankname;  //账户名称
+
+    private String bl_code;     //单据编号
+ 
+    private String bl_kind;     //单据类型
+
+    private Date bl_date;      //单据日期
+
+    private String bl_asstype;   //往来类型
+
+    private String bl_asscode;    //往来单位编号
+
+    private String bl_assname;    //往来单位名称
+
+    private Double bl_income;    //收入
+
+    private Double bl_spending;   //支出
+
+    private String bl_manname;    //收/付款人
+ 
+    private String bl_remark;    //备注
+
+    private Double bl_orderamount;
+
+    private Integer bl_assid;
+
+    private String bl_item;
+
+    public Double getBl_orderamount() {
+        return bl_orderamount;
+    }
+
+    public void setBl_orderamount(Double bl_orderamount) {
+        this.bl_orderamount = bl_orderamount;
+    }
+
+    public Integer getBl_assid() {
+        return bl_assid;
+    }
+
+    public void setBl_assid(Integer bl_assid) {
+        this.bl_assid = bl_assid;
+    }
+
+    public String getBl_item() {
+        return bl_item;
+    }
+
+    public void setBl_item(String bl_item) {
+        this.bl_item = bl_item;
+    }
+
+    public Integer getBl_id() {
+        return bl_id;
+    }
+
+    public void setBl_id(Integer bl_id) {
+        this.bl_id = bl_id;
+    }
+
+    public Integer getBl_ym() {
+        return bl_ym;
+    }
+
+    public void setBl_ym(Integer bl_ym) {
+        this.bl_ym = bl_ym;
+    }
+
+    public Integer getBl_bankid() {
+        return bl_bankid;
+    }
+
+    public void setBl_bankid(Integer bl_bankid) {
+        this.bl_bankid = bl_bankid;
+    }
+
+    public String getBl_bankcode() {
+        return bl_bankcode;
+    }
+
+    public void setBl_bankcode(String bl_bankcode) {
+        this.bl_bankcode = bl_bankcode == null ? null : bl_bankcode.trim();
+    }
+
+    public String getBl_bankname() {
+        return bl_bankname;
+    }
+
+    public void setBl_bankname(String bl_bankname) {
+        this.bl_bankname = bl_bankname == null ? null : bl_bankname.trim();
+    }
+
+    public String getBl_code() {
+        return bl_code;
+    }
+
+    public void setBl_code(String bl_code) {
+        this.bl_code = bl_code == null ? null : bl_code.trim();
+    }
+
+    public String getBl_kind() {
+        return bl_kind;
+    }
+
+    public void setBl_kind(String bl_kind) {
+        this.bl_kind = bl_kind == null ? null : bl_kind.trim();
+    }
+
+    public Date getBl_date() {
+        return bl_date;
+    }
+
+    public void setBl_date(Date bl_date) {
+        this.bl_date = bl_date;
+    }
+
+    public String getBl_asstype() {
+        return bl_asstype;
+    }
+
+    public void setBl_asstype(String bl_asstype) {
+        this.bl_asstype = bl_asstype == null ? null : bl_asstype.trim();
+    }
+
+    public String getBl_asscode() {
+        return bl_asscode;
+    }
+
+    public void setBl_asscode(String bl_asscode) {
+        this.bl_asscode = bl_asscode == null ? null : bl_asscode.trim();
+    }
+
+    public String getBl_assname() {
+        return bl_assname;
+    }
+
+    public void setBl_assname(String bl_assname) {
+        this.bl_assname = bl_assname == null ? null : bl_assname.trim();
+    }
+
+    public Double getBl_income() {
+        return bl_income;
+    }
+
+    public void setBl_income(Double bl_income) {
+        this.bl_income = bl_income;
+    }
+
+    public Double getBl_spending() {
+        return bl_spending;
+    }
+
+    public void setBl_spending(Double bl_spending) {
+        this.bl_spending = bl_spending;
+    }
+
+    public String getBl_manname() {
+        return bl_manname;
+    }
+
+    public void setBl_manname(String bl_manname) {
+        this.bl_manname = bl_manname == null ? null : bl_manname.trim();
+    }
+
+    public String getBl_remark() {
+        return bl_remark;
+    }
+
+    public void setBl_remark(String bl_remark) {
+        this.bl_remark = bl_remark == null ? null : bl_remark.trim();
+    }
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/DocSubledger.java

@@ -0,0 +1,43 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//中间表
+@Data
+public class DocSubledger extends CommonBaseEntity implements Serializable {
+
+    private String sl_code;
+
+    private String sl_kind;
+
+    private Integer sl_custid;
+
+    private Integer sl_vendid;
+
+    private Date sl_date;
+
+    private Double sl_amount;
+
+    private Double sl_preamount;
+
+    private Double sl_yamount;
+
+    private Double sl_namount;
+
+    private String sl_remark;
+
+    private Double sl_orderamount;
+
+    private Double sl_discount;
+
+    private Integer sl_ym;
+    private String sl_currency;
+    private Integer sl_emid;
+    private String sl_emcode;
+    private String sl_emname;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Employee.java

@@ -0,0 +1,47 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Employee extends CommonBaseEntity implements Serializable {
+
+    private String em_code;
+
+    private String em_name;
+
+    private String em_class;
+
+    private String em_mobile;
+
+    private String em_email;
+
+    private String em_text1;
+
+    private String em_text2;
+
+    private String em_text3;
+
+    private String em_text4;
+
+    private String em_text5;
+
+    private Long account_id;
+
+    private Long em_dpid;
+
+    private String em_bank;
+
+    private String em_bankaccount;
+
+    /**
+     * 是否已离职
+     *
+     * @return
+     */
+    public boolean hasLeaveAway() {
+       return "离职".equals(em_class);
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Fundinouttype.java

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Fundinouttype extends CommonBaseEntity implements Serializable {
+    private String ft_name;
+
+    private String ft_kind;
+
+    public String getFt_name() {
+        return ft_name;
+    }
+
+    public void setFt_name(String ft_name) {
+        this.ft_name = ft_name == null ? null : ft_name.trim();
+    }
+
+    public String getFt_kind() {
+        return ft_kind;
+    }
+
+    public void setFt_kind(String ft_kind) {
+        this.ft_kind = ft_kind == null ? null : ft_kind.trim();
+    }
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/PaymentsPay.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author CJX
+ * @Date: 2020/4/23
+ */
+@Data
+public class PaymentsPay  extends CommonBaseEntity implements Serializable {
+
+    private String pa_code;
+
+    private String pa_name;
+
+    private Integer pa_beginby;
+
+    private Integer pa_dayadd;
+
+    private Integer pa_monthadd;
+
+    private String pa_status;
+
+    private String pa_statuscode;
+
+    private String pa_text1;
+
+    private String pa_text2;
+
+    private String pa_text3;
+
+    private String pa_text4;
+
+    private String pa_text5;
+
+    private Integer pa_delay;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/PaymentsRec.java

@@ -0,0 +1,41 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author CJX
+ * @Date: 2020/4/23
+ */
+@Data
+public class PaymentsRec extends CommonBaseEntity implements Serializable {
+
+    private String pa_code;
+
+    private String pa_name;
+
+    private Integer pa_beginby;
+
+    private Integer pa_dayadd;
+
+    private Integer pa_monthadd;
+
+    private String pa_status;
+
+    private String pa_statuscode;
+
+    private String pa_text1;
+
+    private String pa_text2;
+
+    private String pa_text3;
+
+    private String pa_text4;
+
+    private String pa_text5;
+
+    private Integer pa_delay;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/ProdIODetail.java

@@ -0,0 +1,86 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ProdIODetail extends CommonBaseEntity implements Serializable {
+
+    private Long pd_piid;
+
+    private String pd_inoutno;
+
+    private String pd_piclass;
+
+    private Integer pd_pdno;
+
+    private String pd_ordercode;
+
+    private Integer pd_orderdetno;
+
+    private Long pd_prodid;
+
+    private String pd_prodcode;
+
+    private String pd_unit;
+
+    private Double pd_inqty;
+
+    private Double pd_outqty;
+
+    private Double pd_orderprice;
+
+    private Double pd_sendprice;
+
+    private Double pd_price;
+
+    private Double pd_total;
+
+    private Double pd_taxrate;
+
+    private Double pd_netprice;
+
+    private Double pd_nettotal;
+
+    private Integer pd_whid;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_inwhid;
+
+    private String pd_inwhcode;
+
+    private String pd_inwhname;
+
+    private Integer pd_orderid;
+
+    private Integer pd_sdid;
+
+    private Integer pd_status;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Integer pd_ym;
+
+    private Double pd_yqty;
+
+    private String pd_remark;
+
+    private Long pd_ioid;
+
+    private ProductDTO productDTO;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/ProdInOut.java

@@ -0,0 +1,66 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ProdInOut extends CommonBaseEntity implements Serializable {
+
+    private String pi_inoutno;
+
+    private String pi_class;
+
+    private Date pi_date;
+
+    private Integer pi_vendid;
+
+    private String pi_vendcode;
+
+    private String pi_vendname;
+
+    private Integer pi_custid;
+
+    private String pi_custcode;
+
+    private String pi_custname;
+
+    private Integer pi_puid;
+
+    private String pi_pucode;
+
+    private Integer pi_said;
+
+    private String pi_sacode;
+
+    private Double pi_total;
+
+    private String pi_status;
+
+    private String pi_statuscode;
+
+    private String pi_printstatus;
+
+    private String pi_printstatuscode;
+
+    private String pi_text1;
+
+    private String pi_text2;
+
+    private String pi_text3;
+
+    private String pi_text4;
+
+    private String pi_text5;
+
+    private String pi_address;
+
+    private Date pi_auditdate;
+
+    private String pi_auditman;
+
+    private String pi_remark;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/ProdinoutOtherKind.java

@@ -0,0 +1,15 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ProdinoutOtherKind extends CommonBaseEntity implements Serializable {
+
+    private String pok_name;
+
+    private String pok_type;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Product.java

@@ -0,0 +1,47 @@
+package com.usoftchina.saas.document.entity;
+
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Product extends CommonBaseEntity implements Serializable {
+
+    private String pr_code;
+    private String pr_detail;
+    private String pr_spec;
+    private String pr_unit;
+    private String pr_kind;
+    private String pr_orispeccode;
+    private Long pr_whid;
+    private String pr_whcode;
+    private String pr_whname;
+    private Double pr_zxbzs;
+    private Long pr_leadtime;
+    private String pr_brand;
+    private String pr_standardprice;
+    private String pr_purcprice;
+    private String pr_saleprice;
+    private Long pr_vendid;
+    private String pr_vendname;
+    private String pr_vendcode;
+    private String pr_status;
+    private String pr_statuscode;
+    private String pr_text1;
+    private String pr_text2;
+    private String pr_text3;
+    private String pr_text4;
+    private String pr_remark;
+    private String b2bStatus;
+    private String pr_text5;
+    private Double pr_safetystock;
+    private String pr_manutype;
+    private Double pr_lossrate;
+    private String pr_serial;
+    private String pr_taxcode;
+    private String pr_billitemname;
+    private Double pr_dailycapacity;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/ProductDetail.java

@@ -0,0 +1,147 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class ProductDetail extends CommonBaseEntity implements Serializable {
+    private Long pd_prodid;
+
+    private String pd_prodcode;
+
+    private Integer pd_detno;
+
+    private String pd_whcode;
+
+    private String pd_whname;
+
+    private Integer pd_whid;
+
+    private Double pd_price;
+
+    private Double pd_amount;
+
+    private String pd_text1;
+
+    private String pd_text2;
+
+    private String pd_text3;
+
+    private String pd_text4;
+
+    private String pd_text5;
+
+    private Double pd_num;
+
+    public Long getPd_prodid() {
+        return pd_prodid;
+    }
+
+    public void setPd_prodid(Long pd_prodid) {
+        this.pd_prodid = pd_prodid;
+    }
+
+    public String getPd_prodcode() {
+        return pd_prodcode;
+    }
+
+    public void setPd_prodcode(String pd_prodcode) {
+        this.pd_prodcode = pd_prodcode == null ? null : pd_prodcode.trim();
+    }
+
+    public Integer getPd_detno() {
+        return pd_detno;
+    }
+
+    public void setPd_detno(Integer pd_detno) {
+        this.pd_detno = pd_detno;
+    }
+
+    public String getPd_whcode() {
+        return pd_whcode;
+    }
+
+    public void setPd_whcode(String pd_whcode) {
+        this.pd_whcode = pd_whcode == null ? null : pd_whcode.trim();
+    }
+
+    public String getPd_whname() {
+        return pd_whname;
+    }
+
+    public void setPd_whname(String pd_whname) {
+        this.pd_whname = pd_whname == null ? null : pd_whname.trim();
+    }
+
+    public Integer getPd_whid() {
+        return pd_whid;
+    }
+
+    public void setPd_whid(Integer pd_whid) {
+        this.pd_whid = pd_whid;
+    }
+
+    public Double getPd_price() {
+        return pd_price;
+    }
+
+    public void setPd_price(Double pd_price) {
+        this.pd_price = pd_price;
+    }
+
+    public Double getPd_amount() {
+        return pd_amount;
+    }
+
+    public void setPd_amount(Double pd_amount) {
+        this.pd_amount = pd_amount;
+    }
+
+    public String getPd_text1() {
+        return pd_text1;
+    }
+
+    public void setPd_text1(String pd_text1) {
+        this.pd_text1 = pd_text1 == null ? null : pd_text1.trim();
+    }
+
+    public String getPd_text2() {
+        return pd_text2;
+    }
+
+    public void setPd_text2(String pd_text2) {
+        this.pd_text2 = pd_text2 == null ? null : pd_text2.trim();
+    }
+
+    public String getPd_text3() {
+        return pd_text3;
+    }
+
+    public void setPd_text3(String pd_text3) {
+        this.pd_text3 = pd_text3 == null ? null : pd_text3.trim();
+    }
+
+    public String getPd_text4() {
+        return pd_text4;
+    }
+
+    public void setPd_text4(String pd_text4) {
+        this.pd_text4 = pd_text4 == null ? null : pd_text4.trim();
+    }
+
+    public String getPd_text5() {
+        return pd_text5;
+    }
+
+    public void setPd_text5(String pd_text5) {
+        this.pd_text5 = pd_text5 == null ? null : pd_text5.trim();
+    }
+
+    public Double getPd_num() {
+        return pd_num;
+    }
+
+    public void setPd_num(Double pd_num) {
+        this.pd_num = pd_num;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/ProductSerial.java

@@ -0,0 +1,16 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class ProductSerial extends CommonBaseEntity implements Serializable {
+    private String ps_name;
+
+    private Long ps_caid;
+
+    private String ps_cacode;
+
+    private String ps_cadesc;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Productbrand.java

@@ -0,0 +1,17 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Productbrand extends CommonBaseEntity implements Serializable {
+    private String pb_name;
+
+    public String getPb_name() {
+        return pb_name;
+    }
+
+    public void setPb_name(String pb_name) {
+        this.pb_name = pb_name == null ? null : pb_name.trim();
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Producttype.java

@@ -0,0 +1,18 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Producttype extends CommonBaseEntity implements Serializable {
+
+    private String pt_name;
+
+    public String getPt_name() {
+        return pt_name;
+    }
+
+    public void setPt_name(String pt_name) {
+        this.pt_name = pt_name == null ? null : pt_name.trim();
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Productunit.java

@@ -0,0 +1,27 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Productunit extends CommonBaseEntity implements Serializable {
+    private String pu_name;
+
+    private Integer pu_decimal;
+
+    public String getPu_name() {
+        return pu_name;
+    }
+
+    public void setPu_name(String pu_name) {
+        this.pu_name = pu_name == null ? null : pu_name.trim();
+    }
+
+    public Integer getPu_decimal() {
+        return pu_decimal;
+    }
+
+    public void setPu_decimal(Integer pu_decimal) {
+        this.pu_decimal = pu_decimal;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/VendApInit.java

@@ -0,0 +1,56 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 客户币别期初及余额表
+ * @author hey
+ * @Date 2019/03/11
+ */
+
+@Data
+public class VendApInit extends CommonBaseEntity implements Serializable{
+    private String va_code;
+    /**
+     * 客户id
+     */
+    private long va_vendid;
+
+    /**
+     * 客户编号
+     */
+    private String va_vendcode;
+    /**
+     * 客户名称
+     */
+    private String va_vendname;
+    /**
+     * 币别
+     */
+    private String va_currency;
+    private int va_ym;
+    /**
+     * 期初日期
+     */
+    private Date va_begindate;
+    /**
+     * 期初应收
+     */
+    private Double va_beginapamount;
+    /**
+     * 期初预收
+     */
+    private Double va_beginprepayamount;
+
+    /**
+     * 备注
+     */
+    private String va_remark;
+    private int va_emid;
+    private String va_emcode;
+    private String va_emname;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/VendApInitList.java

@@ -0,0 +1,74 @@
+package com.usoftchina.saas.document.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class VendApInitList implements Serializable {
+
+    /* 主表字段 */
+    private Long id;
+    /**
+     * 编号
+     */
+    private String va_code;
+    /**
+     * 客户id
+     */
+    private long va_vendid;
+
+    /**
+     * 客户编号
+     */
+    private String va_vendcode;
+
+    /**
+     * 客户名称
+     */
+    private String va_vendname;
+    /**
+     * 币别
+     */
+    private String va_currency;
+    /**
+     * 期初日期
+     */
+    private Date va_begindate;
+    /**
+     * 期初应收
+     */
+    private Double va_beginapamount;
+    /**
+     * 期初预收
+     */
+    private Double va_beginprepayamount;
+
+
+    private Integer companyId;
+
+    private Integer updaterId;
+
+    private Date updateTime;
+
+    private String creatorName;
+
+    private Integer creatorId;
+
+    private Date createTime;
+
+    private String updaterName;
+
+    private Integer va_emid;
+
+    private String va_emcode;
+
+    private String va_emname;
+
+    private String va_remark;
+    private Double arverify;
+    private Double preverify;
+    private Double leftamount;
+    private Integer va_ym;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/VendApamount.java

@@ -0,0 +1,68 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 供应商币别期初及余额表
+ * @author hey
+ * @Date 2019/03/11
+ */
+
+@Data
+public class VendApamount extends CommonBaseEntity implements Serializable{
+
+    /**
+     * 供应商id
+     */
+    private long va_vendid;
+
+    /**
+     * 供应商编号
+     */
+    private String va_vendcode;
+    /**
+     * 供应商名称
+     */
+    private String va_vendname;
+    /**
+     * 币别
+     */
+    private String va_currency;
+    /**
+     * 期初日期
+     */
+    private Date va_begindate;
+    /**
+     * 期初应付
+     */
+    private Double va_beginapamount;
+    /**
+     * 期初预付
+     */
+    private Double va_beginprepayamount;
+    /**
+     * 应付金额
+     */
+    private Double va_payamount;
+    /**
+     * 预付金额
+     */
+    private Double va_preamount;
+    /**
+     * 应付余额
+     */
+    private Double va_leftamount;
+    /**
+     * 应付暂估不含税金额
+     */
+    private Double va_esamount;
+    private  Double va_add_bill;
+    private  Double va_reduce_bill;
+    private  Double va_leftamount_bill;
+
+    private Double va_esnetamount;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/VendApamountList.java

@@ -0,0 +1,67 @@
+package com.usoftchina.saas.document.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class VendApamountList implements Serializable {
+
+    /* 主表字段 */
+    private Long id;
+
+    private Integer va_vendid;
+
+    private String va_vendcode;
+
+    private String va_vendname;
+
+    private String va_currency;
+
+    private Date va_begindate;
+
+    private Double va_beginapamount;
+
+    private Double va_beginprepayamount;
+
+    private Double va_payamount;
+
+    private Double va_preamount;
+
+    private Double va_leftamount;
+
+    private Integer companyId;
+
+    private Integer updaterId;
+
+    private Date updateTime;
+
+    private String creatorName;
+
+    private Integer creatorId;
+
+    private Date createTime;
+
+    private String updaterName;
+
+    private Double payamount;
+
+    private Double preamount;
+
+    private String ve_buyername;
+
+    private Double va_leftamount_bill;
+
+    //
+    private String sl_kind;
+    private String sl_code;
+    private Date sl_date;
+    private Double sl_amount;
+    private Double ypay;
+    private Double payleft;
+    private Double sl_preamount;
+    private Double ypre;
+    private Double preleft;
+    private Date sl_paydate;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Vendor.java

@@ -0,0 +1,128 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 供应商资料
+ * @author chenwei
+ * @Date 2018/10/13
+ */
+@Data
+public class Vendor extends CommonBaseEntity implements Serializable{
+
+    /**
+     * 供应商编号
+     */
+    private String ve_code;
+
+    /**
+     * 供应商简称
+     */
+    private String ve_shortname;
+
+    /**
+     * 供应商名称
+     */
+    private String ve_name;
+    /**
+     * 供应商UU
+     */
+    private String ve_uu;
+    /**
+     * 供应商类型
+     */
+    private String ve_type;
+    /**
+     * 期初日期
+     */
+    private Date ve_begindate;
+    /**
+     * 期初应付
+     */
+    private Double ve_beginapamount;
+    /**
+     * 期初预付
+     */
+    private Double ve_beginprepayamount;
+    /**
+     * 承付天数
+     */
+    private Long ve_promisedays;
+    /**
+     * 税率
+     */
+    private Double ve_taxrate;
+    /**
+     * 纳税人识别号
+     */
+    private String ve_nsrzh;
+    /**
+     * 银行账号
+     */
+    private String ve_bankaccount;
+    /**
+     * 银行行号
+     */
+    private String ve_bankcode;
+    /**
+     * 状态   defualt "启用"
+     */
+    private String ve_status;
+    /**
+     * 状态码
+     */
+    private String ve_statuscode;
+    /**
+     * 自定义字段
+     */
+    private String ve_text1;
+    /**
+     * 自定义字段
+     */
+    private String ve_text2;
+    /**
+     * 自定义字段
+     */
+    private String ve_text3;
+    /**
+     * 自定义字段
+     */
+    private String ve_text4;
+    /**
+     * 自定义字段
+     */
+    private String ve_text5;
+
+    private Double ve_payamount;
+
+    private Double ve_leftamount;
+
+    private Integer ve_beginym;
+
+    private Double ve_preamount;
+
+    private String ve_remark;
+
+    private Long ve_buyerid;
+
+    private String ve_buyercode;
+
+    private String ve_buyername;
+
+    private String ve_address;
+
+    private String ve_currency;
+
+    private Double cr_rate;
+
+    private Integer ve_paymentsid;
+
+    private String ve_payments;
+
+    private String ve_paymentscode;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/VendorList.java

@@ -0,0 +1,149 @@
+package com.usoftchina.saas.document.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class VendorList implements Serializable {
+
+    /* 主表字段 */
+    private Long id;
+    /**
+     * 供应商编号
+     */
+    private String ve_code;
+
+    /**
+     * 供应商简称
+     */
+    private String ve_shortname;
+    /**
+     * 供应商名称
+     */
+    private String ve_name;
+    /**
+     * 供应商UU
+     */
+    private String ve_uu;
+    /**
+     * 供应商类型
+     */
+    private String ve_type;
+    /**
+     * 期初日期
+     */
+    private Date ve_begindate;
+    /**
+     * 期初应付
+     */
+    private double ve_beginapamount;
+    /**
+     * 期初预付
+     */
+    private double ve_beginprepayamount;
+    /**
+     * 承付天数
+     */
+    private long ve_promisedays;
+    /**
+     * 税率
+     */
+    private double ve_taxrate;
+    /**
+     * 纳税人识别号
+     */
+    private String ve_nsrzh;
+    /**
+     * 银行账号
+     */
+    private String ve_bankaccount;
+    /**
+     * 银行行号
+     */
+    private String ve_bankcode;
+    /**
+     * 状态   defualt "启用"
+     */
+    private String ve_status;
+    /**
+     * 状态码
+     */
+    private String ve_statuscode;
+    /**
+     * 自定义字段
+     */
+    private String ve_text1;
+    /**
+     * 应付款金额
+     */
+    private double ve_leftamount;
+    /**
+     * 自定义字段
+     */
+    private String ve_text2;
+    /**
+     * 自定义字段
+     */
+    private String ve_text3;
+    /**
+     * 自定义字段
+     */
+    private String ve_text4;
+    /**
+     * 自定义字段
+     */
+    private String ve_text5;
+
+    private String ve_remark;
+
+    private Long ve_buyerid;
+
+    private String ve_buyercode;
+
+    private String ve_buyername;
+
+    private String ve_address;
+
+    private String ve_currency;
+
+    //currencys
+
+    private Double cr_rate;
+
+    /* 从表字段 */
+
+    private Integer vc_veid;
+
+    private Integer vc_detno;
+
+    private String vc_name;
+
+    private String vc_tel;
+
+    private String vc_qq;
+
+    private String vc_email;
+
+    private String vc_text1;
+
+    private String vc_text2;
+
+    private String vc_text3;
+
+    private String vc_text4;
+
+    private String vc_text5;
+
+    private String vc_default;
+
+    private Integer ve_paymentsid;
+
+    private String ve_payments;
+
+    private String ve_paymentscode;
+    //开户银行+银行账户
+    private String bankinfo;
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Vendorcontact.java

@@ -0,0 +1,127 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+public class Vendorcontact extends CommonBaseEntity implements Serializable {
+    private Long vc_veid;
+
+    private Integer vc_detno;
+
+    private String vc_name;
+
+    private String vc_tel;
+
+    private String vc_qq;
+
+    private String vc_email;
+
+    private String vc_text1;
+
+    private String vc_text2;
+
+    private String vc_text3;
+
+    private String vc_text4;
+
+    private String vc_text5;
+
+    private String vc_default;
+
+    public Long getVc_veid() {
+        return vc_veid;
+    }
+
+    public void setVc_veid(Long vc_veid) {
+        this.vc_veid = vc_veid;
+    }
+
+    public Integer getVc_detno() {
+        return vc_detno;
+    }
+
+    public void setVc_detno(Integer vc_detno) {
+        this.vc_detno = vc_detno;
+    }
+
+    public String getVc_name() {
+        return vc_name;
+    }
+
+    public void setVc_name(String vc_name) {
+        this.vc_name = vc_name;
+    }
+
+    public String getVc_tel() {
+        return vc_tel;
+    }
+
+    public void setVc_tel(String vc_tel) {
+        this.vc_tel = vc_tel;
+    }
+
+    public String getVc_qq() {
+        return vc_qq;
+    }
+
+    public void setVc_qq(String vc_qq) {
+        this.vc_qq = vc_qq;
+    }
+
+    public String getVc_email() {
+        return vc_email;
+    }
+
+    public void setVc_email(String vc_email) {
+        this.vc_email = vc_email;
+    }
+
+    public String getVc_text1() {
+        return vc_text1;
+    }
+
+    public void setVc_text1(String vc_text1) {
+        this.vc_text1 = vc_text1;
+    }
+
+    public String getVc_text2() {
+        return vc_text2;
+    }
+
+    public void setVc_text2(String vc_text2) {
+        this.vc_text2 = vc_text2;
+    }
+
+    public String getVc_text3() {
+        return vc_text3;
+    }
+
+    public void setVc_text3(String vc_text3) {
+        this.vc_text3 = vc_text3;
+    }
+
+    public String getVc_text4() {
+        return vc_text4;
+    }
+
+    public void setVc_text4(String vc_text4) {
+        this.vc_text4 = vc_text4;
+    }
+
+    public String getVc_text5() {
+        return vc_text5;
+    }
+
+    public void setVc_text5(String vc_text5) {
+        this.vc_text5 = vc_text5;
+    }
+
+    public String getVc_default() {
+        return vc_default;
+    }
+
+    public void setVc_default(String vc_default) {
+        this.vc_default = vc_default;
+    }
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Vendorkind.java

@@ -0,0 +1,27 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 供应商类型
+ * @author chenwei
+ * @date 2018/20/19
+ */
+public class Vendorkind extends CommonBaseEntity implements Serializable {
+
+    /**
+     * 类型名
+     */
+    private String vk_name;
+
+    public String getVk_name() {
+        return vk_name;
+    }
+
+    public void setVk_name(String vk_name) {
+        this.vk_name = vk_name == null ? null : vk_name.trim();
+    }
+
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Warehouse.java

@@ -0,0 +1,35 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 仓库资料
+ * @author chenwei
+ * @Date 2018/10/16
+ */
+@Data
+public class Warehouse extends CommonBaseEntity implements Serializable {
+
+    private String wh_code;
+    private String wh_type;
+    private String wh_description;
+    private String wh_statuscode;
+    private String wh_status;
+    /**
+     * 录入日期
+     */
+    private Date wh_date;
+    private String wh_text1;
+    private String wh_text2;
+    private String wh_text3;
+    private String wh_text4;
+    private String wh_text5;
+
+    private Double pw_onhand;
+
+    private Integer wh_ifmrp;
+}

applications/app-document/app-document-dto/src/main/java/com/usoftchina/saas/document/entity/Workcenter.java

@@ -0,0 +1,13 @@
+package com.usoftchina.saas.document.entity;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Workcenter extends CommonBaseEntity implements Serializable {
+    private String wc_name;
+    private Double wc_laborrate;
+    private Double wc_feerate;
+}

applications/app-document/app-document-service/build.gradle

@@ -0,0 +1,13 @@
+dependencies {
+    compile project(":applications:app-document:app-document-api")
+    compile project(":applications:app-finance:app-finance-api")
+    compile project(":base:base-biz:base-biz-api")
+    compile project(":base:base-account:base-account-api")
+    compile project(":base:base-message:base-message-api")
+    compile project(":base:base-datacenter:base-datacenter-client")
+    compile project(":applications:app-finance:app-finance-api")
+    compile project(":external:ext-yry:ext-product-sdk")
+    compile project(":external:ext-yry:ext-b2b-sdk")
+    compile project(":external:ext-other:ext-exrate-sdk")
+    compile project(":external:ext-yry:ext-sso-sdk")
+}

applications/app-document/app-document-service/lombok.config

@@ -0,0 +1,3 @@
+# This file is generated by the 'io.freefair.lombok' Gradle plugin
+config.stopBubbling = true
+lombok.equalsAndHashCode.callSuper = call

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/AddressController.java

@@ -0,0 +1,59 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.Address;
+import com.usoftchina.saas.document.service.AddressService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/address")
+public class AddressController {
+
+    @Autowired
+    private AddressService addressService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Address address){
+        return Result.success(addressService.saveData(address));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result deleteById(@PathVariable("id") Long id){
+        addressService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @PostMapping("/setDefault/{id}")
+    public Result setDefault(@PathVariable("id") Long id){
+        addressService.setDefault(id);
+        return Result.success();
+    }
+
+    @GetMapping("/getDefault")
+    public Result<Address> getDefault(){
+        return Result.success(addressService.getDefault());
+    }
+
+
+    @PostMapping("/batchDelete")
+    public Result deleteByIds(String ids){
+        addressService.removeByIds(ids);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result<List<Address>> getAll(){
+        List<Address> addresseList = addressService.selectAll();
+        return Result.success(addresseList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = addressService.getCombo();
+        return Result.success(comboDTOList);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/BankinformationController.java

@@ -0,0 +1,71 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.entity.DocBankInformation;
+import com.usoftchina.saas.document.service.BankinformationService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author heqw
+ * @date 2018/10/25 15:33
+ **/
+@RestController
+@RequestMapping("/api/document/bankinformation")
+public class BankinformationController {
+    @Autowired
+    BankinformationService bankinformationService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody DocBankInformation bankinformation){
+        bankinformationService.save(bankinformation);
+        return Result.success();
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id")int id){
+        bankinformationService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(PageRequest page, ListReqDTO condition){
+        PageInfo<DocBankInformation> bankinformationList = bankinformationService.selectList(page, condition);
+        return Result.success(bankinformationList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = bankinformationService.getCombo();
+        return Result.success(comboDTOList);
+    }
+
+    /**
+     * 关闭
+     * @param id
+     * @return
+     */
+    @PostMapping("/close/{id}")
+    public Result close(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = bankinformationService.close(id);
+        return Result.success(docBaseDTO);
+    }
+
+    /**
+     * 开启
+     * @param id
+     * @return
+     */
+    @PostMapping("/open/{id}")
+    public Result open(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = bankinformationService.open(id);
+        return Result.success(docBaseDTO);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/CurrencyController.java

@@ -0,0 +1,90 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.annotation.ReadBiz;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.biz.exception.BizExceptionCode;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.dto.CurrencyDTO;
+import com.usoftchina.saas.document.entity.Currency;
+import com.usoftchina.saas.document.mapper.CurrencyMapper;
+import com.usoftchina.saas.document.service.CurrencyService;
+import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/04
+ */
+@RestController
+@RequestMapping("/api/document/currency")
+public class CurrencyController {
+
+    @Autowired
+    private CurrencyService currencyService;
+    @Autowired
+    private CurrencyMapper currencyMapper;
+
+    @GetMapping("/list")
+    public Result getAll(@PageDefault(number = 1, size = 10) PageRequest pageRequest, ListReqDTO listReqDTO){
+        PageInfo<Currency> currencyList = currencyService.getAll(pageRequest, listReqDTO);
+        return Result.success(currencyList);
+    }
+
+    @PostMapping("/save")
+    public Result save(@RequestBody CurrencyDTO currencyDTO){
+        return Result.success(currencyService.save(currencyDTO));
+    }
+
+    @ReadBiz("Currency")
+    public Result get(@PathVariable("id") Long id) {
+        return Result.success(currencyService.findByPrimaryKey(id));
+    }
+
+    @PostMapping("/setStandard")
+    public Result setStandard(@RequestBody CurrencyDTO currencyDTO){
+        currencyService.setStandard(currencyDTO);
+        return Result.success();
+    }
+    @PostMapping("/resetCurrencyRate")
+    public Result resetCurrencyRate(){
+        currencyService.resetCurrencyRate("");
+        return Result.success();
+    }
+    @GetMapping("/getStandard")
+    public Result<CurrencyDTO> getStandard(){
+        return Result.success(currencyService.getStandard());
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        Currency currency = currencyService.findByPrimaryKey(id);
+        if(currency.getCr_standard()==1){
+            //本位币无法删除
+            throw new BizException(BizExceptionCode.BIZ_MAINCURRENCY_DELETE);
+        }
+        //校验是否可以删除币别
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("v_type","currency");
+        map.put("v_id",0);
+        map.put("v_code",currency.getCr_name());
+        map.put("v_companyid",BaseContextHolder.getCompanyId());
+        map.put("v_res","");
+        currencyMapper.check(map);
+        Object result =  map.get("v_res");
+        if(!StringUtils.isEmpty(result)){
+            throw new BizException(-999999,result.toString());
+        }
+        currencyService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/CustArInitController.java

@@ -0,0 +1,69 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.entity.CustArInit;
+import com.usoftchina.saas.document.entity.CustArInitList;
+import com.usoftchina.saas.document.service.CustArInitService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/document/custarinit")
+public class CustArInitController {
+
+    @Autowired
+    private CustArInitService custArInitService;
+
+    /**
+     * 获取 客户期初列表数据,包含客户期初表数据
+     * @param listReqDTO
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<CustArInitList>> getListDataByCondition(PageRequest page, ListReqDTO listReqDTO){
+        return Result.success(custArInitService.getListDataByCondition(page, listReqDTO));
+    }
+
+    /**
+     * 保存
+     * @param CustArInit
+     * @return
+     */
+    @PostMapping("/save")
+    public Result save(@RequestBody CustArInit CustArInit){
+        return Result.success(custArInitService.saveData(CustArInit));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        custArInitService.deleteById(id);
+        return Result.success();
+    }
+
+    /**
+     * 批量删除
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs){
+        custArInitService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        custArInitService.saveToFormal(id, update);
+        return Result.success();
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/CustAramountController.java

@@ -0,0 +1,74 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.entity.CustAramount;
+import com.usoftchina.saas.document.service.CustAramountService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/document/custaramount")
+public class CustAramountController {
+
+    @Autowired
+    private CustAramountService custAramountService;
+
+    /**
+     * 获取 客户期初列表数据,包含客户期初表数据
+     * @param listReqDTO
+     * @return
+     */
+    @GetMapping("/list")
+    public Result getListDataByCondition(PageRequest page, ListReqDTO listReqDTO){
+        return Result.success(custAramountService.getListDataByCondition(page, listReqDTO));
+    }
+
+    /**
+     * 保存
+     * @param custAramount
+     * @return
+     */
+    @PostMapping("/save")
+    public Result save(@RequestBody CustAramount custAramount){
+        return Result.success(custAramountService.saveData(custAramount));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        custAramountService.deleteById(id);
+        return Result.success();
+    }
+
+    /**
+     * 批量删除
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs){
+        custAramountService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        custAramountService.saveToFormal(id, update);
+        return Result.success();
+    }
+
+    //根据客户编号+币别查询 客户期初数据
+    @RequestMapping("/getCustArByCustCodeAndCurrency")
+    public Result getCustArByCustCodeAndCurrency(String custCode, String currency) {
+        return Result.success(custAramountService.getCustArByCustCodeAndCurrency(custCode, currency));
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/CustomerController.java

@@ -0,0 +1,211 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.b2b.service.B2bEnterpriseService;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.annotation.ReadBiz;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.dto.CustomerFormDTO;
+import com.usoftchina.saas.document.entity.CustomerList;
+import com.usoftchina.saas.document.entity.Customeraddress;
+import com.usoftchina.saas.document.service.CustomerService;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-10-23 11:39.
+ */
+@RestController
+@RequestMapping("/api/document/customer")
+public class CustomerController {
+
+    @Autowired
+    private CustomerService customerService;
+    @Autowired
+    private B2bEnterpriseService b2bEnterpriseService;
+
+    /**
+     * 客户资料列表
+     *
+     * @param page
+     * @param req
+     * @return
+     *
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<CustomerList>> getListData(@PageDefault(number = 1, size = 10) PageRequest page, ListReqDTO req) {
+        PageInfo<CustomerList> listData = customerService.getListData(page, req);
+        return Result.success(listData);
+    }
+
+    @GetMapping("/dbfind")
+    public Result getDbfind(PageRequest page, ListReqDTO listReqDTO){
+        PageInfo<CustomerList> dbfindData = customerService.getDbfind(page, listReqDTO);
+        return Result.success(dbfindData);
+    }
+
+    /**
+     * 获取客户资料表单
+     *
+     * @return
+     */
+    @ReadBiz("Customer")
+    public Result<CustomerFormDTO> getFormData(@PathVariable("id") Long id) {
+        CustomerFormDTO data = customerService.getFormData(id);
+        return Result.success(data);
+    }
+
+    /**
+     * 客户资料表单保存
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<DocBaseDTO> saveFormData(@RequestBody CustomerFormDTO data) {
+        DocBaseDTO save = customerService.saveFormData(data);
+        return Result.success(save);
+    }
+
+    /**
+     * 客户资料删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        customerService.delete(id);
+        return Result.success();
+    }
+
+    /**
+     * 客户联系人删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/deletecontact/{id}")
+    public Result deletecontact(@PathVariable("id") Long id) {
+        customerService.deletecontact(id);
+        return Result.success();
+    }
+
+    /**
+     * 客户地址删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/deleteaddress/{id}")
+    public Result deleteaddress(@PathVariable("id") Long id) {
+        customerService.deleteaddress(id);
+        return Result.success();
+    }
+
+
+    @GetMapping("/getAddressCombo")
+    public Result getCombo(Long id){
+        List<ComboDTO> comboDTOList = customerService.getAddressCombo(id);
+        return Result.success(comboDTOList);
+    }
+
+    @GetMapping("/getContactCombo")
+    public Result getContactCombo(Long id){
+        List<ComboDTO> comboDTOList = customerService.getContactCombo(id);
+        return Result.success(comboDTOList);
+    }
+
+    /**
+     * 客户资料批量删除
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs) {
+        customerService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    /**
+     * 客户资料关闭
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/close/{id}")
+    public Result close(@PathVariable(value = "id") long id){
+        DocBaseDTO close = customerService.close(id);
+        return Result.success(close);
+    }
+
+
+    /**
+     * 客户资料批量删除
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchClose")
+    public Result batchClose(@RequestBody BatchDealBaseDTO baseDTOs) {
+        customerService.batchClose(baseDTOs);
+        return Result.success();
+    }
+
+    /**
+     * 客户资料启用
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/open/{id}")
+    public Result open(@PathVariable(value = "id") long id){
+        DocBaseDTO open = customerService.open(id);
+        return Result.success(open);
+    }
+
+    /**
+     * 客户资料批量启用
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchOpen")
+    public Result batchOpen(@RequestBody BatchDealBaseDTO baseDTOs) {
+        customerService.batchOpen(baseDTOs);
+        return Result.success();
+    }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        customerService.saveToFormal(id, update);
+        return Result.success();
+    }
+
+    /**
+     * 获取客户UU
+     * @param id
+     * @return
+     */
+    @GetMapping("/updateCustomerUU/{id}")
+    public Result updateCustomerUU(@PathVariable("id") Long id) {
+        return Result.success(customerService.getCustomerUU(id));
+    }
+
+
+    @GetMapping("/getAddress")
+    public Result<List<Customeraddress>> getAddress(Long id){
+        List<Customeraddress> customeraddress = customerService.getAddress(id);
+        return Result.success(customeraddress);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/CustomerkindController.java

@@ -0,0 +1,42 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.Customerkind;
+import com.usoftchina.saas.document.service.CustomerkindService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/customerkind")
+public class CustomerkindController {
+
+    @Autowired
+    private CustomerkindService customerkindService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Customerkind customerkind){
+        customerkindService.save(customerkind);
+        return Result.success();
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        customerkindService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(){
+        List<Customerkind> customerkindList = customerkindService.selectAll();
+        return Result.success(customerkindList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> customerkindList = customerkindService.getCombo();
+        return Result.success(customerkindList);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/DepartmentController.java

@@ -0,0 +1,126 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.dto.DepartmentDTO;
+import com.usoftchina.saas.document.dto.DepartmentMemberDTO;
+import com.usoftchina.saas.document.dto.DepartmentTreeDTO;
+import com.usoftchina.saas.document.entity.Department;
+import com.usoftchina.saas.document.exception.DocumentExceptionCode;
+import com.usoftchina.saas.document.service.DepartmentService;
+import com.usoftchina.saas.document.service.EmployeeService;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: zhouy
+ * @Date: 2020/3/24 9:49
+ */
+@RestController
+@RequestMapping("/api/document/department")
+public class DepartmentController {
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private EmployeeService employeeService;
+
+    /**
+     * 部门资料列表
+     *
+     */
+    @GetMapping("/list")
+    public Result<List<Department>> getListData() {
+        List<Department> departments = departmentService.findByCompanyId(BaseContextHolder.getCompanyId());
+        return Result.success(departments);
+    }
+
+    @GetMapping("/pagelist")
+    public Result<PageInfo<Department>> getListData(PageRequest page, ListReqDTO req) {
+        PageInfo<Department> listData = departmentService.getListData(page, req);
+        return Result.success(listData);
+    }
+
+    /**
+     * 获取部门资料
+     */
+    @GetMapping("/read/{id}")
+    public Result getDataById(@PathVariable("id") Long id){
+        Department department = departmentService.findByPrimaryKey(id);
+        return Result.success(department);
+    }
+
+    /**
+     * 部门保存
+     * */
+    @PostMapping("/save")
+    public Result<DocBaseDTO> saveFormData(@RequestBody Department department) {
+        return Result.success(departmentService.saveDepart(department));
+    }
+
+    /**
+     * 部门删除
+     * */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        departmentService.delete(id);
+        return Result.success();
+    }
+
+    /**
+     * 取树形结构部门数据
+     *
+     * @return
+     */
+    @GetMapping("/tree")
+    public Result<List<DepartmentTreeDTO>> getTree() {
+        List<Department> departments = departmentService.findByCompanyId(BaseContextHolder.getCompanyId());
+        if (!CollectionUtils.isEmpty(departments)) {
+            DepartmentTreeDTO root = new DepartmentTreeDTO(departments);
+            return Result.success(root.getChildren());
+        }
+        return Result.success();
+    }
+
+    /**
+     * 部门成员（子部门、员工）信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/member")
+    public Result<DepartmentMemberDTO> getMember(@RequestParam(defaultValue = "0") Long id) {
+        DepartmentMemberDTO dto = new DepartmentMemberDTO();
+        if (id == 0) {
+            List<DepartmentDTO> roots = departmentService.findRoot(BaseContextHolder.getCompanyId());
+            if (CollectionUtils.isEmpty(roots)) {
+                return Result.error(DocumentExceptionCode.DEPARTMENT_NOT_FOUND);
+            }
+            dto.setDepartment(roots.get(0));
+            // 根部门只有一个，默认取根部门的下级成员
+            id = dto.getDepartment().getId();
+        } else {
+            dto.setDepartment(departmentService.selectByPrimaryKey(id));
+        }
+        dto.setChildren(departmentService.findByParentId(id));
+        dto.setEmployees(employeeService.findByDepartmentId(id));
+        if (CollectionUtils.isEmpty(dto.getChildren())) {
+            if (CollectionUtils.isEmpty(dto.getEmployees())) {
+                dto.setTotal(0);
+            } else {
+                dto.setTotal(dto.getEmployees().size());
+            }
+        } else {
+            dto.setTotal(departmentService.depthCountEmployee(id));
+        }
+        return Result.success(dto);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/EmployeeController.java

@@ -0,0 +1,191 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.dto.AccountDTO;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.dto.EmployeeDTO;
+import com.usoftchina.saas.document.dto.EmployeeTreeDTO;
+import com.usoftchina.saas.document.entity.Department;
+import com.usoftchina.saas.document.entity.Employee;
+import com.usoftchina.saas.document.service.DepartmentService;
+import com.usoftchina.saas.document.service.EmployeeService;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.util.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by zdw
+ * 2018-10-23 11:39.
+ */
+@RestController
+@RequestMapping("/api/document/employee")
+public class EmployeeController {
+
+    @Autowired
+    private EmployeeService employeeService;
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private AccountApi accountApi;
+
+    /**
+     * 人员资料列表
+     *
+     * @param page
+     * @param req
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<EmployeeDTO>> getListData(@PageDefault(number = 1, size = 999) PageRequest page, ListReqDTO req) {
+        PageInfo<EmployeeDTO> listData = employeeService.getListData(page, req);
+        return Result.success(listData);
+    }
+
+    /**
+     * 获取人员资料表单
+     *
+     * @return
+     */
+    @GetMapping("/read/{id}")
+    public Result<Map<String, Object>> getFormData(@PathVariable("id") Long id) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("main", employeeService.getFormData(id));
+        return Result.success(map);
+    }
+
+    /**
+     * 获取当前登录人员资料表单
+     *
+     * @return
+     */
+    @GetMapping("/read/current")
+    public Result getCurrent() {
+        Map<String, Object> data = new HashMap<String, Object>(1);
+        data.put("main", employeeService.findByCompanyAndAccount(BaseContextHolder.getCompanyId(), BaseContextHolder.getUserId()));
+        return Result.success(data);
+    }
+
+    /**
+     * 客户资料表单保存
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<DocBaseDTO> saveFormData(@RequestBody EmployeeDTO employeeDTO) {
+        DocBaseDTO save = employeeService.saveFormData(employeeDTO);
+        return Result.success(save);
+    }
+
+    /**
+     * 人员资料删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        employeeService.delete(id);
+        return Result.success();
+    }
+
+
+    /**
+     * 人员资料批量删除
+     *
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs) {
+        employeeService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    @PostMapping("/batchSave")
+    public Result batchSave(@RequestBody List<EmployeeDTO> baseDTOs) {
+        employeeService.batchSave(baseDTOs);
+        return Result.success();
+    }
+
+    @PostMapping("/bind/company")
+    public Result bindCompany(@RequestParam Long empId) {
+        employeeService.bindCompany(empId);
+        return Result.success();
+    }
+
+    @PostMapping("/unbind/company")
+    public Result unbindCompany(@RequestParam Long empId) {
+        employeeService.unbindCompany(empId);
+        return Result.success();
+    }
+
+    /**
+     * 关闭
+     * @param id
+     * @return
+     */
+    @PostMapping("/close/{id}")
+    public Result close(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = employeeService.close(id);
+        return Result.success(docBaseDTO);
+    }
+
+    /**
+     * 开启
+     * @param id
+     * @return
+     */
+    @PostMapping("/open/{id}")
+    public Result open(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = employeeService.open(id);
+        return Result.success(docBaseDTO);
+    }
+
+    @GetMapping("/getEmployeeByAccount")
+    public Map<String,Object> getEmployeeByAccount(){
+        return employeeService.getEmployeeByAccount();
+    }
+
+    /**
+     * 取树形结构人事（部门/人员）数据
+     *
+     * @param onlyAccount 仅包含有系统账户的人事资料
+     * @param onlyEmployee 仅包含人事资料
+     * @return
+     */
+    @GetMapping("/tree")
+    public Result<EmployeeTreeDTO> getTree(@RequestParam(defaultValue = "false") boolean onlyAccount,
+                                           @RequestParam(defaultValue = "false") boolean onlyEmployee){
+        Long companyId = BaseContextHolder.getCompanyId();
+        List<Department> departments = departmentService.findByCompanyId(companyId);
+        List<Employee> employees = employeeService.findByCompanyId(companyId);
+        List<AccountDTO> accounts = onlyEmployee ? null : accountApi.getAccountByCompany(companyId).getData();
+        return Result.success(new EmployeeTreeDTO(departments, employees, accounts, onlyAccount));
+    }
+
+    /**
+     * 人员资料初始化
+     * @param id
+     * @param update
+     * @return
+     */
+    @PostMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update){
+        employeeService.saveToFormal(id, update);
+        return Result.success();
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/FundinouttypeController.java

@@ -0,0 +1,41 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.Fundinouttype;
+import com.usoftchina.saas.document.service.FundinouttypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/fundinouttype")
+public class FundinouttypeController {
+
+    @Autowired
+    private FundinouttypeService fundinouttypeService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Fundinouttype fundinouttype){
+        return Result.success(fundinouttypeService.saveData(fundinouttype));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        fundinouttypeService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(){
+        List<Fundinouttype> fundinouttypeList = fundinouttypeService.selectAll();
+        return Result.success(fundinouttypeList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(String condition){
+        List<ComboDTO> comboDTOList = fundinouttypeService.getCombo(condition);
+        return Result.success(comboDTOList);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/PaymentsPayController.java

@@ -0,0 +1,52 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.entity.PaymentsPay;
+import com.usoftchina.saas.document.service.PaymentsPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <pre>
+ * 付款方式
+ * </pre>
+ * @author CJX
+ * @date 2020-4-23
+ */
+@RestController
+@RequestMapping("/api/document/paymentspay")
+public class PaymentsPayController {
+
+    @Autowired
+    private PaymentsPayService paymentsPayService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody PaymentsPay paymentsPay){
+        return Result.success(paymentsPayService.saveData(paymentsPay));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") long id){
+        paymentsPayService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result<List<PaymentsPay>> getAll(){
+        List<PaymentsPay> paymentsPayList = paymentsPayService.selectAll();
+        return Result.success(paymentsPayList);
+    }
+    @GetMapping("/list/enable")
+    public Result<List<PaymentsPay>> getAllValidPaymentsPay(){
+        List<PaymentsPay> paymentsPayList = paymentsPayService.selectAllValidPaymentsPay();
+        return Result.success(paymentsPayList);
+    }
+    @PostMapping("/setDefault/{id}")
+    public Result setDefault(@PathVariable("id") Long id){
+        paymentsPayService.setDefault(id);
+        return Result.success();
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/PaymentsRecController.java

@@ -0,0 +1,52 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.entity.PaymentsRec;
+import com.usoftchina.saas.document.service.PaymentsRecService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <pre>
+ * 付款方式
+ * </pre>
+ * @author CJX
+ * @date 2020-4-23
+ */
+@RestController
+@RequestMapping("/api/document/paymentsrec")
+public class PaymentsRecController {
+
+    @Autowired
+    private PaymentsRecService paymentsRecService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody PaymentsRec paymentsRec){
+        return Result.success(paymentsRecService.saveData(paymentsRec));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") long id){
+        paymentsRecService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result<List<PaymentsRec>> getAll(){
+        List<PaymentsRec> paymentsPayList = paymentsRecService.selectAll();
+        return Result.success(paymentsPayList);
+    }
+    @GetMapping("/list/enable")
+    public Result<List<PaymentsRec>> getAllValidpaymentsRec(){
+        List<PaymentsRec> paymentsRecList = paymentsRecService.selectAllValidPaymentsRec();
+        return Result.success(paymentsRecList);
+    }
+    @PostMapping("/setDefault/{id}")
+    public Result setDefault(@PathVariable("id") Long id){
+        paymentsRecService.setDefault(id);
+        return Result.success();
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProdinoutOtherKindController.java

@@ -0,0 +1,59 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.ProdinoutOtherKind;
+import com.usoftchina.saas.document.service.ProdinoutOtherKindService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/prodinoutotherkind")
+public class ProdinoutOtherKindController {
+
+    @Autowired
+    private ProdinoutOtherKindService prodinoutOtherKindService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody ProdinoutOtherKind prodinoutOtherKind){
+        prodinoutOtherKindService.save(prodinoutOtherKind);
+        return Result.success();
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        prodinoutOtherKindService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(){
+        List<ProdinoutOtherKind> prodinoutOtherKindList = prodinoutOtherKindService.selectAll();
+        return Result.success(prodinoutOtherKindList);
+    }
+
+    @GetMapping("/getComboByOtherOut")
+    public Result getComboByOtherOut(){
+        List<ComboDTO> prodinoutOtherKindList = prodinoutOtherKindService.getComboByOtherOut();
+        return Result.success(prodinoutOtherKindList);
+    }
+
+    @GetMapping("/getComboByOtherIn")
+    public Result getComboByOtherIn(){
+        List<ComboDTO> prodinoutOtherKindList = prodinoutOtherKindService.getComboByOtherIn();
+        return Result.success(prodinoutOtherKindList);
+    }
+
+    @GetMapping("/listByOtherOut")
+    public Result getAllBylistByOtherOut(){
+        List<ProdinoutOtherKind> prodinoutOtherKindList = prodinoutOtherKindService.getAllBylistByOtherOut();
+        return Result.success(prodinoutOtherKindList);
+    }
+    @GetMapping("/listByOtherIn")
+    public Result getAllBylistByOtherIn(){
+        List<ProdinoutOtherKind> prodinoutOtherKindList = prodinoutOtherKindService.getAllBylistByOtherIn();
+        return Result.success(prodinoutOtherKindList);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProductController.java

@@ -0,0 +1,195 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+
+
+import com.usoftchina.saas.biz.annotation.ReadBiz;
+import com.usoftchina.saas.biz.dto.*;
+import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.dto.ProductListDTO;
+import com.usoftchina.saas.document.dto.ProductSalerDTO;
+import com.usoftchina.saas.document.dto.ProductUploadDTO;
+import com.usoftchina.saas.document.entity.Product;
+import com.usoftchina.saas.document.po.ProductList;
+import com.usoftchina.saas.document.service.ProductService;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.util.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/product")
+public class ProductController {
+
+    @Autowired
+    private ProductService productService;
+
+    @RequestMapping("/list")
+    public Result<PageInfo<ProductDTO>> getProductsByCondition(PageRequest page, ListReqDTO listReqDTO){
+        PageInfo<ProductDTO> productList = productService.getProductsByCondition(page, listReqDTO);
+        return Result.success(productList);
+    }
+
+    @RequestMapping("/getProdUnit")
+    public Result<List<ComboDTO>> getProdUnit() {
+        List<ComboDTO> prodUnitList = productService.getProdUnit();
+        return Result.success(prodUnitList);
+    }
+
+    @RequestMapping("/updateLatestPurchasePrice")
+    public void updateLatestPurchasePrice(@RequestParam(value = "id") Long pu_id) {
+        productService.updateLatestPurchasePrice(pu_id);
+    }
+
+    @RequestMapping("/getProductsByPK")
+    public Product getProductsByPK(@RequestParam(value = "pr_id") Long id) {
+        return productService.getProductsByPK(id);
+    }
+
+    @PostMapping("/save")
+    public Result save(@RequestBody ProductListDTO productListDTO){
+        DocBaseDTO docBaseDTO = productService.saveData(productListDTO);
+        return Result.success(docBaseDTO);
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        productService.deleteByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteDetail(@PathVariable("id") Long id){
+        productService.deleteDetailById(id);
+        return Result.success();
+    }
+
+    @PostMapping("/close/{id}")
+    public Result close(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = productService.close(id);
+        return Result.success(docBaseDTO);
+    }
+
+    @PostMapping("/open/{id}")
+    public Result open(@PathVariable("id") Long id){
+        DocBaseDTO docBaseDTO = productService.open(id);
+        return Result.success(docBaseDTO);
+    }
+
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs){
+        BatchDealResp resp = productService.batchDelete(baseDTOs);
+        if (resp.getErrorCount() > 0){
+            return Result.error(resp);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/batchClose")
+    public Result batchClose(@RequestBody BatchDealBaseDTO baseDTOs){
+        String result = productService.batchClose(baseDTOs);
+        if (!StringUtils.isEmpty(result)){
+            return Result.error(result);
+        }
+        return Result.success();
+    }
+
+    @PostMapping("/batchOpen")
+    public Result batchOpen(@RequestBody BatchDealBaseDTO baseDTOs){
+        String result = productService.batchOpen(baseDTOs);
+        if (!StringUtils.isEmpty(result)){
+            return Result.error(result);
+        }
+        return Result.success();
+    }
+
+    @ReadBiz("Product")
+    public Result getDataById(@PathVariable("id") Long id){
+        return Result.success(productService.getDataById(id));
+    }
+
+    @GetMapping("/ReserveCost")
+    public Result getReserveCost(PageRequest page, ListReqDTO listReqDTO){
+        return Result.success(productService.getReserveCost(page, listReqDTO));
+    }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        productService.saveToFormal(id, update);
+        return Result.success();
+    }
+
+    /**
+     * 通过物料Code查找物料信息
+     * @param code
+     * @return
+     */
+    @GetMapping("/getByProdCode")
+    public Result getByProdCode(@RequestParam("code") String code){
+        return Result.success(productService.getByProdCode(code));
+    }
+
+    /**
+     * 上传至B2B平台
+     * @return
+     */
+    @PostMapping("/b2b/upload")
+    public Result uploadToB2B(){
+        productService.uploadToB2B();
+        return Result.success();
+    }
+
+    /**
+     * 获取需要上传的物料数据
+     * @return
+     */
+    @GetMapping("/b2b/upload/data")
+    public Result<List<ProductUploadDTO>> getUploadData(@RequestParam("companyId") Long companyId){
+        return Result.success(productService.getUploadData(companyId));
+    }
+
+    /**
+     * 批量更新物料上传状态
+     * @param ids
+     * @param status
+     * @return
+     */
+    @PostMapping("/b2b/status/update")
+    public Result updateStatus(@RequestParam("ids") String ids, @RequestParam("status") String status){
+        productService.updateStatus(ids, status);
+        return Result.success();
+    }
+
+    /**
+     * 产品库列表
+     * @param page
+     * @param listReqDTO
+     * @return
+     */
+    @GetMapping("/prodStorage/list")
+    public Result getProdStorage(@PageDefault(number = 1, size = 10) PageRequest page, ListReqDTO listReqDTO){
+        return Result.success(productService.getProdStorage(page, listReqDTO));
+    }
+
+    /**
+     * 上传个人物料库
+     * @param productSalerDTO
+     * @return
+     */
+    @PostMapping("/prodStorage/saler")
+    public Result createProdSaler(@RequestBody ProductSalerDTO productSalerDTO){
+        productService.createProdSaler(productSalerDTO);
+        return Result.success();
+    }
+
+    @RequestMapping("/AllList")
+    public Result<PageInfo<ProductList>> getAllProducts(PageRequest page, ListReqDTO listReqDTO){
+        PageInfo<ProductList> productList = productService.getAllProducts(page,listReqDTO);
+        return Result.success(productList);
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProductSerialController.java

@@ -0,0 +1,43 @@
+package com.usoftchina.saas.document.controller;
+
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.ProductSerial;
+import com.usoftchina.saas.document.service.ProductSerialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/productserial")
+public class ProductSerialController {
+
+    @Autowired
+    private ProductSerialService productserialService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody ProductSerial productserial){
+        return Result.success(productserialService.saveData(productserial));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        productserialService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(){
+        List<ProductSerial> productunitList = productserialService.selectAll();
+        return Result.success(productunitList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = productserialService.getCombo();
+        return Result.success(comboDTOList);
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProductbrandController.java

@@ -0,0 +1,53 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.entity.Productbrand;
+import com.usoftchina.saas.document.service.ProductbrandService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/productbrand")
+public class ProductbrandController {
+
+    @Autowired
+    private ProductbrandService productbrandService;
+
+    /**
+     * 保存
+     * @param productbrand
+     * @return
+     */
+    @PostMapping("/save")
+    public Result save(@RequestBody Productbrand productbrand){
+        return Result.success(productbrandService.saveData(productbrand));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        productbrandService.removeByPrimaryKey(id);
+        return  Result.success();
+    }
+
+    /**
+     * 查询所有
+     * @return
+     */
+    @GetMapping("/list")
+    public Result getAll(){
+        List<Productbrand> productbrandList = productbrandService.selectAll();
+        return Result.success(productbrandList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        return Result.success(productbrandService.getCombo());
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProducttypeController.java

@@ -0,0 +1,42 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.Producttype;
+import com.usoftchina.saas.document.service.ProducttypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/producttype")
+public class ProducttypeController {
+
+    @Autowired
+    private ProducttypeService producttypeService;
+
+    @GetMapping("/list")
+    public Result<List<Producttype>> getAll(){
+        List<Producttype> producttypeList = producttypeService.selectAll();
+        return Result.success(producttypeList);
+    }
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Producttype producttype){
+        return Result.success(producttypeService.saveData(producttype));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        producttypeService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = producttypeService.getCombo();
+        return Result.success(comboDTOList);
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProductunitController.java

@@ -0,0 +1,43 @@
+package com.usoftchina.saas.document.controller;
+
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.ComboDTO;
+import com.usoftchina.saas.document.entity.Productunit;
+import com.usoftchina.saas.document.service.ProductunitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/document/productunit")
+public class ProductunitController {
+
+    @Autowired
+    private ProductunitService productunitService;
+
+    @PostMapping("/save")
+    public Result save(@RequestBody Productunit productunit){
+        return Result.success(productunitService.saveData(productunit));
+    }
+
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        productunitService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    @GetMapping("/list")
+    public Result getAll(){
+        List<Productunit> productunitList = productunitService.selectAll();
+        return Result.success(productunitList);
+    }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = productunitService.getCombo();
+        return Result.success(comboDTOList);
+    }
+
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/ProjectController.java

@@ -0,0 +1,96 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.DocBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.dto.ProjectSaveReq;
+import com.usoftchina.saas.document.po.Project;
+import com.usoftchina.saas.document.service.ProjectService;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author yingp
+ * @date 2020/5/8
+ */
+@RestController
+@RequestMapping("/api/document/project")
+public class ProjectController {
+
+    @Autowired
+    private ProjectService projectService;
+
+    /**
+     * 获取全部项目
+     *
+     * @param req
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<Project>> getList(@PageDefault PageRequest page, ListReqDTO req) {
+        return Result.success(projectService.findByCondition(page, req));
+    }
+
+    /**
+     * 保存
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("/save")
+    public Result<DocBaseDTO> save(@RequestBody ProjectSaveReq req) {
+        return Result.success(projectService.save(req));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id) {
+        projectService.removeByPrimaryKey(id);
+        return Result.success();
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param base
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO base) {
+        projectService.batchDelete(base);
+        return Result.success();
+    }
+
+    /**
+     * 启用
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/open/{id}")
+    public Result open(@PathVariable("id") Long id){
+        projectService.enable(id, true);
+        return Result.success();
+    }
+
+    /**
+     * 禁用
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/close/{id}")
+    public Result close(@PathVariable("id") Long id){
+        projectService.enable(id, false);
+        return Result.success();
+    }
+}

applications/app-document/app-document-service/src/main/java/com/usoftchina/saas/document/controller/VendApInitController.java

@@ -0,0 +1,69 @@
+package com.usoftchina.saas.document.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.biz.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.biz.dto.ListReqDTO;
+import com.usoftchina.saas.document.entity.VendApInit;
+import com.usoftchina.saas.document.entity.VendApInitList;
+import com.usoftchina.saas.document.service.VendApInitService;
+import com.usoftchina.saas.page.PageRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/document/vendapinit")
+public class VendApInitController {
+
+    @Autowired
+    private VendApInitService vendApInitService;
+
+    /**
+     * 获取 客户期初列表数据,包含客户期初表数据
+     * @param listReqDTO
+     * @return
+     */
+    @GetMapping("/list")
+    public Result<PageInfo<VendApInitList>> getListDataByCondition(PageRequest page, ListReqDTO listReqDTO){
+        return Result.success(vendApInitService.getListDataByCondition(page, listReqDTO));
+    }
+
+    /**
+     * 保存
+     * @param VendApInit
+     * @return
+     */
+    @PostMapping("/save")
+    public Result save(@RequestBody VendApInit VendApInit){
+        return Result.success(vendApInitService.saveData(VendApInit));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") Long id){
+        vendApInitService.deleteById(id);
+        return Result.success();
+    }
+
+    /**
+     * 批量删除
+     * @param baseDTOs
+     * @return
+     */
+    @PostMapping("/batchDelete")
+    public Result batchDelete(@RequestBody BatchDealBaseDTO baseDTOs){
+        vendApInitService.batchDelete(baseDTOs);
+        return Result.success();
+    }
+
+    //导入保存至列表
+    @RequestMapping("/saveToFormal")
+    public Result saveToFormal(Integer id, boolean update) {
+        vendApInitService.saveToFormal(id, update);
+        return Result.success();
+    }
+}