fix: 修复审批通过提示显示金蝶内部id而非单据号
This commit is contained in:
+1
-1
@@ -212,7 +212,7 @@ public class FormalSettlementController extends BladeController {
|
||||
return R.data(Boolean.FALSE, "审批通过,但自动同步金蝶失败:" + syncFailure);
|
||||
}
|
||||
if (syncResult != null) {
|
||||
return R.success("审批通过,已同步金蝶:" + syncResult);
|
||||
return R.success("审批通过,单据号[" + syncResult + "]已同步金蝶");
|
||||
}
|
||||
return R.success("审批通过");
|
||||
}
|
||||
|
||||
+1
-1
@@ -142,7 +142,7 @@ public class InvoiceApplicationController extends BladeController {
|
||||
return R.data(Boolean.FALSE, "审批通过,但自动同步金蝶失败:" + syncFailure);
|
||||
}
|
||||
if (syncResult != null) {
|
||||
return R.success("审批通过,已同步金蝶:" + syncResult);
|
||||
return R.success("审批通过,单据号[" + syncResult + "]已同步金蝶");
|
||||
}
|
||||
return R.success("审批通过");
|
||||
}
|
||||
|
||||
+1
-1
@@ -126,7 +126,7 @@ public class PaymentApplicationController extends BladeController {
|
||||
return R.data(Boolean.FALSE, "审批通过,但自动同步金蝶失败:" + syncFailure);
|
||||
}
|
||||
if (syncResult != null) {
|
||||
return R.success("审批通过,已同步金蝶:" + syncResult);
|
||||
return R.success("审批通过,单据号[" + syncResult + "]已同步金蝶");
|
||||
}
|
||||
return R.success("审批通过");
|
||||
}
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ public class SettlementAdjustmentController extends BladeController {
|
||||
return R.data(Boolean.TRUE, "审批通过;" + hint);
|
||||
}
|
||||
if (Func.isNotBlank(syncResult)) {
|
||||
return R.success("审批通过,已同步金蝶:" + syncResult);
|
||||
return R.success("审批通过,单据号[" + syncResult + "]已同步金蝶");
|
||||
}
|
||||
return R.success("审批通过");
|
||||
}
|
||||
|
||||
+3
-3
@@ -150,9 +150,9 @@ public class KingdeeApprovalSyncListener {
|
||||
return;
|
||||
}
|
||||
log.info("付款申请[{}]审批通过自动同步金蝶开始", id);
|
||||
String kingdeeBillId = paymentApplicationService.syncKingdee(id);
|
||||
recordResult(kingdeeBillId);
|
||||
log.info("付款申请[{}]审批通过自动同步金蝶完成:kingdeeBillId={}", id, kingdeeBillId);
|
||||
String billNo = paymentApplicationService.syncKingdee(id);
|
||||
recordResult(billNo);
|
||||
log.info("付款申请[{}]审批通过自动同步金蝶完成:billNo={}", id, billNo);
|
||||
}
|
||||
|
||||
private void pushInvoiceApply(Long id) {
|
||||
|
||||
+6
-4
@@ -727,10 +727,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
|
||||
|| KingdeeBfiConstant.KINGDEE_STATUS_PAYING.equals(entity.getKingdeeStatus())
|
||||
|| KingdeeBfiConstant.KINGDEE_STATUS_PAID.equals(entity.getKingdeeStatus())
|
||||
|| KingdeeBfiConstant.KINGDEE_STATUS_CLOSED.equals(entity.getKingdeeStatus())) {
|
||||
// 存量数据金蝶单据id可能仍存于 kingdeeBillNo,兜底返回
|
||||
// 优先返回金蝶单据号供提示文案展示;存量数据金蝶单据id可能仍存于 kingdeeBillNo,编号缺失时兜底返回单据id
|
||||
String existBillId = Func.isNotEmpty(entity.getKingdeeBillId()) ? entity.getKingdeeBillId() : entity.getKingdeeBillNo();
|
||||
log.info("付款申请[{}]金蝶单据已生成(状态[{}]),跳过重复推送,返回单据id={}", entity.getPaymentNo(), entity.getKingdeeStatus(), existBillId);
|
||||
return existBillId;
|
||||
String existBillNo = Func.isBlank(entity.getKingdeeBillNo()) ? existBillId : entity.getKingdeeBillNo();
|
||||
log.info("付款申请[{}]金蝶单据已生成(状态[{}]),跳过重复推送,返回单据号={}", entity.getPaymentNo(), entity.getKingdeeStatus(), existBillNo);
|
||||
return existBillNo;
|
||||
}
|
||||
log.info("付款申请[{}]开始同步金蝶:paymentType={},申请金额={},kingdeeStatus={}",
|
||||
entity.getPaymentNo(), entity.getPaymentType(), entity.getAppliedAmount(), entity.getKingdeeStatus());
|
||||
@@ -791,7 +792,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl<PaymentApplic
|
||||
updateById(entity);
|
||||
log.info("付款申请[{}]同步金蝶完成:kingdeeStatus={},kingdeeBillId={},kingdeeBillNo={}",
|
||||
entity.getPaymentNo(), entity.getKingdeeStatus(), kingdeeBillId, entity.getKingdeeBillNo());
|
||||
return kingdeeBillId;
|
||||
// 返回金蝶单据号供审批提示/手动同步文案展示,金蝶未返回编号时回退星瀚单据id
|
||||
return Func.isBlank(entity.getKingdeeBillNo()) ? kingdeeBillId : entity.getKingdeeBillNo();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user