From 2c0202d516f5d3a97895b5c4c32688b21f471d66 Mon Sep 17 00:00:00 2001
From: yuxueliang0813 <407010292@qq.com>
Date: Wed, 2 Jul 2025 16:01:01 +0800
Subject: [PATCH] =?UTF-8?q?sap=E7=94=9F=E6=88=90=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8D=95=E7=9A=84=E7=BB=84=E7=BB=87=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fi/fi/plugin/task/QuerySapCreatePayApplyTask.java      | 5 +++++
 .../shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java  | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java b/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java
index 29aeeba..337e0fa 100644
--- a/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java
+++ b/main/java/shjh/jhzj7/fi/fi/plugin/task/QuerySapCreatePayApplyTask.java
@@ -166,6 +166,11 @@ public class QuerySapCreatePayApplyTask extends AbstractTask {
             // 公司编号 bukrs
             QFilter Q1 = new QFilter("number", QCP.equals, bukrs);
             DynamicObject org = BusinessDataServiceHelper.loadSingle(orgEntName, new QFilter[]{Q1});
+            if(org == null){
+                logger.error("同步失败,凭证号:" + fkBillNum + "的公司未在金蝶找到对应公司");
+                JhzjUtils.saveLog(fkBillNum, apimenthod, it_list.toJSONString(), "同步失败,SAP的公司未在金蝶找到对应公司", false, "API");
+                continue;
+            }
 
             // 申请金额 , 汇率 , 申请金额折结算币别
             BigDecimal amount = BigDecimal.ZERO;
diff --git a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java
index 574eb7a..d10a7e2 100644
--- a/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java
+++ b/main/java/shjh/jhzj7/fi/fi/webapi/ApplyAdjustBillControler.java
@@ -499,8 +499,11 @@ public class ApplyAdjustBillControler {
             handleError("同步失败,调整单号:" + fkBillNum + "的费控单据已锁定", fkBillNum, null);
             return "同步失败,调整单号:" + fkBillNum + "的费控单据已锁定";
         }
-        DynamicObject org = BusinessDataServiceHelper.loadSingle("bos_org", "id", new QFilter("number", "=", orgNum).toArray());
-
+        DynamicObject org = BusinessDataServiceHelper.loadSingle("bos_org", new QFilter("number", "=", orgNum).toArray());
+        if (org == null) {
+            handleError("同步失败,调整单号:" + fkBillNum + "的公司未在金蝶找到对应公司", fkBillNum, null);
+            return "同步失败,调整单号:" + fkBillNum + "的公司未在金蝶找到对应公司";
+        }
         // 设置组织信息
         ap_payapply.set("settleorg", org);
         ap_payapply.set("applyorg", org);