1.增加下拉框接口。2.增加存储过程调用程序。3.删除无用代码。

applications/common-dto/src/main/java/com/usoftchina/saas/common/dto/ComboDTO.java

@@ -0,0 +1,30 @@
+package com.usoftchina.saas.common.dto;
+
+import java.io.Serializable;
+
+/**
+ * 下拉框
+ * @author chenwei
+ * @Date 2018/10/16
+ */
+public class ComboDTO implements Serializable {
+
+    private String display;
+    private String value;
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

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

@@ -17,7 +17,7 @@ public interface ProductApi {
      * @param condition
      * @return
      */
-    @GetMapping("/api/document/product/getProductsByCondition")
-    public List<ProductDTO> getProductsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);
+   /* @GetMapping("/api/document/product/getProductsByCondition")
+    public List<ProductDTO> getProductsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);*/
 
 }

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

@@ -17,6 +17,6 @@ public interface VendorApi {
      * @param condition
      * @return
      */
-    @GetMapping("/api/document/vendor/getVendorsByCondition")
-    public List<VendorDTO> getVendorsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);
+    /*@GetMapping("/api/document/vendor/getVendorsByCondition")
+    public List<VendorDTO> getVendorsByCondition(@RequestParam(value = "page") PageRequest page, @RequestParam(value = "condition") String condition);*/
 }

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

@@ -0,0 +1,14 @@
+package com.usoftchina.saas.document.api;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.Map;
+
+@FeignClient(name = "document-server")
+public interface WarehouseApi {
+
+    @GetMapping("/api/document/warehouse/post")
+    public String callProcedure(Map<String, Object> param);
+
+}

applications/document/document-api/src/main/resources/application.yml

@@ -1,44 +0,0 @@
-spring:
-  application:
-    name: document-api
-  security:
-    user:
-      name: admin
-      password: select111***
-  datasource:
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.253.12:3306/saas_biz?characterEncoding=utf-8&useSSL=false
-    username: root
-    password: select111***
-    hikari:
-      minimum-idle: 5
-      maximum-pool-size: 50
-      idle-timeout: 30000
-      max-lifetime: 1800000
-      connection-timeout: 30000
-  messages:
-    basename: i18n/messages
-eureka:
-  instance:
-    leaseRenewalIntervalInSeconds: 10
-    health-check-url-path: /actuator/health
-    status-page-url-path: /actuator/info
-    metadata-map:
-      user.name: ${spring.security.user.name}
-      user.password: ${spring.security.user.password}
-  client:
-    registryFetchIntervalSeconds: 5
-    serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
-server:
-  port: 9481
-  tomcat:
-    uri-encoding: UTF-8
-info:
-  name: '@project.artifactId@'
-  description: '@project.description@'
-  version: '@project.version@'
-  spring-boot-version: '@spring.boot.version@'
-  spring-cloud-version: '@spring.cloud.version@'
-auth:
-  public-key: auth/pub.key

applications/document/document-api/src/main/resources/banner.txt

@@ -1,15 +0,0 @@
-${AnsiColor.BRIGHT_YELLOW}
-
-88        88   ad88888ba     ,ad8888ba,    88888888888  888888888888  ,ad8888ba,   88        88  88  888b      88         db
-88        88  d8"     "8b   d8"'    `"8b   88                88      d8"'    `"8b  88        88  88  8888b     88        d88b
-88        88  Y8,          d8'        `8b  88                88     d8'            88        88  88  88 `8b    88       d8'`8b
-88        88  `Y8aaaaa,    88          88  88aaaaa           88     88             88aaaaaaaa88  88  88  `8b   88      d8'  `8b
-88        88    `"""""8b,  88          88  88"""""           88     88             88""""""""88  88  88   `8b  88     d8YaaaaY8b
-88        88          `8b  Y8,        ,8P  88                88     Y8,            88        88  88  88    `8b 88    d8""""""""8b
-Y8a.    .a8P  Y8a     a8P   Y8a.    .a8P   88                88      Y8a.    .a8P  88        88  88  88     `8888   d8'        `8b
- `"Y8888Y"'    "Y88888P"     `"Y8888Y"'    88                88       `"Y8888Y"'   88        88  88  88      `888  d8'          `8b
-
-
-Application Version: ${application.version}${application.formatted-version}
-Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-${AnsiColor.DEFAULT}

applications/document/document-api/src/main/resources/logback-spring.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <jmxConfigurator/>
-
-    <!--
-    %m
-    输出代码中指定的消息
-    %p
-    输出优先级，即DEBUG，INFO，WARN，ERROR，FATAL
-    %r
-    输出自应用启动到输出该log信息耗费的毫秒数
-    %c
-    输出所属的类目，通常就是所在类的全名
-    %t
-    输出产生该日志事件的线程名
-    %n
-    输出一个回车换行符，Windows平台为“\r\n”，Unix平台为“\n”
-    %d
-    输出日志时间点的日期或时间，默认格式为ISO8601，也可以在其后指定格式，比如：%d{yyy MMM dd HH:mm:ss,SSS}，
-    输出类似：2002年10月18日 22：10：28，921
-    %l
-    输出日志事件的发生位置，包括类目名、发生的线程，以及在代码中的行数。举例：Testlog4.main(TestLog4.java:10)
-    -->
-
-    <springProperty scope="context" name="log.path" source="logging.path" defaultValue="/var/log/saas/document-api"/>
-    <springProperty scope="context" name="spring.application.name" source="spring.application.name" defaultValue="document-api"/>
-    <springProperty scope="context" name="spring.profiles.active" source="spring.profiles.active" defaultValue="dev"/>
-    <springProperty scope="context" name="common-pattern" source="logging.common-pattern" defaultValue="%d{yyyy-MM-dd HH:mm:ss.SSS}:[%5p] [%t:%r] [%C{1}:%M:%L] --> %m%n"/>
-    <springProperty scope="context" name="log.level.console" source="logging.level.console" defaultValue="INFO"/>
-
-    <contextName>${spring.application.name}-${spring.profiles.active}-logback</contextName>
-
-
-    <appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>${log.level.console}</level>
-        </filter>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="ROOT_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/root.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 每天一归档 -->
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/root-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
-            <!-- 单个日志文件最多 100MB, 60天的日志周期，最大不能超过20GB -->
-            <maxFileSize>128MB</maxFileSize>
-            <maxHistory>60</maxHistory>
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${common-pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <root level="${log.level.console}">
-        <appender-ref ref="CONSOLE_APPENDER"/>
-        <appender-ref ref="ROOT_APPENDER"/>
-    </root>
-
-</configuration>

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

@@ -4,18 +4,18 @@ import java.io.Serializable;
 
 public class ProductDTO implements Serializable {
 
-    private String pr_id;
+    private long pr_id;
     private String pr_code;
     private String pr_detail;
     private String pr_spec;
     private String pr_orispeccode;
     private String pr_brand;
 
-    public String getPr_id() {
+    public long getPr_id() {
         return pr_id;
     }
 
-    public void setPr_id(String pr_id) {
+    public void setPr_id(long pr_id) {
         this.pr_id = pr_id;
     }
 
@@ -58,4 +58,16 @@ public class ProductDTO implements Serializable {
     public void setPr_brand(String pr_brand) {
         this.pr_brand = pr_brand;
     }
+
+    @Override
+    public String toString() {
+        return "ProductDTO{" +
+                "pr_id='" + pr_id + '\'' +
+                ", pr_code='" + pr_code + '\'' +
+                ", pr_detail='" + pr_detail + '\'' +
+                ", pr_spec='" + pr_spec + '\'' +
+                ", pr_orispeccode='" + pr_orispeccode + '\'' +
+                ", pr_brand='" + pr_brand + '\'' +
+                '}';
+    }
 }

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

@@ -7,6 +7,8 @@ import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @SpringBootApplication
 @EnableEurekaClient

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

@@ -1,10 +1,11 @@
 package com.usoftchina.saas.document.controller;
 
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
-import com.usoftchina.saas.document.po.Product;
+import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.service.ProductService;
 import com.usoftchina.saas.page.PageRequest;
-import feign.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -21,9 +22,16 @@ public class ProductController {
 
     @RequestMapping("/getProductsByCondition")
     @ResponseBody
-    public List<Product> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO){
-        List<Product> productList = productService.getProductsByCondition(page, docReqDTO);
-        return productList;
+    public Result<List<ProductDTO>> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO){
+        List<ProductDTO> productList = productService.getProductsByCondition(page, docReqDTO);
+        return Result.success(productList);
+    }
+
+    @RequestMapping("/getProdUnit")
+    @ResponseBody
+    public Result<List<ComboDTO>> getProdUnit(){
+        List<ComboDTO> prodUnitList = productService.getProdUnit();
+        return Result.success(prodUnitList);
     }
 
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/VendorController.java

@@ -1,7 +1,8 @@
 package com.usoftchina.saas.document.controller;
 
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.common.dto.DocReqDTO;
-import com.usoftchina.saas.document.po.Vendor;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,24 +13,16 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-@RequestMapping("/api/document/vendor")
+@RequestMapping("/vendor")
 public class VendorController {
 
     @Autowired
     private VendorService vendorService;
 
-
-    @RequestMapping(value = "")
-    @ResponseBody
-    public String getVendorList(){
-
-        return "HelloWorld!";
-    }
-
     @RequestMapping("/getVendorsByCondition")
     @ResponseBody
-    public List<Vendor> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO){
-        List<Vendor> vendorList = vendorService.getVendorsByCondition(page, docReqDTO);
-        return vendorList;
+    public Result<List<VendorDTO>> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO){
+        List<VendorDTO> vendorList = vendorService.getVendorsByCondition(page, docReqDTO);
+        return Result.success(vendorList);
     }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/WarehouseController.java

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.document.controller;
+
+import com.usoftchina.saas.document.service.WarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/document/warehouse")
+public class WarehouseController {
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    /**
+     * 过账
+     * @return
+     */
+    @GetMapping("/post")
+    public String post(Map<String, Object> map){
+        String result = warehouseService.callProcedure(map);
+        return result;
+    }
+
+}

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

@@ -1,14 +1,15 @@
 package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
 import com.usoftchina.saas.document.po.Product;
-import com.usoftchina.saas.page.PageRequest;
 
 import java.util.List;
 
 public interface ProductMapper extends CommonBaseMapper<Product> {
 
     List<Product> getProductsByCondition(DocReqDTO docReqDTO);
+    List<ComboDTO> getProdUnit();
 
 }

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

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

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

@@ -0,0 +1,12 @@
+package com.usoftchina.saas.document.mapper;
+
+import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.document.po.Warehouse;
+
+import java.util.Map;
+
+public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
+
+    String callProcedure(Map<String, Object> map);
+
+}

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

@@ -0,0 +1,144 @@
+package com.usoftchina.saas.document.po;
+
+import com.usoftchina.saas.base.entity.CommonBaseEntity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 仓库资料
+ * @author chenwei
+ * @Date 2018/10/16
+ */
+public class Warehouse extends CommonBaseEntity implements Serializable {
+
+    private long wh_id;
+    private String wh_code;
+    private String wh_type;
+    private String wh_description;
+    private String wh_statuscode;
+    private String wh_status;
+    private long wh_recordid;
+    private String wh_recorder;
+    /**
+     * 录入日期
+     */
+    private Date wh_date;
+    private String wh_text1;
+    private String wh_text2;
+    private String wh_text3;
+    private String wh_text4;
+    private String wh_text5;
+
+    public long getWh_id() {
+        return wh_id;
+    }
+
+    public void setWh_id(long wh_id) {
+        this.wh_id = wh_id;
+    }
+
+    public String getWh_code() {
+        return wh_code;
+    }
+
+    public void setWh_code(String wh_code) {
+        this.wh_code = wh_code;
+    }
+
+    public String getWh_type() {
+        return wh_type;
+    }
+
+    public void setWh_type(String wh_type) {
+        this.wh_type = wh_type;
+    }
+
+    public String getWh_description() {
+        return wh_description;
+    }
+
+    public void setWh_description(String wh_description) {
+        this.wh_description = wh_description;
+    }
+
+    public String getWh_statuscode() {
+        return wh_statuscode;
+    }
+
+    public void setWh_statuscode(String wh_statuscode) {
+        this.wh_statuscode = wh_statuscode;
+    }
+
+    public String getWh_status() {
+        return wh_status;
+    }
+
+    public void setWh_status(String wh_status) {
+        this.wh_status = wh_status;
+    }
+
+    public long getWh_recordid() {
+        return wh_recordid;
+    }
+
+    public void setWh_recordid(long wh_recordid) {
+        this.wh_recordid = wh_recordid;
+    }
+
+    public String getWh_recorder() {
+        return wh_recorder;
+    }
+
+    public void setWh_recorder(String wh_recorder) {
+        this.wh_recorder = wh_recorder;
+    }
+
+    public Date getWh_date() {
+        return wh_date;
+    }
+
+    public void setWh_date(Date wh_date) {
+        this.wh_date = wh_date;
+    }
+
+    public String getWh_text1() {
+        return wh_text1;
+    }
+
+    public void setWh_text1(String wh_text1) {
+        this.wh_text1 = wh_text1;
+    }
+
+    public String getWh_text2() {
+        return wh_text2;
+    }
+
+    public void setWh_text2(String wh_text2) {
+        this.wh_text2 = wh_text2;
+    }
+
+    public String getWh_text3() {
+        return wh_text3;
+    }
+
+    public void setWh_text3(String wh_text3) {
+        this.wh_text3 = wh_text3;
+    }
+
+    public String getWh_text4() {
+        return wh_text4;
+    }
+
+    public void setWh_text4(String wh_text4) {
+        this.wh_text4 = wh_text4;
+    }
+
+    public String getWh_text5() {
+        return wh_text5;
+    }
+
+    public void setWh_text5(String wh_text5) {
+        this.wh_text5 = wh_text5;
+    }
+}

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

@@ -3,12 +3,14 @@ package com.usoftchina.saas.document.service.Impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.mapper.ProductMapper;
 import com.usoftchina.saas.document.po.Product;
 import com.usoftchina.saas.document.service.ProductService;
 import com.usoftchina.saas.page.PageRequest;
-import org.apache.commons.lang.StringUtils;
+import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,7 +23,7 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     private ProductMapper productMapper;
 
     @Override
-    public List<Product> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO) {
+    public List<ProductDTO> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO) {
         //设置分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -29,10 +31,16 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        System.out.println("condition:    " + docReqDTO);
         List<Product> productList = productMapper.getProductsByCondition(docReqDTO);
+        //Product To ProductDTO
+        List<ProductDTO> productDTOList = BeanMapper.mapList(productList, ProductDTO.class);
         //取分页信息
-        PageInfo<Product> pageInfo = new PageInfo<Product>(productList);
-        return productList;
+        PageInfo<ProductDTO> pageInfo = new PageInfo<ProductDTO>(productDTOList);
+        return productDTOList;
+    }
+
+    @Override
+    public List<ComboDTO> getProdUnit() {
+        return productMapper.getProdUnit();
     }
 }

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

@@ -4,10 +4,12 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.common.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.mapper.VendorMapper;
 import com.usoftchina.saas.document.po.Vendor;
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.BeanMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,7 +27,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
 
 
     @Override
-    public List<Vendor> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO) {
+    public List<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO) {
         //设置分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -34,8 +36,10 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
         List<Vendor> vendorList = vendorMapper.getVendorsByCondition(docReqDTO);
+        //Vendor To VendorDTO
+        List<VendorDTO> vendorDTOList = BeanMapper.mapList(vendorList, VendorDTO.class);
         //取分页信息
-        PageInfo<Vendor> pageInfo = new PageInfo<Vendor>(vendorList);
-        return vendorList;
+        PageInfo<VendorDTO> pageInfo = new PageInfo<VendorDTO>(vendorDTOList);
+        return vendorDTOList;
     }
 }

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

@@ -0,0 +1,24 @@
+package com.usoftchina.saas.document.service.Impl;
+
+import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.document.mapper.WarehouseMapper;
+import com.usoftchina.saas.document.po.Warehouse;
+import com.usoftchina.saas.document.service.WarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
+
+    @Autowired
+    private WarehouseMapper warehouseMapper;
+
+    @Override
+    public String callProcedure(Map<String, Object> map){
+        String result = warehouseMapper.callProcedure(map);
+        return result;
+    }
+
+}

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

@@ -1,7 +1,9 @@
 package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.common.dto.ComboDTO;
 import com.usoftchina.saas.common.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.ProductDTO;
 import com.usoftchina.saas.document.mapper.ProductMapper;
 import com.usoftchina.saas.document.po.Product;
 import com.usoftchina.saas.page.PageRequest;
@@ -10,5 +12,7 @@ import java.util.List;
 
 public interface ProductService extends CommonBaseService<ProductMapper, Product> {
 
-    List<Product> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO);
+    List<ProductDTO> getProductsByCondition(PageRequest page, DocReqDTO docReqDTO);
+
+    List<ComboDTO> getProdUnit();
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.common.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.mapper.VendorMapper;
 import com.usoftchina.saas.document.po.Vendor;
 import com.usoftchina.saas.page.PageRequest;
@@ -10,6 +11,6 @@ import java.util.List;
 
 public interface VendorService extends CommonBaseService<VendorMapper, Vendor>{
 
-    List<Vendor> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO);
+    List<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO);
 
 }

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

@@ -0,0 +1,13 @@
+package com.usoftchina.saas.document.service;
+
+import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.document.mapper.WarehouseMapper;
+import com.usoftchina.saas.document.po.Warehouse;
+
+import java.util.Map;
+
+public interface WarehouseService extends CommonBaseService<WarehouseMapper, Warehouse> {
+
+    String callProcedure(Map<String, Object> map);
+
+}

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

@@ -35,6 +35,7 @@
         <result column="pr_text4" property="pr_text4" jdbcType="VARCHAR" />
         <result column="pr_text5" property="pr_text5" jdbcType="VARCHAR" />
     </resultMap>
+    <!--查询所有物料信息-->
     <select id="getProductsByCondition" resultMap="ProductResultMapper" parameterType="com.usoftchina.saas.common.dto.DocReqDTO">
         SELECT * FROM PRODUCT
         <where>
@@ -42,7 +43,10 @@
                 ${condition}
             </if>
         </where>
+    </select>
 
+    <select id="getProdUnit" resultType="com.usoftchina.saas.common.dto.ComboDTO">
+        SELECT PR_UNIT as display, pr_unit as value FROM PRODUCT
     </select>
 </mapper>
 

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.document.mapper.WarehouseMapper">
+    <resultMap id="WarehouseResultMapper" type="com.usoftchina.saas.document.po.Warehouse">
+        <id column="wh_id" property="wh_id" jdbcType="INTEGER" />
+        <result column="wh_code" property="wh_code" jdbcType="VARCHAR" />
+        <result column="wh_type" property="wh_type" jdbcType="VARCHAR" />
+        <result column="wh_description" property="wh_description" jdbcType="VARCHAR" />
+        <result column="wh_statuscode" property="wh_statuscode" jdbcType="VARCHAR" />
+        <result column="wh_status" property="wh_status" jdbcType="TIMESTAMP" />
+        <result column="wh_recordid" property="wh_recordid" jdbcType="INTEGER" />
+        <result column="wh_recorder" property="wh_recorder" jdbcType="INTEGER" />
+        <result column="wh_date" property="wh_date" jdbcType="INTEGER" />
+        <result column="companyid" property="companyId" jdbcType="INTEGER" />
+        <result column="updatemanid" property="updaterId" jdbcType="INTEGER" />
+        <result column="updatedate" property="updateTime" jdbcType="TIMESTAMP" />
+        <result column="wh_text1" property="wh_text1" jdbcType="VARCHAR" />
+        <result column="wh_text2" property="wh_text2" jdbcType="VARCHAR" />
+        <result column="wh_text3" property="wh_text3" jdbcType="VARCHAR" />
+        <result column="wh_text4" property="wh_text4" jdbcType="VARCHAR" />
+        <result column="wh_text5" property="wh_text5" jdbcType="VARCHAR" />
+    </resultMap>
+    <select id="callProcedure" parameterMap="testParamMap" statementType="CALLABLE">
+        call sp_test(?, ?)
+    </select>
+    <parameterMap id="testParamMap" type="java.util.Map">
+        <parameter property="inParam" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="outParam" jdbcType="VARCHAR" mode="OUT" />
+    </parameterMap>
+    
+</mapper>
+

applications/document/document-server/src/test/java/com/usoftchina/saas/document/service/VendorServiceTest.java → applications/document/document-server/src/test/java/com/usoftchina/saas/document/service/VendorTest.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 
 import com.usoftchina.saas.document.DocumentApplication;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.po.Vendor;
 import com.usoftchina.saas.page.PageRequest;
 import org.junit.Test;
@@ -16,17 +17,17 @@ import java.util.List;
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = DocumentApplication.class)
 @EnableAutoConfiguration
-public class VendorServiceTest {
+public class VendorTest {
 
     @Autowired
     private VendorService vendorService;
 
     @Test
     public void testSelectAll(){
-        List<Vendor> vendorList = vendorService.getVendorsByCondition(null, null);
+        List<VendorDTO> vendorList = vendorService.getVendorsByCondition(null, null);
         System.out.println("vendCode: " + vendorList.get(0).getVe_code());
         System.out.println("vendName: " + vendorList.get(0).getVe_name());
         System.out.println("vendType: " + vendorList.get(0).getVe_type());
-        System.out.println("vendBeginDate: " + vendorList.get(0).getVe_begindate());
+        System.out.println("vendBeginDate: " + vendorList.get(0).getVe_status());
     }
 }

applications/document/document-server/src/test/java/com/usoftchina/saas/document/service/WarehouseTest.java

@@ -0,0 +1,33 @@
+package com.usoftchina.saas.document.service;
+
+import com.usoftchina.saas.document.DocumentApplication;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = DocumentApplication.class)
+@EnableAutoConfiguration
+public class WarehouseTest {
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    @Test
+    public void testCallProcedure(){
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("inParam", "Hello,World!");              //入参
+        map.put("outParam", null);                      //输出结果
+        warehouseService.callProcedure(map);
+        //输出返回值
+        System.out.println("result:" + map.get("outParam"));
+    }
+
+
+}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/config/WebMvcConfig.java

@@ -1,36 +0,0 @@
-package com.usoftchina.saas.purchase.config;
-
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import java.nio.charset.Charset;
-import java.util.List;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer{
-
-    @Bean
-    public HttpMessageConverter<String> responseBodyConverter() {
-        StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        return converter;
-    }
-
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        WebMvcConfigurer.super.configureMessageConverters(converters);
-        converters.add(responseBodyConverter());
-    }
-
-    @Bean
-    public RestTemplate restTemplate(){
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getMessageConverters().add(0, responseBodyConverter());
-        return restTemplate;
-    }
-
-}

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/ComponentController.java

@@ -1,36 +0,0 @@
-package com.usoftchina.saas.purchase.controller;
-
-import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.document.api.ProductApi;
-import com.usoftchina.saas.document.api.VendorApi;
-import com.usoftchina.saas.document.dto.ProductDTO;
-import com.usoftchina.saas.document.dto.VendorDTO;
-import com.usoftchina.saas.page.PageRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("/purchase/component")
-public class ComponentController {
-
-    @Autowired
-    private VendorApi vendorApi;
-    @Autowired
-    private ProductApi productApi;
-
-    @GetMapping("/dbfind/vendor")
-    @ResponseBody
-    public Result<VendorDTO> getVendorList(PageRequest page, String condition){
-        List<VendorDTO> vendorDTOResult = vendorApi.getVendorsByCondition(page, condition);
-        return Result.success(vendorDTOResult);
-    }
-
-    @GetMapping("/dbfind/product")
-    @ResponseBody
-    public Result<ProductDTO> getProductList(PageRequest page, String condition){
-        List<ProductDTO> productDTOResult = productApi.getProductsByCondition(page, condition);
-        return Result.success(productDTOResult);
-    }
-}