From 10b796a5803da79b10a06516f7ae7d651df383d6 Mon Sep 17 00:00:00 2001
From: "tanfengling@x-ri.com" <123456>
Date: Thu, 30 Oct 2025 15:40:21 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B3=9B=E5=BE=AE=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81=E3=80=91=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FWBillStateUpdController.java  | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lc123/cloud/app/api/controller/FWBillStateUpdController.java b/lc123/cloud/app/api/controller/FWBillStateUpdController.java
index 17fbd9a..dc4764a 100644
--- a/lc123/cloud/app/api/controller/FWBillStateUpdController.java
+++ b/lc123/cloud/app/api/controller/FWBillStateUpdController.java
@@ -50,6 +50,7 @@ public class FWBillStateUpdController {
         approveLog.set("enable", "1");
 
         //校验单据标识是否正确
+        DynamicObject bill = null;
         QFilter f1 = new QFilter("number", "=", KDBillType);
         DynamicObject[] bos_entityobjects = BusinessDataServiceHelper.load("bos_entityobject", "id,name,number,modeltype", new QFilter[]{f1});
         if(bos_entityobjects == null && bos_entityobjects.length == 0){
@@ -66,22 +67,12 @@ public class FWBillStateUpdController {
             if("pm_xspurorderbill".equals(enetityNumber) || "conm_xpurcontract".equals(enetityNumber)){
                 billNoFieldName = "changebillno";
             }
+            approveLog.set("tqq9_entityname", enetityName);
             //查询对应的安居
             QFilter qf1 = new QFilter(billNoFieldName, "=", KDBillNumber);
             DynamicObject[] billArr = BusinessDataServiceHelper.load(enetityNumber, "id,tqq9_issuccess", new QFilter[]{qf1});
             if(billArr != null && billArr.length > 0){
-                DynamicObject bill = BusinessDataServiceHelper.loadSingle(billArr[0].getPkValue(), enetityNumber);
-                if(state == 0){
-                    bill.set("tqq9_issuccess", true);
-                    bill.set("tqq9_fwstate", "C");
-                    approveLog.set("tqq9_issuccess", true);
-                }else{
-                    bill.set("tqq9_fwstate", "D");
-                }
-                SaveServiceHelper.save(new DynamicObject[]{bill});
-
-                approveLog.set("tqq9_entityname", enetityName);
-                OperationServiceHelper.executeOperate("save", "tqq9_fwapprovelog", new DynamicObject[]{approveLog}, OperateOption.create());
+                bill = BusinessDataServiceHelper.loadSingle(billArr[0].getPkValue(), enetityNumber);
                 if(state == 0){
                     OperationResult submitResult = OperationServiceHelper.executeOperate("audit", enetityNumber, new DynamicObject[]{bill}, OperateOption.create());
                     if(!submitResult.isSuccess()){
@@ -111,6 +102,17 @@ public class FWBillStateUpdController {
             resultExt.setFailCount(1);
             resultExt.setSuccessCount(0);
         }else{
+            if(state == 0){
+                bill.set("tqq9_issuccess", true);
+                bill.set("tqq9_fwstate", "C");
+                approveLog.set("tqq9_issuccess", true);
+            }else{
+                bill.set("tqq9_fwstate", "D");
+            }
+            SaveServiceHelper.save(new DynamicObject[]{bill});
+            //保存日志
+            OperationServiceHelper.executeOperate("save", "tqq9_fwapprovelog", new DynamicObject[]{approveLog}, OperateOption.create());
+
             resultExt.setFailCount(0);
             resultExt.setSuccessCount(1);
         }