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

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

@@ -34,4 +34,10 @@ public class WarehouseController {
         boolean result = warehouseService.save(data);
         return Result.success(result);
     }
+
+    @PostMapping("/valid/period")
+    public Result validPeriod(String period){
+        boolean result = warehouseService.validPeriod(period);
+        return Result.success(result);
+    }
 }

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

@@ -9,4 +9,5 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     void callProcedure(Map<String, Object> map);
 
+    Short validPeriod(Map<String, Object> map);
 }

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

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.document.service.Impl;
 
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.entities.Warehouse;
 import com.usoftchina.saas.document.mapper.WarehouseMapper;
 
@@ -8,6 +9,7 @@ import com.usoftchina.saas.document.service.WarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -21,4 +23,18 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         warehouseMapper.callProcedure(map);
     }
 
+    @Override
+    public boolean validPeriod(String period) {
+        long companyId = BaseContextHolder.getCompanyId();
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("companyId", companyId);
+        map.put("period", period);
+        Short status = warehouseMapper.validPeriod(map);
+        if(status != null && status == 0){
+            return true;
+        }else{
+            return false;
+        }
+    }
+
 }

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

@@ -11,4 +11,6 @@ public interface WarehouseService extends CommonBaseService<WarehouseMapper, War
 
     void callProcedure(Map<String, Object> map);
 
+    boolean validPeriod(String periods);
+
 }

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

@@ -30,6 +30,10 @@
         <parameter property="companyid" jdbcType="INTEGER" mode="IN" />
         <parameter property="result" jdbcType="VARCHAR" mode="OUT" />
     </parameterMap>
-    
+
+    <select id="validPeriod" parameterType="map" resultType="java.lang.Short">
+        SELECT IFNULL(PD_STATUS,0) PD_STATUS FROM PERIODSDETAIL WHERE COMPANYID=#{companyId} AND PD_DETNO=#{period}
+    </select>
+
 </mapper>
 

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

@@ -22,12 +22,23 @@ public class WarehouseTest {
     @Test
     public void testCallProcedure(){
         Map<String, Object> map = new HashMap<String, Object>();
-        map.put("inParam", "Hello,World!");              //入参
-        map.put("outParam", null);                      //输出结果
+        map.put("inoutNo", "YS20181018");              //入参
+        map.put("class", "采购验收单");
+        map.put("commitid", null);
+        map.put("companyid", null);
+        map.put("result", null);                      //输出结果
         warehouseService.callProcedure(map);
         //输出返回值
-        System.out.println("result:" + map.get("outParam"));
+        System.out.println("result:" + map.get("result"));
     }
 
 
+    @Test
+    public void testPeriod(){
+        long companyId = 12;
+        String period = "201810";
+        boolean valid = warehouseService.validPeriod(period);
+        System.out.println("result: " + valid);
+    }
+
 }

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

@@ -147,4 +147,15 @@ public class PurchaseController {
         return Result.success();
     }
 
+    @PostMapping("/close/{id}")
+    public Result closePurchase(@PathVariable(value = "id") long id){
+        purchaseService.closePurchase(id);
+        return Result.success();
+    }
+
+    @PostMapping("/open/{id}")
+    public Result openPurchase(@PathVariable(value = "id") long id){
+        purchaseService.openPurchase(id);
+        return Result.success();
+    }
 }

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

@@ -109,4 +109,18 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
     * @Date: 2018/10/17 
     */
     void batchUnAudit(BatchDealBaseDTO baseDTOs);
+
+    /**
+     * 采购单关闭
+     * @param id
+     * @Author: chenwei
+     * @Date: 20181018
+     */
+    void closePurchase(long id);
+
+    /**
+     * 采购单恢复
+     * @param id
+     */
+    void openPurchase(long id);
 }

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

@@ -220,6 +220,44 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         }
     }
 
+    @Override
+    public void closePurchase(long id) {
+        Purchase purchase = new Purchase();
+        purchase.setId(id);
+        purchase.setPu_acceptstatuscode("CLOSED");
+        purchase.setPu_acceptstatus("已关闭");
+        purchaseMapper.updateByPrimaryKeySelective(purchase);
+    }
+
+    @Override
+    public void openPurchase(long id) {
+        List<PurchaseDetail> purchaseDetailList = purchasedetailMapper.selectByFK(id);
+        int partTurnCount = 0,turnCount = 0;            //部分入库、全部入库
+        if(purchaseDetailList != null && purchaseDetailList.size() > 0){
+            for(PurchaseDetail purchaseDetail : purchaseDetailList){
+                if(purchaseDetail.getPd_acceptqty() >= purchaseDetail.getPd_qty()){     //入库数大于等于采购数
+                    turnCount++;
+                }else if(purchaseDetail.getPd_acceptqty() > 0 && purchaseDetail.getPd_acceptqty() < purchaseDetail.getPd_qty()){    //     0 < 入库数 < 采购数
+                    partTurnCount++;
+                }
+            }
+            //构造更新对象
+            Purchase purchase = new Purchase();
+            purchase.setId(id);
+            purchase.setPu_acceptstatuscode("UNTURNIN");
+            purchase.setPu_acceptstatus("未入库");
+            if(partTurnCount > 0){
+                purchase.setPu_acceptstatuscode("PART2IN");
+                purchase.setPu_acceptstatus("部分入库");
+            }
+            if(turnCount == purchaseDetailList.size()){
+                purchase.setPu_acceptstatus("已入库");
+                purchase.setPu_acceptstatuscode("TURNIN");
+            }
+            purchaseMapper.updateByPrimaryKeySelective(purchase);
+        }
+    }
+
     private void singleAudit(Long id) {
         Purchase purchase = new Purchase();
         //生成更新对象