From 2e0421bc2278345b45d5b041fff4cce3d6146a46 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 17 六月 2024 17:13:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
index a7aa3ac..546c3bd 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
@@ -533,33 +533,33 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Sc_MouldLifeUseReport/list")]
+ [Route("Sc_MouldLifeUseReport/GetSc_MouldLifeUseReport")]
[HttpGet]
- public object GetSc_MouldLifeUseReport(string sWhere, string user, string userid)
+ public object GetSc_MouldLifeUseReport(string sWhere, string user)
{
try
{
List<object> columnNameList = new List<object>();
////鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseReport_Query", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseReport_Query", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鏌ヨ
if (sWhere == null || sWhere.Equals(""))
{
- string sql = "exec h_p_Sc_MouldLifeUseReport '','" + userid + "'";
+ string sql = "exec h_p_Sc_MouldLifeUseReport ''";
ds = oCN.RunProcReturn(sql, "h_p_Sc_MouldLifeUseReport");
}
else
{
- string sql = "exec h_p_Sc_MouldLifeUseReport '" + sWhere + "','" + userid + "'";
+ string sql = "exec h_p_Sc_MouldLifeUseReport '" + sWhere + "'";
ds = oCN.RunProcReturn(sql, "h_p_Sc_MouldLifeUseReport");
}
--
Gitblit v1.9.1