From 47b45a4ac3284936515a2edd3e50265de30993a0 Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期三, 04 六月 2025 14:50:23 +0800 Subject: [PATCH] 合并冲突 --- WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs index f1a2477..4fc4425 100644 --- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs @@ -2964,6 +2964,17 @@ objJsonResult.data = null; return objJsonResult; } + + ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain"); + if (ds.Tables[0].Rows.Count > 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍒犻櫎澶辫触锛佸崟鎹凡瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo)) { oCN.BeginTran(); -- Gitblit v1.9.1