b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 批量转结算候选明细接口新增单据号和合同编码查询参数

Browse Source
This commit is contained in:
刘泉佳
2026-09-23 15:39:35 +08:00
parent 78fabd15a5
commit cb0d9a0602
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ReceivablePayableDetailController.java
+3 -1
View File
@@ -133,13 +133,15 @@ public class ReceivablePayableDetailController extends BladeController {
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
@Operation(summary = "转结算候选明细") @Operation(summary = "转结算候选明细")
public R<IPage<Map<String, Object>>> transferCandidates(Query query, public R<IPage<Map<String, Object>>> transferCandidates(Query query,
@RequestParam(required = false) String documentNo,
@RequestParam(required = false) String contractNo,
@RequestParam(required = false) String contractName, @RequestParam(required = false) String contractName,
@RequestParam(required = false) String batchNo, @RequestParam(required = false) String batchNo,
@RequestParam(required = false) String generateStartDate, @RequestParam(required = false) String generateStartDate,
@RequestParam(required = false) String generateEndDate, @RequestParam(required = false) String generateEndDate,
@RequestParam(required = false) String settlementBillType, @RequestParam(required = false) String settlementBillType,
@RequestParam(required = false) String settlementType) { @RequestParam(required = false) String settlementType) {
return R.data(detailService.transferCandidates(Condition.getPage(query), contractName, batchNo, return R.data(detailService.transferCandidates(Condition.getPage(query), documentNo, contractNo, contractName, batchNo,
generateStartDate, generateEndDate, settlementBillType, settlementType)); generateStartDate, generateEndDate, settlementBillType, settlementType));
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/IReceivablePayableDetailService.java
+2 -1
View File
@@ -69,7 +69,8 @@ public interface IReceivablePayableDetailService extends BaseService<ReceivableP
void transferSettlement(ReceivablePayableTransferRequest request); void transferSettlement(ReceivablePayableTransferRequest request);
IPage<Map<String, Object>> transferCandidates(IPage<?> page, String contractName, String batchNo, IPage<Map<String, Object>> transferCandidates(IPage<?> page, String documentNo, String contractNo,
String contractName, String batchNo,
String generateStartDate, String generateEndDate, String settlementBillType, String generateStartDate, String generateEndDate, String settlementBillType,
String settlementType); String settlementType);
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceivablePayableDetailServiceImpl.java
+4 -1
View File
@@ -534,10 +534,13 @@ public class ReceivablePayableDetailServiceImpl
} }
@Override @Override
public IPage<Map<String, Object>> transferCandidates(IPage<?> page, String contractName, String batchNo, public IPage<Map<String, Object>> transferCandidates(IPage<?> page, String documentNo, String contractNo,
String contractName, String batchNo,
String generateStartDate, String generateEndDate, String settlementBillType, String generateStartDate, String generateEndDate, String settlementBillType,
String settlementType) { String settlementType) {
ReceivablePayableDetailVO query = new ReceivablePayableDetailVO(); ReceivablePayableDetailVO query = new ReceivablePayableDetailVO();
query.setDocumentNo(documentNo);
query.setContractNo(contractNo);
query.setContractName(contractName); query.setContractName(contractName);
query.setBatchNo(batchNo); query.setBatchNo(batchNo);
query.setSettlementStatus("pending"); query.setSettlementStatus("pending");