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/BaseSet/Gy_BadReasonController.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index c9a3aa8..86a0289 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -305,7 +305,7 @@
return objJsonResult;
}
- var ds = oCN.RunProcReturn("select * from Gy_BadReason where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadReason");
+ var ds = oCN.RunProcReturn("select * from Gy_BadReason with(nolock) where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadReason");
if (ds.Tables[0].Rows.Count > 0)
{
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
--
Gitblit v1.9.1