From bc0a4b9012ec32efa15842c6ed029ee022818d0f Mon Sep 17 00:00:00 2001
From: jingh <jingh@LAPTOP-I53VDLOO>
Date: 星期日, 23 一月 2022 11:01:47 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/LMESController.cs | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 96979c8..9728f1a 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -60,27 +60,32 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere, "h_v_Sc_ProcessExchangeBillQuery");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery", "h_v_Sc_ProcessExchangeBillQuery");
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
- string sql1 = "select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillQuery");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
-
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
- return GetObjectJson(ds);
}
/// <summary>
@@ -175,6 +180,9 @@
return GetObjectJson(ds);
}
+ #region 宸ヨ壓璺嚎
+
+ #region 宸ヨ壓璺嚎鍒楄〃
/// <summary>
/// 杩斿洖宸ヨ壓璺嚎鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -209,6 +217,10 @@
}
return GetObjectJson(ds);
}
+
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鍒犻櫎
/// <summary>
/// 宸ヨ壓璺嚎鍒犻櫎鍔熻兘
/// </summary>
@@ -222,7 +234,7 @@
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
@@ -241,7 +253,7 @@
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_RoutingBillSub where HInterID=" + lngBillKey, "Gy_RoutingBillSub");
+ ds = oCN.RunProcReturn("select * from Gy_RoutingBillmain where HInterID=" + lngBillKey, "Gy_RoutingBillmain");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -250,12 +262,21 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
- //if (HChecker != " ")
+ string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //if (hdeleteman != "")
//{
// objJsonResult.code = "0";
// objJsonResult.count = 0;
- // objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ // objJsonResult.Message = "鍗曟嵁宸茬粡浣滃簾,涓嶈兘鍒犻櫎锛�";
// objJsonResult.data = null;
// return objJsonResult;
//}
@@ -278,6 +299,9 @@
return objJsonResult;
}
}
+ #endregion
+
+ #endregion
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曞垪琛�
--
Gitblit v1.9.1