From 777db38816776abbe4b864d26a6c0381b75e8f9d Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 10 二月 2022 16:59:23 +0800
Subject: [PATCH] 修改页码及排序
---
WebAPI/Controllers/LMESController.cs | 72 ++++++++++++++++++++++++++++--------
1 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 828d0e7..db1a74f 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -54,13 +54,23 @@
/// </summary>
[Route("LEMS/MES_Sc_ProcessExchangeBillQuery_Json")]
[HttpGet]
- public object MES_Sc_ProcessExchangeBillList_Json(string sWhere)
+ public object MES_Sc_ProcessExchangeBillList_Json(string sWhere,string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere, "h_v_Sc_ProcessExchangeBillQuery");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillQuery where 1 = 1 " + sWhere+ " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillQuery");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -180,6 +190,9 @@
return GetObjectJson(ds);
}
+ #region 宸ヨ壓璺嚎
+
+ #region 宸ヨ壓璺嚎鍒楄〃
/// <summary>
/// 杩斿洖宸ヨ壓璺嚎鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -187,20 +200,30 @@
/// </summary>
[Route("LEMS/MES_Gy_RoutingBillList_Json")]
[HttpGet]
- public object MES_Gy_RoutingBillList_Json(string sWhere)
+ public object MES_Gy_RoutingBillList_Json(string sWhere,string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ //if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList ", "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList order by hmainid desc", "h_v_Gy_RoutingBillList");
}
else
{
string sql1 = "select * from h_v_Gy_RoutingBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
}
}
@@ -214,27 +237,31 @@
}
return GetObjectJson(ds);
}
+
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鍒犻櫎
/// <summary>
/// 宸ヨ壓璺嚎鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("LEMS/DeltetGy_RoutingBillSub")]
[HttpGet]
- public object DeltetGy_RoutingBillSub(Int64 lngBillKey)
+ public object DeltetGy_RoutingBillSub(Int64 lngBillKey,string user)
{
DataSet ds;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
+ string ModRightNameCheck = "Gy_RoutingBill_Drop";
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (lngBillKey == 0)
@@ -292,6 +319,9 @@
return objJsonResult;
}
}
+ #endregion
+
+ #endregion
/// <summary>
/// 杩斿洖鐢熶骇浠诲姟鍗曞垪琛�
@@ -300,11 +330,21 @@
/// </summary>
[Route("LEMS/MES_IF_ICMOBillList_Json")]
[HttpGet]
- public object MES_IF_ICMOBillList_Json(string sWhere)
+ public object MES_IF_ICMOBillList_Json(string sWhere,string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1 = 1 " + sWhere + " order by hmainid desc", "h_v_IF_ICMOBillList");
}
catch (Exception e)
--
Gitblit v1.9.1