From 00567438dd8bd28c28acb8c5c5bf0ed2543f688c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期三, 12 七月 2023 08:47:52 +0800
Subject: [PATCH] 项目管理：审核优化
---
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index 02e2fa0..8f4ae94 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -27,7 +27,21 @@
{
try
{
+
ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and (HUserName='admin' or HUserName='Admin')", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0) {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -144,15 +158,57 @@
#endregion
+ #region 闅愯棌鍒楄缃� 鍒犻櫎
+ [Route("Xt_grdAlignment_WMES/DelgrdAlignmentWMES")]
+ [HttpGet]
+ public object DelgrdAlignmentWMES(string HModName, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'", "Xt_grdAlignment_WMES");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝や汉鏃犳ā鍧楁暟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ oCN.BeginTran();
+
+ oCN.RunProc("delete from Xt_grdAlignment_WMES where HModName='" + HModName + "' and HUserName='" + user + "'");
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鎸夐挳璁剧疆 鍒楄〃
[Route("Xt_ModuleButtonSet_WMES/moduleButtonSetWMESList")]
[HttpGet]
- public object moduleButtonSetWMESList(string HModName, string HBillType)
+ public object moduleButtonSetWMESList(string HModName, string HBillType, string HUserName)
{
try
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
objJsonResult.code = "1";
objJsonResult.count = ds.Tables[0].Rows.Count;
@@ -174,8 +230,19 @@
#region 鎸夐挳璁剧疆 娣诲姞/淇敼
public class moduleButtonSet
{
+ public string BtnID;
public string BtnName;
public bool IsHide;
+ }
+ public class noEditList
+ {
+ public string HBillType;
+ public string HModuleName;
+ public string HButtonID;
+ public string HButtonName;
+ public int HOrder;
+ public bool HHideFlag;
+ public bool HEditFlag;
}
[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -213,6 +280,8 @@
string HOrderList = sArray[3].ToString();
string HModuleName = sArray[4].ToString();
string HBillType = sArray[5].ToString();
+ string NoEditList = sArray[6].ToString();
+ string HUserName = sArray[7].ToString();
try
{
@@ -220,21 +289,52 @@
List<string> HButtonIDLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(HButtonIDList);
List<string> HButtonNameLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<string>>(HButtonNameList);
List<int> HOrderLists = Newtonsoft.Json.JsonConvert.DeserializeObject<List<int>>(HOrderList);
+ List<noEditList> noEditLists= Newtonsoft.Json.JsonConvert.DeserializeObject<List<noEditList>>(NoEditList);
- oCN.RunProc("delete from Xt_ModuleButtonSet where HModuleName= '" + HModuleName + "' and HBillType='" + HBillType + "'");
+ //鎻掑叆鍙紪杈戞寜閽殑淇℃伅璁板綍
+ oCN.RunProc("delete from Xt_ModuleButtonSet where HModuleName= '" + HModuleName + "' and HBillType='" + HBillType + "' and HUserName= '" + HUserName + "'");
for (int i = 0; i < button.Count; i++)
{
- int HHideFlag = 0;
- int HEditFlag = 1;
- string HButtonID = HButtonIDLists[i].ToString();
- string HButtonName = HButtonNameLists[i].ToString();
- int HOrder = HOrderLists[i];
- if (button[i].IsHide)
+ for(int j = 0; j < HButtonIDLists.Count; j++)
{
- HHideFlag = 1;
+ if (button[i].BtnID == HButtonIDLists[j])
+ {
+ int HHideFlag = 0;
+ int HEditFlag = 1;
+ string HButtonID = HButtonIDLists[j].ToString();
+ string HButtonName = HButtonNameLists[j].ToString();
+ int HOrder = HOrderLists[j];
+ if (button[i].IsHide)
+ {
+ HHideFlag = 1;
+ }
+ if(button[i].BtnID== "HideButton") //鐢ㄦ埛杩涜绗竴娆¤缃椂锛岃缃� 鎸夐挳璁剧疆 鎸夐挳涓轰笉鍙紪杈戜笖涓嶉殣钘�
+ {
+ HEditFlag = 0;
+ HHideFlag = 0;
+ }
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ oCN.RunProc(sql);
+ }
}
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag;
- oCN.RunProc(sql);
+ }
+
+ //閲嶆柊鎻掑叆涓嶅彲缂栬緫鎸夐挳鐨勪俊鎭褰�
+ for (int i = 0; i < noEditLists.Count; i++)
+ {
+ for (int j = 0; j < HButtonIDLists.Count; j++)
+ {
+ if (noEditLists[i].HButtonID == HButtonIDLists[j])
+ {
+ int HHideFlag = noEditLists[i].HHideFlag?1:0;
+ int HEditFlag = 0;
+ string HButtonID = noEditLists[i].HButtonID;
+ string HButtonName = noEditLists[i].HButtonName;
+ int HOrder = HOrderLists[j];
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ oCN.RunProc(sql);
+ }
+ }
}
objJsonResult.code = "1";
--
Gitblit v1.9.1