From 6d85c65004990ac29f58ad233eba3a795c2f818b Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 20 一月 2026 10:48:08 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index b6db605..2272bb3 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -265,8 +265,9 @@
}
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
+ LogService.Write(1);
List<Models.ClsGy_EquipFileType> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileType>>(msg2);
-
+ LogService.Write(1);
long HItemID = int.Parse(msg3);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -288,7 +289,7 @@
}
DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileType Where HStopflag=0 and HNumber='" + HItemID + "' and HItemID<>" + HNumber, "Gy_EquipFileType", ref Pub_Class.ClsPub.sExeReturnInfo);
- if (DS.Tables[0].Rows.Count != 0)
+ if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -345,6 +346,7 @@
}
catch (Exception e)
{
+ LogService.Write(e);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1