zhangzhiguo
/
zhongcaiguoji
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
xiaoshi 2025-06-18 17:57:03 +08:00
parent 29a6e46c76 89a3b836fd
commit 6ee4e48246
2 changed files with 145 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentApplyFundOpExt.java
View File

@ -53,11 +53,17 @@ public class PaymentApplyFundOpExt extends AbstractOperationServicePlugIn {
} }
public void onAddValidators(AddValidatorsEventArgs e) { public void onAddValidators(AddValidatorsEventArgs e) {
e.getValidators().removeIf(validator -> validator instanceof PaymentTypeValidator);
e.getValidators().removeIf(validator -> validator instanceof PaymentPlanValidator);
e.getValidators().removeIf(validator -> validator instanceof PaymentMaxAmountValidator);
e.getValidators().removeIf(validator -> validator instanceof PaymentProgressValidator);
e.getValidators().removeIf(validator -> validator instanceof PaymentDeductionValidator);
e.getValidators().removeIf(validator -> validator instanceof PaymentReferenceValidator);
// e.getValidators().add(new PaymentTypeValidator()); // e.getValidators().add(new PaymentTypeValidator());
// e.getValidators().add(new PaymentPlanValidator()); // e.getValidators().add(new PaymentPlanValidator());
// e.getValidators().add(new PaymentMaxAmountValidator()); // e.getValidators().add(new PaymentMaxAmountValidator());
// e.getValidators().add(new PaymentProgressValidator()); // e.getValidators().add(new PaymentProgressValidator());
e.getValidators().add(new PaymentDeductionValidator()); // e.getValidators().add(new PaymentDeductionValidator());
// e.getValidators().add(new PaymentReferenceValidator()); // e.getValidators().add(new PaymentReferenceValidator());
} }

152
code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/PaymentRegisterFundOpExt.java
View File

@ -35,73 +35,35 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp {
DynamicObject[] dataEntities = e.getDataEntities(); DynamicObject[] dataEntities = e.getDataEntities();
switch (operationKey) { switch (operationKey) {
case "audit": case "audit":
int a = 0;
for (DynamicObject data : dataEntities) {
for (DynamicObject entry : data.getDynamicObjectCollection("entryentity")) { //付款登记单 付款信息分录
DynamicObject contract = entry.getDynamicObject("contract");//付款登记单关联 合同
if (contract != null) {
//合同付款申请
a++;
break;
}
}
if (a > 0) {
//合同付申请
log.info("执行PaymentRegisterFundOpExt的审核操作，开始更新合同，付款类型实付金额"); log.info("执行PaymentRegisterFundOpExt的审核操作，开始更新合同，付款类型实付金额");
this.updateContTypeAmtTotalRealAmt(data); this.updateContTypeAmtTotalRealAmt(dataEntities);
log.info("执行PaymentRegisterFundOpExt的审核操作，完成更新合同，付款类型实付金额"); log.info("执行PaymentRegisterFundOpExt的审核操作，完成更新合同，付款类型实付金额");
log.info("执行PaymentRegisterFundOpExt的审核操作，开始更新请款单实付金额"); log.info("执行PaymentRegisterFundOpExt的审核操作，开始更新请款单实付金额");
this.updateInApplyRealPayAmt(data, true); this.updateInApplyRealPayAmt(dataEntities, true);
log.info("执行PaymentRegisterFundOpExt的审核操作，完成更新请款单实付金额"); log.info("执行PaymentRegisterFundOpExt的审核操作，完成更新请款单实付金额");
break; break;
} else {
//非合同付款申请
log.info("执行PaymentRegisterFundOpExt的审核操作，开始更新无合同请款单实付金额");
this.updateInApplyRealPayAmtExt(data, true);
log.info("执行PaymentRegisterFundOpExt的审核操作，完成更新无合同请款单实付金额");
}
}
case "unaudit": case "unaudit":
int b = 0;
for (DynamicObject data : dataEntities) {
for (DynamicObject entry : data.getDynamicObjectCollection("entryentity")) { //付款登记单 付款信息分录
DynamicObject contract = entry.getDynamicObject("contract");//付款登记单关联 合同
if (contract != null) {
//合同付款申请
b++;
break;
}
}
if (b > 0) {
//合同付款申请
log.info("执行PaymentRegisterFundOpExt的反审核操作，开始更新合同，付款类型实付金额"); log.info("执行PaymentRegisterFundOpExt的反审核操作，开始更新合同，付款类型实付金额");
this.updateContTypeAmtTotalRealAmtWhenUnAudit(data); this.updateContTypeAmtTotalRealAmtWhenUnAudit(dataEntities);
log.info("执行PaymentRegisterFundOpExt的反审核操作，完成更新合同，付款类型实付金额"); log.info("执行PaymentRegisterFundOpExt的反审核操作，完成更新合同，付款类型实付金额");
log.info("执行PaymentRegisterFundOpExt的反审核操作，开始更新请款单实付金额"); log.info("执行PaymentRegisterFundOpExt的反审核操作，开始更新请款单实付金额");
this.updateInApplyRealPayAmt(data, false); this.updateInApplyRealPayAmt(dataEntities, false);
log.info("执行PaymentRegisterFundOpExt的反审核操作，完成更新请款单实付金额"); log.info("执行PaymentRegisterFundOpExt的反审核操作，完成更新请款单实付金额");
break;
} else {
//非合同付款申请
log.info("执行PaymentRegisterFundOpExt的反审核操作，开始更新无合同请款单实付金额");
this.updateInApplyRealPayAmtExt(data, false);
log.info("执行PaymentRegisterFundOpExt的反审核操作，完成更新无合同请款单实付金额");
}
}
} }
} }
protected void updateInApplyRealPayAmt(DynamicObject data, boolean isAudit) { @Override
protected void updateInApplyRealPayAmt(DynamicObject[] dataEntities, boolean isAudit) {
// super.updateInApplyRealPayAmt(dataEntities, isAudit); // super.updateInApplyRealPayAmt(dataEntities, isAudit);
BigDecimal ratio = BigDecimal.ONE; BigDecimal ratio = BigDecimal.ONE;
if (!isAudit) { if (!isAudit) {
ratio = BigDecimal.ZERO.subtract(ratio); ratio = BigDecimal.ZERO.subtract(ratio);
} }
// for (DynamicObject object : dataEntities) { for(DynamicObject object : dataEntities) {
Long referregisterid = data.getLong("referregisterid");//关联登记单id(付款处理单Id) Long referregisterid = object.getLong("referregisterid");//关联登记单id(付款处理单Id)
QFilter paybillFilter = new QFilter("id", "=", referregisterid); QFilter paybillFilter = new QFilter("id", "=", referregisterid);
//付款处理单 //付款处理单
DynamicObject paybill = BusinessDataServiceHelper.loadSingle("cas_paybill", "entry,entry.e_corebillentryseq", new QFilter[]{paybillFilter}); DynamicObject paybill = BusinessDataServiceHelper.loadSingle("cas_paybill", "entry,entry.e_corebillentryseq", new QFilter[]{paybillFilter});
@ -113,7 +75,7 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp {
log.info("执行PaymentRegisterFundOpExt：付款处理单涉及核心单据行号："+corebillentryseq); log.info("执行PaymentRegisterFundOpExt：付款处理单涉及核心单据行号："+corebillentryseq);
} }
} }
for (DynamicObject entry : data.getDynamicObjectCollection("entryentity")) { //付款登记单 付款信息 for(DynamicObject entry : object.getDynamicObjectCollection("entryentity")) { //付款登记单 付款信息
DynamicObject paymentApplyF7 = entry.getDynamicObject("paymentapply");//付款登记单关联 付款申请单 DynamicObject paymentApplyF7 = entry.getDynamicObject("paymentapply");//付款登记单关联 付款申请单
DynamicObject contract = entry.getDynamicObject("contract");//付款登记单关联 合同 DynamicObject contract = entry.getDynamicObject("contract");//付款登记单关联 合同
BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount"); //付款登记单 本次实付金额 BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount"); //付款登记单 本次实付金额
@ -171,91 +133,14 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp {
SaveServiceHelper.save(new DynamicObject[]{paymentApply}); SaveServiceHelper.save(new DynamicObject[]{paymentApply});
} }
} }
// }
}
protected void updateInApplyRealPayAmtExt(DynamicObject data, boolean isAudit) {
BigDecimal ratio = BigDecimal.ONE;
if (!isAudit) {
//反审核操作时，减去付款金额
ratio = BigDecimal.ZERO.subtract(ratio);
}
Long referRegisterId = data.getLong("referregisterid");//关联登记单id(付款处理单Id)
QFilter payBillFilter = new QFilter("id", "=", referRegisterId);
DynamicObject payBill = BusinessDataServiceHelper.loadSingle("cas_paybill",
"entry,entry.e_corebillentryseq", new QFilter[]{payBillFilter});//付款处理单
Set<Integer> payBillSer = new HashSet<>();
if (payBill != null) {
DynamicObjectCollection entryCollection = payBill.getDynamicObjectCollection("entry");//付款处理单 付款明细分录
for (DynamicObject entry : entryCollection) {
int coreBillEntrySeq = entry.getInt("e_corebillentryseq");//付款处理单 核心单据行号
payBillSer.add(coreBillEntrySeq);
log.info("执行PaymentRegisterFundOpExt：付款处理单涉及核心单据行号：" + coreBillEntrySeq);
} }
} }
DynamicObjectCollection entryEntityCollection = data.getDynamicObjectCollection("entryentity");//付款登记单 付款信息分录 @Override
for (DynamicObject entry : entryEntityCollection) { protected void updateContTypeAmtTotalRealAmt(DynamicObject[] dataEntities) {
DynamicObject paymentApplyF7 = entry.getDynamicObject("paymentapply");//付款登记单 付款申请单号
BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount"); //付款登记单 本次实付金额
thisOfTaxAmt = thisOfTaxAmt.multiply(ratio);
String payType = entry.getString("paytype"); //付款登记单 支付类型
if (paymentApplyF7 != null) {
QFilter paymentApplyFilter = new QFilter("id", "=", paymentApplyF7.getLong("id"));
DynamicObject paymentApply = BusinessDataServiceHelper.loadSingle("ec_paymentapply",
"realpayamt,billcompletepay,ismulticurrency,exchangerate,stdrealpayamt," +
"entryentity,entryentity.seq,contract,paymenttype,applyoftaxamount,thisrealpayamt,thiswaitpayamt,completepay",
new QFilter[]{paymentApplyFilter});//付款申请单
DynamicObjectCollection paymentEntryCol = paymentApply.getDynamicObjectCollection("entryentity");//付款申请单 付款信息分录
boolean billCompletePay = true;//付款申请单 表头付款完成
for (DynamicObject paymentEntry : paymentEntryCol) {
String applyPayType = paymentEntry.getString("paymenttype");//付款申请单 支付类型
int seq = paymentEntry.getInt("seq"); //付款申请单分录行号
if (StringUtils.equals(payType, applyPayType) && payBillSer.contains(seq)) {
log.info("执行PaymentRegisterFundOpExt：付款申请单分录行号和付款处理单核心单据分录行号匹配成功");
BigDecimal oldRealPayAmt = paymentEntry.getBigDecimal("thisrealpayamt");//付款申请单 本次实付金额
BigDecimal applyOfTaxAmount = paymentEntry.getBigDecimal("applyoftaxamount");//付款申请单 本次应付金额⑭
BigDecimal thisRealPayAmt = oldRealPayAmt.add(thisOfTaxAmt);
BigDecimal thisWaitPayAmt = applyOfTaxAmount.subtract(thisRealPayAmt);
paymentEntry.set("thisrealpayamt", thisRealPayAmt);//付款申请单 本次实付金额
paymentEntry.set("thiswaitpayamt", thisWaitPayAmt);//付款申请单 本次应付金额⑭
if (thisRealPayAmt.compareTo(applyOfTaxAmount) >= 0) {
paymentEntry.set("completepay", true);//付款申请单 分录付款完成
} else {
paymentEntry.set("completepay", false);//付款申请单 分录付款完成
}
}
}
BigDecimal totalRealpayAmt = BigDecimal.ZERO;
for (DynamicObject inComeEntry : paymentEntryCol) {
if (!inComeEntry.getBoolean("completepay")) {//付款申请单 分录付款完成
billCompletePay = false;//付款申请单 表头付款完成
}
totalRealpayAmt = totalRealpayAmt.add(inComeEntry.getBigDecimal("thisrealpayamt"));//付款申请单 本次实付金额
}
if (paymentApply.getBoolean("ismulticurrency")) {//付款申请单 是否多币种
BigDecimal exchangeRate = paymentApply.getBigDecimal("exchangerate");//付款申请单 汇率
BigDecimal stdRealPayAmt = totalRealpayAmt.multiply(exchangeRate);
paymentApply.set("stdrealpayamt", stdRealPayAmt);//付款申请单 实际付款金额（本位币）
}
paymentApply.set("realpayamt", totalRealpayAmt);//付款申请单 本次实付金额
paymentApply.set("billcompletepay", billCompletePay);//付款申请单 表头付款完成
SaveServiceHelper.save(new DynamicObject[]{paymentApply});//保存付款申请单反写数据
}
}
}
protected void updateContTypeAmtTotalRealAmt(DynamicObject data) {
//super.updateContTypeAmtTotalRealAmt(dataEntities); //super.updateContTypeAmtTotalRealAmt(dataEntities);
// for (DynamicObject object : dataEntities) { for(DynamicObject object : dataEntities) {
for (DynamicObject entry : data.getDynamicObjectCollection("entryentity")) { for(DynamicObject entry : object.getDynamicObjectCollection("entryentity")) {
DynamicObject contract = entry.getDynamicObject("contract"); DynamicObject contract = entry.getDynamicObject("contract");
if(contract!=null){ if(contract!=null){
BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount"); BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount");
@ -292,13 +177,14 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp {
} }
} }
} }
// } }
} }
protected void updateContTypeAmtTotalRealAmtWhenUnAudit(DynamicObject data) { @Override
protected void updateContTypeAmtTotalRealAmtWhenUnAudit(DynamicObject[] dataEntities) {
//super.updateContTypeAmtTotalRealAmtWhenUnAudit(dataEntities); //super.updateContTypeAmtTotalRealAmtWhenUnAudit(dataEntities);
// for (DynamicObject object : dataEntities) { for(DynamicObject object : dataEntities) {
for (DynamicObject entry : data.getDynamicObjectCollection("entryentity")) { for(DynamicObject entry : object.getDynamicObjectCollection("entryentity")) {
DynamicObject contract = entry.getDynamicObject("contract"); DynamicObject contract = entry.getDynamicObject("contract");
if(contract!=null){ if(contract!=null){
BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount"); BigDecimal thisOfTaxAmt = entry.getBigDecimal("thispaymentoftaxamount");
@ -327,7 +213,7 @@ public class PaymentRegisterFundOpExt extends PaymentRegisterFundOp {
SaveServiceHelper.save(contTypeAmts); SaveServiceHelper.save(contTypeAmts);
} }
} }
// } }
} }
} }
} }