diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java
index 5861e0fc97..60c88b127d 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveFeign.java
@@ -33,21 +33,6 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
-/**
- * Project: anrui-fin(平仓)
- * File: FinPaymentapplyDetailsBelowEveFeign.java
- * Class: com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveFeign
- * Description: 付款申请明细-明细-平仓.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-12-13 10:03:07
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "付款申请明细-明细-平仓")
@FeignClient(
contextId = "anrui-fin-FinPaymentapplyDetailsBelowEve",
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
index 0943aba447..8b30982d88 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
@@ -71,7 +71,6 @@ public interface FinPaymentrecordFeign {
@ResponseBody
ResultBean batchUpdate(@RequestBody FinPaymentrecordUpdateDto dto);
-
@ApiOperation("作废")
@PostMapping("/updateState")
@ResponseBody
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
index 54ed932589..1569c7d105 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
@@ -30,19 +30,6 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
-/**
- * Project: anrui-fin(财务)
- * File: FinPaymentrecordFeignFallback.java
- * Class: com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeignFallback
- * Description: fin_paymentrecord.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Component
public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
@@ -96,4 +83,9 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
public ResultBean fetchBySid(String sid) {
return null;
}
+
+ @Override
+ public ResultBean pushVoucher(String sid) {
+ return null;
+ }
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
index 811147bdbe..9436d75e4a 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.java
@@ -35,6 +35,8 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveVo;
+
+import java.math.BigDecimal;
import java.util.List;
@Mapper
@@ -44,4 +46,7 @@ public interface FinPaymentapplyDetailsBelowEveMapper extends BaseMapper selByMainSid(String mainSid);
+
+ @Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_details_below_eve WHERE detailSid = #{detailSid}")
+ BigDecimal selExePayByMainSid(String detailSid);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
index 081128ffb6..0e6193028c 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java
@@ -43,6 +43,8 @@ import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetai
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
import java.util.List;
@Service
@@ -204,4 +206,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService selByMainSid(String mainSid) {
return baseMapper.selByMainSid(mainSid);
}
+
+ public BigDecimal selExePayByMainSid(String detailSid) {
+ return baseMapper.selExePayByMainSid(detailSid);
+ }
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
index 5aef80bf24..200a6a4a22 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java
@@ -35,27 +35,12 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.math.BigDecimal;
import java.util.List;
-/**
- * Project: anrui-fin(财务)
- * File: FinPaymentrecordMapper.java
- * Class: com.yxt.anrui.fin.biz.finpaymentrecord.FinPaymentrecordMapper
- * Description: fin_paymentrecord.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-06-23 13:45:10
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface FinPaymentrecordMapper extends BaseMapper {
- //@Update("update fin_paymentrecord set name=#{msg} where id=#{id}")
- //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
-
IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
@@ -70,4 +55,6 @@ public interface FinPaymentrecordMapper extends BaseMapper {
List selectApplySidBySid(List sids);
String selectBatchNum(@Param("s") String s);
+
+ BigDecimal selPayPrice(String applySid);
}
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index 6b5704d4e6..84654ae1a9 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -73,4 +73,12 @@
order by id desc
limit 1
+
+
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index c566cda008..c1fb6a64dc 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -52,6 +52,7 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
+import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -62,6 +63,7 @@ import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
import com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService;
import com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyService;
import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
+import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
import com.yxt.anrui.fin.biz.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveService;
import com.yxt.anrui.fin.biz.finpaymentapplyvehicle.FinPaymentapplyVehicleService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRService;
@@ -189,6 +191,8 @@ public class FinPaymentrecordService extends MybatisBaseService listPageVo(PagerQuery pq) {
@@ -1676,22 +1680,54 @@ public class FinPaymentrecordService extends MybatisBaseService