aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: TMS系统 - 月结账单销账/现金账单销账 - 逻辑调整' (#316) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/316
This commit is contained in:
heyu 2026-02-07 16:41:48 +08:00
commit 3562709ea3
1 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -480,9 +480,27 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
&& !"7".equals(emisSettlePayRecord.getPayType())) {
throw new EmisBizError(EmisBizErrorType.FAIL, "业务账单未确认，不允许收款！");
}
}
}
// 校验账单对应的运单是否在销账申请表中，且中心审核状态为未审核
checkWriteoffApplyStatus(settleBillNo);
// 校验运单是否已登记业务销账申请且中心审核状态为未审核
// 优先按运单维度校验；若未传运单明细，则使用原“账单->子账单->运单”的兜底逻辑，避免误放行
List<EmisSettlePayRel> payRelListForCheck = emisSettlePayRecord.getPayRelList();
if (!CollectionUtils.isEmpty(payRelListForCheck)) {
List<String> waybillNos = payRelListForCheck.stream()
.map(EmisSettlePayRel::getBillNo)
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList());
for (String waybillNo : waybillNos) {
checkWriteoffApplyStatusByBillCode(waybillNo);
}
} else {
for (int i = 0; i < settleBillNoArr.size(); i++) {
String settleBillNo = settleBillNoArr.get(i);
if (!StringUtils.isEmpty(settleBillNo)) {
checkWriteoffApplyStatus(settleBillNo);
}
}
}
@ -640,33 +658,47 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
// 根据运单号查询销账申请明细
for (String billCode : billCodeList) {
EmisWriteoffApplyDetail queryDetail = new EmisWriteoffApplyDetail();
queryDetail.setBillCode(billCode);
List<EmisWriteoffApplyDetail> detailList = emisWriteoffApplyDetailMapper.selectEmisWriteoffApplyDetailList(queryDetail);
checkWriteoffApplyStatusByBillCode(billCode);
}
}
if (CollectionUtils.isEmpty(detailList)) {
continue;
}
/**
* 校验运单是否在销账申请表中，且中心审核状态为未审核
*
* @param billCode 运单号
* @throws EmisBizError 如果存在未审核的销账申请，则抛出异常
*/
private void checkWriteoffApplyStatusByBillCode(String billCode) throws EmisBizError {
if (StringUtils.isBlank(billCode)) {
return;
}
// 获取所有申请ID，去重
List<Long> applyIds = detailList.stream()
.map(EmisWriteoffApplyDetail::getApplyId)
.filter(id -> id != null)
.distinct()
.collect(Collectors.toList());
EmisWriteoffApplyDetail queryDetail = new EmisWriteoffApplyDetail();
queryDetail.setBillCode(billCode);
List<EmisWriteoffApplyDetail> detailList = emisWriteoffApplyDetailMapper.selectEmisWriteoffApplyDetailList(queryDetail);
if (CollectionUtils.isEmpty(applyIds)) {
continue;
}
if (CollectionUtils.isEmpty(detailList)) {
return;
}
// 查询销账申请，检查中心审核状态
for (Long applyId : applyIds) {
EmisWriteoffApply writeoffApply = emisWriteoffApplyMapper.selectEmisWriteoffApplyById(applyId);
if (writeoffApply != null
&& WriteoffApplyStatus.CENTER_PENDING.statusCode.equals(writeoffApply.getBlCenterConfirmed())) {
throw new EmisBizError(EmisBizErrorType.FAIL,
billCode + "已经登记业务销账申请，请先处理再销账");
}
// 获取所有申请ID，去重
List<Long> applyIds = detailList.stream()
.map(EmisWriteoffApplyDetail::getApplyId)
.filter(id -> id != null)
.distinct()
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(applyIds)) {
return;
}
// 查询销账申请，检查中心审核状态
for (Long applyId : applyIds) {
EmisWriteoffApply writeoffApply = emisWriteoffApplyMapper.selectEmisWriteoffApplyById(applyId);
if (writeoffApply != null
&& WriteoffApplyStatus.CENTER_PENDING.statusCode.equals(writeoffApply.getBlCenterConfirmed())) {
throw new EmisBizError(EmisBizErrorType.FAIL,
billCode + "已经登记业务销账申请，请先处理再销账");
}
}
}