From f01d500ed3e60d96b0fa998089a2cd7aa2069f2f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 19 一月 2024 17:28:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index c46c1ae..6cca359 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -9071,11 +9071,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("Select HItemID,HNumber 浠ｇ爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 Order by HItemID ", "Gy_QCCheckItem");
+ ds = oCN.RunProcReturn("Select HItemID,HNumber 浠ｇ爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒�,HDefaultResult 榛樿缁撹 from Gy_QCCheckItem where HStopflag=0 Order by HItemID ", "Gy_QCCheckItem");
}
else
{
- string sql = "Select HItemID,HNumber 浠ｇ爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID ";
+ string sql = "Select HItemID,HNumber 浠ｇ爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒�,HDefaultResult 榛樿缁撹 from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID ";
ds = oCN.RunProcReturn(sql, "Gy_QCCheckItem");
}
if (ds == null || ds.Tables[0].Rows.Count <= 0)
--
Gitblit v1.9.1