From e0a5ad7d60405322c7d67209e853fd9ce5011740 Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期四, 22 八月 2024 13:10:19 +0800 Subject: [PATCH] admin列设置应用 --- WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 93 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 91 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs index 71e5b47..83e42dc 100644 --- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs +++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs @@ -35,7 +35,7 @@ { 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) { + if (ds.Tables[0].Rows.Count != 0) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess锛�"; @@ -87,6 +87,7 @@ public bool IsHide; public string Alignment; public string ColumnWidth; + public string ColumnName_Other; } [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")] @@ -136,7 +137,95 @@ var width = omdelsub[i].ColumnWidth; if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0) width = "120"; - HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width},"; + + var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other; + + HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},"; + } + HGridString = HGridString.Substring(0, HGridString.Length - 1); + + oCN.RunProc("Delete from Xt_grdAlignment_WMES where HUserName='" + user + "' and HModName='" + HModName + "' "); + + string sql = "insert into Xt_grdAlignment_WMES (HUserName,HModName,HGridString,HFixCols" + + ",HFontSize,HHeadTextHeight,HTextHeight,HSortFlag,HSelTotal,HColumnWidth,HPageSize" + + ") values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) + + "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" + + ",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" + + "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + "," + ((omdelMian.HPageSize == null || omdelMian.HPageSize == "") ? "0" : omdelMian.HPageSize) + ")"; + + oCN.RunProc(sql); + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = null; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + #endregion + + #region 鏂伴殣钘忓垪璁剧疆(娣诲姞鍒楀悕淇濆瓨鎺у埗搴忓彿浣嶇疆) 娣诲姞/淇敼 + + [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMESNew")] + [HttpPost] + public object AddgrdAlignmentWMESNew([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + oCN.BeginTran(); + //淇濆瓨涓昏〃 + objJsonResult = AddBillMainNew(msg1); + if (objJsonResult.code == "0") + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = objJsonResult.Message; + objJsonResult.data = null; + return objJsonResult; + } + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + public json AddBillMainNew(string msg1) + { + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + string HModName = sArray[2].ToString(); + int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼 + string user = sArray[4].ToString(); + try + { + + + omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<grdAlignment>(msg2); + omdelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<grdAlignmentSub>>(msg3); + + var HGridString = ""; + for (int i = 0; i < omdelsub.Count; i++) + { + var width = omdelsub[i].ColumnWidth; + if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0) + width = "120"; + var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other; + HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},"; + } HGridString = HGridString.Substring(0, HGridString.Length - 1); -- Gitblit v1.9.1