1.采购模块新增测试方法

applications/purchase/purchase-server/pom.xml

@@ -29,6 +29,13 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>server-starter</artifactId>
         </dependency>
+
+        <!--test-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
         <!-- db -->
         <dependency>
             <groupId>mysql</groupId>

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

@@ -2,7 +2,7 @@ package com.usoftchina.saas.purchase.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.purchase.dto.ProdInOutReqDTO;
@@ -37,6 +37,7 @@ public class ProdInOutController {
         return Result.success(listData);
     }*/
 
+    @GetMapping("/list")
     public Result<PageInfo<ProdInOutList>> getListData(PageRequest page, ProdInOutReqDTO req) {
         PageInfo<ProdInOutList> listData = prodInOutService.getListData(page,req);
         return Result.success(listData);

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

@@ -1,8 +1,9 @@
 package com.usoftchina.saas.purchase.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseService;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.ProdInOutFormDTO;
 import com.usoftchina.saas.purchase.dto.ProdInOutReqDTO;
@@ -44,4 +45,11 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
     int deleteItem(Long id);
 
     PageInfo<ProdInOutList> getListData(PageRequest page, ProdInOutReqDTO req);
+
+
+    void post(Long id);
+
+
+    Result turnProdOut(Long id);
+
 }

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

@@ -2,8 +2,10 @@ package com.usoftchina.saas.purchase.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
-import com.usoftchina.saas.common.dto.DocSavedDTO;
+import com.usoftchina.saas.commons.dto.DocSavedDTO;
+import com.usoftchina.saas.document.api.WarehouseApi;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.ProdIODetailDTO;
@@ -22,7 +24,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by zdw
@@ -37,6 +41,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     private PurchaseMapper purchaseMapper;
     @Autowired
     private ProdInOutListMapper prodInOutListMapper;
+    @Autowired
+    private WarehouseApi warehouseApi;
 
 
 
@@ -57,6 +63,22 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         return pageInfo;
     }
 
+    @Override
+    public void post(Long id) {
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("inoutNo","YS20181018");
+        map.put("class","采购验收单");
+        map.put("commitid","11");
+        map.put("companyid","1");
+        map.put("result","");
+        warehouseApi.callProcedure(map);
+        Object result =  map.get("result");
+        System.out.println("result");
+        if (!StringUtils.isEmpty(result))
+            System.out.println(result);
+
+    }
+
     private List<ProdInOutList> getListByMode(ProdInOutReqDTO req) {
         List<ProdInOutList> list = null;
         if (null == req || StringUtils.isEmpty(req.getMode()) || "Main".equals(req.getMode())) {
@@ -217,5 +239,14 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
 //        purchaseMapper.updateAcceptstatus(id);
     }
 
+    @Override
+    public Result turnProdOut(Long id) {
+        ProdInOut prodInOut = getMapper().selectByPrimaryKey(id);
+
+
+
+
+        return null;
+    }
 
 }

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

@@ -16,7 +16,7 @@
     <result column="pi_pucode" jdbcType="VARCHAR" property="pi_pucode" />
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
-    <result column="pi_total" jdbcType="Double" property="pi_total" />
+    <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
     <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
     <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
     <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />

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

@@ -16,7 +16,7 @@
     <result column="pi_pucode" jdbcType="VARCHAR" property="pi_pucode" />
     <result column="pi_said" jdbcType="INTEGER" property="pi_said" />
     <result column="pi_sacode" jdbcType="VARCHAR" property="pi_sacode" />
-    <result column="pi_total" jdbcType="Double" property="pi_total" />
+    <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
     <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
     <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
     <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
@@ -133,7 +133,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="ResultMapWithBLOBs">
     select 
     <include refid="Base_Column_List" />
     ,

applications/purchase/purchase-server/src/test/PurchaseTest.java

@@ -0,0 +1,22 @@
+import com.usoftchina.saas.purchase.PurchaseApplication;
+import com.usoftchina.saas.purchase.service.ProdInOutService;
+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;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = PurchaseApplication.class)
+@EnableAutoConfiguration
+public class PurchaseTest {
+
+    @Autowired
+    private ProdInOutService prodInOutService;
+
+    @Test
+    public void test(){
+        prodInOutService.post(new Long(11));
+    }
+}