yzc hai 1 ano
pai
achega
aa0acf5051

+ 2 - 1
hx-form/src/main/java/com/fjhx/form/entity/cost/vo/CostControlVo.java

@@ -5,6 +5,7 @@ import com.fjhx.sale.entity.contract.vo.ContractOutboundInfoVo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@ public class CostControlVo extends CostControl {
     /**
      * 物流公司税点
      */
-    private Integer logisticsTaxPoints;
+    private BigDecimal logisticsTaxPoints;
     /**
      * 物流公司开户名
      */

+ 7 - 0
hx-form/src/main/java/com/fjhx/form/service/cost/impl/CostControlServiceImpl.java

@@ -6,8 +6,10 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.account.entity.account.po.AccountPayment;
 import com.fjhx.account.entity.calculate.po.CalculateItem;
 import com.fjhx.account.entity.calculate.vo.CalculateItemVo;
+import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.account.service.calculate.CalculateItemService;
 import com.fjhx.account.service.payment.PaymentTypeService;
 import com.fjhx.common.controller.Label;
@@ -80,6 +82,8 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
     private ContractService contractService;
     @Autowired
     private ContractOutboundInfoService contractOutboundInfoService;
+    @Autowired
+    private AccountPaymentService accountPaymentService;
 
     @Override
     public Page<CostControlVo> getPage(CostControlSelectDto dto) {
@@ -278,6 +282,9 @@ public class CostControlServiceImpl extends ServiceImpl<CostControlMapper, CostC
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                 .set(BasePo::getUpdateTime, new Date())
         );
+
+        //删除关联打款信息
+        accountPaymentService.remove(q -> q.eq(AccountPayment::getCostControlId, id));
     }
 
     private List<JSONObject> getField(Class cl) {