From 7e3c795134fce3544a938928c1b43e6aca49609c Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 21 六月 2022 02:49:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index ce6c01c..ee5f95b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -27,36 +27,36 @@
/// </summary>
[Route("Gy_Unit/list1")]
[HttpGet]
- public object list(string sWhere,string Organization)
+ public object list(string sWhere,string user,string Organization)
{
try
{
- string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' and 缁勭粐鍚嶇О='" + Organization + "'");
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_UnitList");
- }
- else
- {
- string sql = sql1 + sWhere + "order by HItemID desc";
- ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_UnitGroup", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+
+ string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' and 缁勭粐鍚嶇О='" + Organization + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ", "h_v_Gy_UnitList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
}
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -106,12 +106,13 @@
{
DataSet ds;
var _value = msg["msg"].ToString();
- string msg1 = _value.ToString();
- //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- //string msg2 = sArray[0].ToString();
- //string msg3 = sArray[1].ToString();
+ string msg4 = _value.ToString();
+ string[] sArray = msg4.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
Int64 HItemID = 0;
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
//鑾峰彇鏈�澶D鍊艰祴鍊�
DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Unit ", "Gy_Unit");
if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
@@ -124,6 +125,16 @@
ListModels oListModels = new ListModels();
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_UnitGroup_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsGy_Unit_Ctl oBill = new DAL.ClsGy_Unit_Ctl();
List<Model.ClsGy_Unit_Model> lsmain = new List<Model.ClsGy_Unit_Model>();
msg1 = msg1.Replace("\\", "");
@@ -305,21 +316,21 @@
/// <returns></returns>
[Route("DeltetGy_Unit")]
[HttpGet]
- public object DeltetGy_Unit(string HItemID)
+ public object DeltetGy_Unit(string HItemID,string user)
{
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
//鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_UnitGroup_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
--
Gitblit v1.9.1