From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index eb29396..3981534 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -471,7 +471,7 @@
//搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘鍏ュ簱鍗� 鍏宠仈鏁伴噺
oCN.RunProc("exec h_p_Cg_UpDateRelation_POStockInToPayable_Del " + HInterID);
- //搴斾粯鍗� 鍒犻櫎 鎾ら攢 搴斾粯鍗� 鍏宠仈鏁伴噺
+ //搴斾粯鍗� 鍒犻櫎 鎾ら攢 閲囪喘璁㈠崟 鍏宠仈鏁伴噺
oCN.RunProc("exec h_p_Cg_UpDateRelation_POOrderToPayable_Del " + HInterID);
oCN.RunProc("delete from Cg_PayableBillMain where HInterID = " + HInterID);
--
Gitblit v1.9.1