From 4c623e752a4b550cedee406d8c19baad74127494 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 26 十月 2021 09:59:36 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index a27164f..c7f92e8 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -28,7 +28,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -135,7 +135,7 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -238,7 +238,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapInBill_Delete", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -319,12 +319,12 @@
[Route("Sc_MouldScrapInBill/get_Display")]
[HttpGet]
- public object get_Display(string sWhere,string user)
+ public object get_Display(string sWhere,string user, string Organization)
{
try
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBillList", 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldScrapRequestBillList", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -333,7 +333,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldScrapInHouseBill(sWhere);
+ ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -361,16 +361,16 @@
}
}
- public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
}
--
Gitblit v1.9.1