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

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

@@ -3,9 +3,10 @@ package com.usoftchina.saas.purchase.controller;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
-import com.usoftchina.saas.document.api.ProductApi;
+import com.usoftchina.saas.common.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.*;
+import com.usoftchina.saas.purchase.po.PurchaseList;
 import com.usoftchina.saas.purchase.service.PurchaseService;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +33,8 @@ public class PurchaseController {
      * @return
      */
     @GetMapping("/list")
-    public Result<PageInfo<PurchaseListDTO>> getListData(PageRequest page, PurchaseReqDTO req) {
-        PageInfo<PurchaseListDTO> listData = purchaseService.getListData(page, req);
+    public Result<PageInfo<PurchaseList>> getListData(PageRequest page, PurchaseReqDTO req) {
+        PageInfo<PurchaseList> listData = purchaseService.getListData(page, req);
         return Result.success(listData);
     }
 
@@ -42,8 +43,8 @@ public class PurchaseController {
      *
      * @return
      */
-    @GetMapping("/read")
-    public Result<PurchaseFormDTO> getFormData(@RequestParam Long id) {
+    @GetMapping("/read/{id}")
+    public Result<PurchaseFormDTO> getFormData(@PathVariable("id") Long id) {
         PurchaseFormDTO data = purchaseService.getFormData(id);
         return Result.success(data);
     }
@@ -54,10 +55,11 @@ public class PurchaseController {
      * @param
      * @return
      */
-    @PostMapping(value = "/save")
+    @PostMapping("/save")
     public Result<Long> saveFormData(@RequestBody PurchaseFormDTO data) {
-        Long id = purchaseService.saveFormData(data);
-        return Result.success(id);
+        DocSavedDTO savedDTO = purchaseService.saveFormData(data);
+        return Result.success(savedDTO);
+
     }
 
     /**

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

@@ -3,12 +3,13 @@ package com.usoftchina.saas.purchase.service;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
+import com.usoftchina.saas.common.dto.DocSavedDTO;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.purchase.dto.PurchaseFormDTO;
-import com.usoftchina.saas.purchase.dto.PurchaseListDTO;
 import com.usoftchina.saas.purchase.dto.PurchaseReqDTO;
 import com.usoftchina.saas.purchase.mapper.PurchaseMapper;
 import com.usoftchina.saas.purchase.po.Purchase;
+import com.usoftchina.saas.purchase.po.PurchaseList;
 
 import java.util.List;
 
@@ -31,7 +32,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param page,req
      * @return
      */
-    PageInfo<PurchaseListDTO> getListData(PageRequest page, PurchaseReqDTO req);
+    PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req);
 
     /**
      * 采购订单列表查询
@@ -47,7 +48,7 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param formdata
      * @return
      */
-    Long saveFormData(PurchaseFormDTO formdata);
+    DocSavedDTO saveFormData(PurchaseFormDTO formdata);
 
     /**
      * 删除

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

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.common.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.common.dto.DocBaseDTO;
+import com.usoftchina.saas.common.dto.DocSavedDTO;
 import com.usoftchina.saas.document.api.ProductApi;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
@@ -43,7 +44,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     private ProductApi productApi;
 
     @Override
-    public PageInfo<PurchaseListDTO> getListData(PageRequest page, PurchaseReqDTO req) {
+    public PageInfo<PurchaseList> getListData(PageRequest page, PurchaseReqDTO req) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -53,14 +54,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         PageHelper.startPage(page.getNumber(), page.getSize());
         //查询数据
         List<PurchaseList> lists = getListByMode(req);
-        //转换成传输对象
-        List<PurchaseListDTO> purchaseListDTOS = new ArrayList<>();
-        for (PurchaseList list : lists) {
-            purchaseListDTOS.add(BeanMapper.map(list, PurchaseListDTO.class));
-        }
         //取分页信息
-        PageInfo<PurchaseListDTO> pageInfo = new PageInfo<PurchaseListDTO>(purchaseListDTOS);
-        pageInfo.getTotal();
+        PageInfo<PurchaseList> pageInfo = new PageInfo<PurchaseList>(lists);
         return pageInfo;
     }
 
@@ -84,22 +79,29 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     }
 
     @Override
-    public Long saveFormData(PurchaseFormDTO formdata) {
+    public DocSavedDTO saveFormData(PurchaseFormDTO formdata) {
         if (null == formdata || null == formdata.getMain()){
             throw new BizException(500, "数据为空，请填写后再保存");
         }
+
         //获取主表信息
         PurchaseDTO main = formdata.getMain();
         List<PurchaseItemDTO> items = formdata.getItems();
+        //插入从表数据
         List<PurchaseItem> insertDetails = new ArrayList<>();
+        //更新从表数据
         List<PurchaseItem> updateDetails = new ArrayList<>();
+        DocSavedDTO saveDTO = new DocSavedDTO();
         Long pu_id = main.getId();
         String pu_code = main.getPu_code();
         Purchase purchase = BeanMapper.map(main, Purchase.class);
+
         //编号获取
         if (!StringUtils.hasText(pu_code)) {
             pu_code = "PU" + Math.random() * 1000;
+            purchase.setPu_code(pu_code);
         }
+        saveDTO.setCode(pu_code);
         //判断更新与保存动作
         if (StringUtils.hasText(pu_id)) {
             //更新主表
@@ -123,8 +125,10 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             if (updateDetails.size() > 0) {
                 purchasedetailMapper.batchUpdate(updateDetails);
             }
-            return pu_id;
+            saveDTO.setId(pu_id);
+            return saveDTO;
         }
+
         //插入操作
         purchaseMapper.insertSelective(purchase);
         pu_id = purchase.getId();
@@ -139,7 +143,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         if (insertDetails.size() > 0) {
             purchasedetailMapper.batchInsert(insertDetails);
         }
-        return pu_id;
+        saveDTO.setId(pu_id);
+        return saveDTO;
     }
 
     @Override
@@ -158,7 +163,8 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         if (null != formData) {
             id = formData.getMain().getId();
             if (!StringUtils.hasText(id)) {
-                id = saveFormData(formData);
+                DocSavedDTO saveDTO = saveFormData(formData);
+                id = saveDTO.getId();
             }
             singleAudit(id);
         }

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

@@ -356,7 +356,7 @@
       PD_PRODCODE = #{item.pd_prodcode},
       PD_UNIT = #{item.pd_unit},
       PD_QTY = #{item.pd_qty},
-      PD_PRICE = #{item.pd_pice},
+      PD_PRICE = #{item.pd_price},
       PD_TOTAL = #{item.pd_total},
       PD_TAXTOTAL = #{item.pd_taxtotal},
       PD_ACCEPTQTY = #{item.pd_acceptqty},