到账认领修改

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/Claim.java

@@ -65,6 +65,11 @@ public class Claim extends BasePo {
     private Date claimTime;
 
     /**
+     * 汇率
+     */
+    private BigDecimal rate;
+
+    /**
      * 到账认领合同列表
      */
     @TableField(exist = false)

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -89,6 +89,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         List<ClaimContract> claimContractList = claim.getClaimContractList();
         if(CollectionUtils.isNotEmpty(claim.getClaimContractList())){
             for(ClaimContract c:claimContractList){
+                c.setRate(claim.getRate());
                 c.setClaimId(claim.getId());
             }
             claimContractService.saveBatch(claimContractList);

hx-sale/src/main/java/com/fjhx/sale/service/statement/SaleStatementService.java

@@ -1,6 +1,8 @@
 package com.fjhx.sale.service.statement;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
 import com.fjhx.sale.entity.statement.vo.ProfitSettlementVo;
 
@@ -8,4 +10,9 @@ public interface SaleStatementService {
 
     Page<ProfitSettlementVo> getProfitSettlement(ProfitSettlementDto dto);
 
+    /**
+     * 利润结算头部统计
+     */
+    Page<ContractBudgetVo> getProfitClearingPageHeadStatistics(ContractSelectDto dto);
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -28,7 +28,9 @@ import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.sale.entity.claim.po.ClaimContract;
 import com.fjhx.sale.entity.contract.bo.ContractCurrencyRate;
+import com.fjhx.sale.entity.contract.dto.ContractSelectDto;
 import com.fjhx.sale.entity.contract.po.Contract;
+import com.fjhx.sale.entity.contract.vo.ContractBudgetVo;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.purchase.po.EhsdPurchase;
 import com.fjhx.sale.entity.statement.dto.ProfitSettlementDto;
@@ -425,6 +427,16 @@ public class SaleStatementServiceImpl implements SaleStatementService {
     }
 
     /**
+     * 利润结算表头部统计
+     * @param dto
+     * @return
+     */
+    @Override
+    public Page<ContractBudgetVo> getProfitClearingPageHeadStatistics(ContractSelectDto dto) {
+        return null;
+    }
+
+    /**
      * 赋值采购合同金额和支付货款
      */
     private void setPurchaseAmountAndPayForGoods(