From 5af3b351a0b6f462d44d2cbdd8accd7807521410 Mon Sep 17 00:00:00 2001 From: zhangzhiguo <421587375@qq.com> Date: Thu, 23 Oct 2025 11:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=90=88=E5=90=8C=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=86=B2=E9=94=80=E5=8D=95=E5=8F=8D=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E7=94=9F=E6=88=90=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E5=90=88=E5=90=8C=E5=86=B2=E9=94=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OutContractSettleUnauditCheckOp.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettleUnauditCheckOp.java b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettleUnauditCheckOp.java index 5df747c..efaffbb 100644 --- a/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettleUnauditCheckOp.java +++ b/code/zcdev/zcgj-zcdev-zcdev-pr/src/main/java/zcgj/zcdev/zcdev/pr/plugin/operate/OutContractSettleUnauditCheckOp.java @@ -10,6 +10,7 @@ import kd.bos.entity.validate.AbstractValidator; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; +import kd.bos.servicehelper.operation.DeleteServiceHelper; import java.math.BigDecimal; @@ -52,14 +53,24 @@ public class OutContractSettleUnauditCheckOp extends AbstractOperationServicePlu } } - DynamicObject[] load = BusinessDataServiceHelper.load("zcgj_ec_out_finaceconfirm", "id,zcgj_ec_out_contractid", new QFilter[]{new QFilter("zcgj_ec_out_contractid", QCP.equals, billId)}); + DynamicObject[] load = BusinessDataServiceHelper.load("zcgj_ec_out_finaceconfirm", "id,zcgj_ec_out_contractid,billstatus", new QFilter[]{new QFilter("zcgj_ec_out_contractid", QCP.equals, billId)}); if (load != null && load.length > 0) { - if(isReversabillid){ - this.addFatalErrorMessage(extendedDataEntity, "支出合同结算冲销单【"+billno+"】存在支出合同确认单，请删除支出合同确认单后再进行反审核操作。"); - }else{ - this.addFatalErrorMessage(extendedDataEntity, "支出合同结算单【"+billno+"】存在支出合同确认单，请删除支出合同确认单后再进行反审核操作。"); + for (DynamicObject dynamicObject : load) { + String billstatus = dynamicObject.getString("billstatus"); + if("C".equals(billstatus) || "B".equals(billstatus)) { + if(isReversabillid){ + this.addFatalErrorMessage(extendedDataEntity, "支出合同结算冲销单【"+billno+"】存在支出合同确认单，请删除支出合同确认单后再进行反审核操作。"); + }else{ + this.addFatalErrorMessage(extendedDataEntity, "支出合同结算单【"+billno+"】存在支出合同确认单，请删除支出合同确认单后再进行反审核操作。"); + } + return; + }else{ + QFilter idFilter = new QFilter("id", "=", dynamicObject.getLong("id")); + QFilter statusFilter = new QFilter("billstatus", "=", "A"); + DeleteServiceHelper.delete("zcgj_ec_out_finaceconfirm", new QFilter[]{idFilter.and(statusFilter)}); + } } - return; + } } }