From 633a573ec886a2e2411480163f91091cf2b28cd0 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 09:31:17 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Controllers/Xt_DefineBillMainSetController.cs | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
index d31d5d7..bf9bf71 100644
--- a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
+++ b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
@@ -149,6 +149,10 @@
ls = oListModels.getObjectByJson_Xt_DefineBillMainSetSub(msg3);
foreach (Model.ClsXt_DefineBillMainSetSub oItemSub in ls)
{
+ if ((oItemSub.HElementID == null || oItemSub.HElementID == "")&&oItemSub.HElementIDAdditionalName!="")
+ {
+ oItemSub.HElementID = oItemSub.HElementIDAdditionalName;
+ }
oBill.DetailColl.Add(oItemSub);
}
--
Gitblit v1.9.1