From 175b53e6f0adb40a0d861981f56f120615d55897 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 13 十一月 2024 14:52:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
index a7aa3ac..e56f844 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldLifeUseBillController.cs
@@ -27,6 +27,18 @@
{
try
{
+
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeUseBill_Query", 3, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Sc_MouldLifeUseBillList order by HMainID asc", "h_v_Sc_MouldLifeUseBillList");
@@ -533,33 +545,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