定金备注

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/StockPurchaseReceiptReportController.java

@@ -2,15 +2,13 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.entity.StockPurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.service.IPurchaseReceiptReportService;
 import com.yh.saas.plugin.yiliangyiyun.service.IStockPurchaseReceiptReportService;
 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 org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -35,5 +33,17 @@ public class StockPurchaseReceiptReportController {
     public Page<StockPurchaseReceiptReport> selectPurchaseOrder(StockPurchaseReceiptReport stockPurchaseReceiptReport){
         return stockPurchaseReceiptReportService.selectPurchaseOrder(stockPurchaseReceiptReport);
     }
+
+
+    /**
+     * 定金/备注
+     *
+     * @param contractManagementInfo
+     * @return
+     */
+    @PostMapping("/api/disAndRemark")
+    public  String disAndRemark(ContractManagementInfo contractManagementInfo){
+        return stockPurchaseReceiptReportService.disAndRemark(contractManagementInfo);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -171,6 +171,14 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 定金
      */
     private String deposit;
+    /**
+     * 定金路径
+     */
+    private String depositUrl;
+    /**
+     * 统计备注
+     */
+    private String remark;
     /**
      * 溢短装
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IStockPurchaseReceiptReportService.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.StockPurchaseReceiptReport;
 import com.baomidou.mybatisplus.service.IService;
 
@@ -22,4 +23,12 @@ public interface IStockPurchaseReceiptReportService extends IService<StockPurcha
      */
     Page<StockPurchaseReceiptReport> selectPurchaseOrder(StockPurchaseReceiptReport stockPurchaseReceiptReport);
 
+    /**
+     * 定金/备注
+     *
+     * @param contractManagementInfo
+     * @return
+     */
+    String disAndRemark(ContractManagementInfo contractManagementInfo);
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockPurchaseReceiptReportServiceImpl.java

@@ -9,6 +9,7 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.entity.StockPurchaseReceiptReport;
 import com.yh.saas.plugin.yiliangyiyun.mapper.StockPurchaseReceiptReportMapper;
@@ -19,6 +20,7 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
@@ -104,6 +106,32 @@ public class StockPurchaseReceiptReportServiceImpl extends ServiceImpl<StockPurc
     }
 
 
+    /**
+     * 定金/备注
+     *
+     * @param contractManagementInfo
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String disAndRemark(ContractManagementInfo contractManagementInfo) {
+        //查询合同
+        ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectById(contractManagementInfo.getId());
+        if (contractManagementInfo1 != null) {
+            if(StringUtils.isNotBlank(contractManagementInfo.getDeposit())){
+                contractManagementInfo1.setDeposit(contractManagementInfo.getDeposit());
+                contractManagementInfo1.setDepositUrl(contractManagementInfo.getDepositUrl());
+            }
+            if(StringUtils.isNotBlank(contractManagementInfo.getRemark())){
+                contractManagementInfo1.setRemark(contractManagementInfo.getRemark());
+            }
+            //更改采购入库报表信息
+            contractManagementInfoService.updateById(contractManagementInfo1);
+            return "OK";
+        }
+        return "NG";
+    }
+
 
     private List<String> getResourceIdList() {
         User currentUser = AuthSecurityUtils.getCurrentUserInfo();