Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.common.dto;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -7,7 +8,7 @@ import java.util.List;
  * @author: guq
  * @create: 2018-10-15 13:46
  **/
-public class BatchDealBaseDTO {
+public class BatchDealBaseDTO implements Serializable{
     private List<DocBaseDTO> baseDTOs;
 
     public List<DocBaseDTO> getBaseDTOs() {

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

@@ -18,8 +18,8 @@ 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);*/
 
     /**
     * @Description

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-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.RequestParam;
@@ -21,9 +22,15 @@ public class ProductController {
     private ProductService productService;
 
     @RequestMapping("/getProductsByCondition")
-    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")
+    public Result<List<ComboDTO>> getProdUnit() {
+        List<ComboDTO> prodUnitList = productService.getProdUnit();
+        return Result.success(prodUnitList);
     }
 
     @RequestMapping("/updateLatestPurchasePrice")

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;
@@ -18,18 +19,9 @@ 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,15 +1,16 @@
 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();
     void updateLatestPurchasePrice(Long pu_id);
 
 }

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,11 +31,17 @@ 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();
     }
 
     @Override

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,7 +12,10 @@ 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();
 
     void updateLatestPurchasePrice(Long pu_id);
 }

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>
     <update id="updateLatestPurchasePrice" parameterType="long">
         update product a set pr_purcprice=(select pd_price from purchasedetail WHERE

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/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);
-    }
-}

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

@@ -56,7 +56,7 @@ public class PurchaseController {
      * @return
      */
     @PostMapping("/save")
-    public Result<Long> saveFormData(@RequestBody PurchaseFormDTO data) {
+    public Result<DocSavedDTO> saveFormData(@RequestBody PurchaseFormDTO data) {
         DocSavedDTO savedDTO = purchaseService.saveFormData(data);
         return Result.success(savedDTO);
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -18,9 +18,9 @@ import com.usoftchina.saas.purchase.po.*;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 import com.usoftchina.saas.utils.BeanMapper;
 
-import com.usoftchina.saas.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -97,13 +97,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Purchase purchase = BeanMapper.map(main, Purchase.class);
 
         //编号获取
-        if (!StringUtils.hasText(pu_code)) {
+        if (StringUtils.isEmpty(pu_code)) {
             pu_code = "PU" + Math.random() * 1000;
             purchase.setPu_code(pu_code);
         }
         saveDTO.setCode(pu_code);
         //判断更新与保存动作
-        if (StringUtils.hasText(pu_id)) {
+        if (!StringUtils.isEmpty(pu_id)) {
             //更新主表
             purchaseMapper.updateByPrimaryKey(purchase);
             //添加从表传输对象
@@ -111,7 +111,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 PurchaseItem detail = BeanMapper.map(item, PurchaseItem.class);
                 detail.setPd_puid(pu_id);
                 detail.setPd_code(pu_code);
-                if (StringUtils.hasText(detail.getId())) {
+                if (!StringUtils.isEmpty(detail.getId())) {
                     updateDetails.add(detail);
                 } else {
                     insertDetails.add(detail);
@@ -162,7 +162,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         Long id = null;
         if (null != formData) {
             id = formData.getMain().getId();
-            if (!StringUtils.hasText(id)) {
+            if (StringUtils.isEmpty(id)) {
                 DocSavedDTO saveDTO = saveFormData(formData);
                 id = saveDTO.getId();
             }
@@ -177,7 +177,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 baseDTOs.getBaseDTOs().size() == 0)
             return;
         String validate = purchaseMapper.validateAudit(baseDTOs.getBaseDTOs());
-        if (StringUtils.hasText(validate)) {
+        if (!StringUtils.isEmpty(validate)) {
             throw new BizException(500, "存在已审核单据,单据编号:" + validate);
         }
         for (DocBaseDTO base : baseDTOs.getBaseDTOs()) {
@@ -219,7 +219,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     private List<PurchaseList> getListByMode(PurchaseReqDTO req) {
         List<PurchaseList> list = null;
-        if (null == req || !StringUtils.hasText(req.getMode()) || "Main".equals(req.getMode())) {
+        if (null == req || StringUtils.isEmpty(req.getMode()) || "Main".equals(req.getMode())) {
             list = purchaseListMapper.selectPurchaseBycondition(req);
         } else {
             list = purchaseListMapper.selectPurchaseListByCondition(req);

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -392,7 +392,7 @@
     where pu_id = #{id,jdbcType=INTEGER}
   </update>
   <select id="validateAudit" parameterType="com.usoftchina.saas.common.dto.DocBaseDTO" resultType="java.lang.String">
-    select wm_concat(pu_code) from purchase where pu_statuscode='AUDITED' and pu_id in
+    select GROUP_CONCAT(pu_code) from purchase where pu_statuscode='AUDITED' and pu_id in
     <foreach collection="list" item="item" open="(" close=")" separator=",">
       #{item.id}
     </foreach>

framework/core/src/main/java/com/usoftchina/saas/utils/StringUtils.java

@@ -15,14 +15,4 @@ public class StringUtils {
     public static String nullIf(String target, String nullValue) {
         return (null == target || target.isEmpty()) ? nullValue : target;
     }
-
-    /**
-     * 判断参数是否为空、空字符串、空白格
-     *
-     * @param object
-     * @return
-     */
-    public static boolean hasText(Object object) {
-        return object == null ? false : org.springframework.util.StringUtils.hasText(object.toString());
-    }
 }

frontend/saas-web/app/view/core/form/ConDateField.js

@@ -12,6 +12,7 @@ Ext.define('saas.view.core.form.ConDateField', {
     defaults: {
         margin: '0 0 0 0'
     },
+    defaultBindProperty: 'value',
     initComponent : function(){
         this.cls = (this.cls || '') + ' x-form-field-multi';
         this.callParent(arguments);
@@ -76,6 +77,7 @@ Ext.define('saas.view.core.form.ConDateField', {
                     }else {
                         me.value=null;
                     }
+                    me.setValue(v, from, to);
                 }
             }
         });
@@ -105,6 +107,7 @@ Ext.define('saas.view.core.form.ConDateField', {
                     }else {
                         me.value=null;
                     }
+                    me.setValue(v, from, to);
                 }
             }
         });
@@ -113,7 +116,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             t = 3;
         }
         this.value = null;
-        this.setValue(t);
+        this.setInitValue(t);
     },
     setDateFieldValue: function(v){
         v = Number(v);
@@ -186,13 +189,20 @@ Ext.define('saas.view.core.form.ConDateField', {
             from.setEditable(false);
             to.setEditable(false);
         }
+        me.setValue(v, minDate, maxDate);
     },
-    setValue: function(v){
+    setInitValue: function(v) {
         if (v) {
             this.combo.setValue(v);
             this.setDateFieldValue(v);
         }
     },
+    setValue: function(v, from, to){
+        this.value = {type: v,
+            from: from,
+            to: to};
+        this.publishState('value', this.value);
+    },
     getValue: function(){
         return this.value;
     },