From cdef70a598cd8a4b96f3ffb4e878bd9b3868226d Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Fri, 25 Jul 2025 14:19:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E8=B4=A6=E5=8D=95=E7=9A=84=E4=B8=8B?=
 =?UTF-8?q?=E6=8E=A8=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fi/plugin/operate/ClearAccountBillOperation.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearAccountBillOperation.java b/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearAccountBillOperation.java
index d583cbf..0b8b39f 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearAccountBillOperation.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/operate/ClearAccountBillOperation.java
@@ -372,6 +372,8 @@ public class ClearAccountBillOperation extends AbstractOperationServicePlugIn im
                 if (!QueryServiceHelper.exists(entityName, qFilter.toArray())) {
                     //新增一个清账明细单
                     detailinfo = newDetailBill(prinfo, userinfo);
+                    //更新清账单下推明细单结果-已下推
+                    DB.update(DBRoute.of("fi"), updatePushStatus, new Object[]{"A", prinfo.getPkValue()});
                     //发送清账明细单的OA待办
                     JhzjUtils.handleOA(detailinfo, "0", "0");
                     receivers.clear();
@@ -379,8 +381,7 @@ public class ClearAccountBillOperation extends AbstractOperationServicePlugIn im
                     String pcurl = JhzjUtils.getBillPCURL(detailinfo);
                     JhzjUtils.sendEmail("请登录资金系统操作清账明细单", detailinfo.getString("billno") +
                             "<br> 详情页面 <a href='"+pcurl+"' target='_blank'>"+pcurl+"</a>", receivers, detailinfo);
-                    //更新清账单下推明细单结果
-                    DB.update(DBRoute.of("fi"), updatePushStatus, new Object[]{"A", prinfo.getPkValue()});
+
                 }
             }else{
                 //根据客户、公司、是否可用找到对应的被通知人员（可能多个）
@@ -389,7 +390,7 @@ public class ClearAccountBillOperation extends AbstractOperationServicePlugIn im
                 qFilter.and("shjh_org", QCP.equals, prinfo.getDynamicObject("org").getLong("id"));
                 pzbs = BusinessDataServiceHelper.load(pzbName, "id", qFilter.toArray(), "modifytime desc");
                 if (pzbs.length == 0) {
-                    //更新清账单下推明细单结果
+                    //更新清账单下推明细单结果-未下推
                     DB.update(DBRoute.of("fi"), updatePushStatus, new Object[]{"B", prinfo.getPkValue()});
                     if(!"save".equals(eok)){
                         addErrorInfo(prinfo,"根据结构性清账客户映射表未找到对应通知人，无法下推清账明细单");
@@ -406,6 +407,8 @@ public class ClearAccountBillOperation extends AbstractOperationServicePlugIn im
                     if (!QueryServiceHelper.exists(entityName, qFilter.toArray())) {
                         //新增一个清账明细单
                         detailinfo = newDetailBill(prinfo, userinfo);
+                        //更新清账单下推明细单结果-已下推
+                        DB.update(DBRoute.of("fi"), updatePushStatus, new Object[]{"A", prinfo.getPkValue()});
                         //发送清账明细单的OA待办
                         JhzjUtils.handleOA(detailinfo, "0", "0");
                         receivers.clear();
@@ -413,8 +416,7 @@ public class ClearAccountBillOperation extends AbstractOperationServicePlugIn im
                         String pcurl = JhzjUtils.getBillPCURL(detailinfo);
                         JhzjUtils.sendEmail("请登录资金系统操作清账明细单", detailinfo.getString("billno") +
                                 "<br> 详情页面 <a href='"+pcurl+"' target='_blank'>"+pcurl+"</a>", receivers, detailinfo);
-                        //更新清账单下推明细单结果
-                        DB.update(DBRoute.of("fi"), updatePushStatus, new Object[]{"A", prinfo.getPkValue()});
+
                     }
                 }
             }