From d03656c5be5357c07deebc5858e6f8d4bd661706 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 26 一月 2022 16:25:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
index 50fb796..c16870c 100644
--- a/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
+++ b/WebAPI/Controllers/GZGL/Gy_WorkTypeBillController.cs
@@ -29,10 +29,19 @@
/// </summary>
[Route("Gy_WorkTypeBill/GetWorkTypelist")]
[HttpGet]
- public object GetWorkTypelist(string sWhere)
+ public object GetWorkTypelist(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkType", 1, 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_Gy_WorkTypeList " + sWhere, "h_v_Gy_WorkTypeList");
@@ -79,8 +88,17 @@
/// </summary>
[Route("Gy_WorkTypeBill/Delete_Json")]
[HttpGet]
- public object Delete_Json(string HInterID)
+ public object Delete_Json(string HInterID,string user)
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_WorkType_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鐢╥d鏌ュ埌璇ュ璞�
string sql = "select * from Gy_WorkType where HItemID = "+HInterID;
ds = oCN.RunProcReturn(sql, "Gy_WorkType");
@@ -161,11 +179,22 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
ListModels oListModels = new ListModels();
try
{
+ if (!DBUtility.ClsPub.Security_Log(msg4, 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsGy_WorkTypeBill oBill = new DLL.ClsGy_WorkTypeBill();
List<Model.ClsGy_WorkType_Model> lsmain = new List<Model.ClsGy_WorkType_Model>();
msg2 = msg2.Replace("\\", "");
--
Gitblit v1.9.1