From 0b8fe1800ff22f33f44079ab17fae70dc7f853ad Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期一, 03 六月 2024 14:54:16 +0800 Subject: [PATCH] 工序流转卡 工艺路线 工序过站控制 --- WebAPI/Controllers/BLL/Xt_SystemParameterController.cs | 129 ++++++++++++++++++++++++++---------------- 1 files changed, 79 insertions(+), 50 deletions(-) diff --git a/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs b/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs index 1a32e5b..68ed2e3 100644 --- a/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs +++ b/WebAPI/Controllers/BLL/Xt_SystemParameterController.cs @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json.Linq; +锘縰sing Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; @@ -29,6 +30,7 @@ { try { + List<object> columnNameList = new List<object>(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Xt_SystemParameterList " + sWhere+ " order by hitemid desc", "h_v_Xt_SystemParameterList"); @@ -40,12 +42,21 @@ ds = oCN.RunProcReturn(sql, "h_v_IF_Proh_v_Xt_SystemParameterListpertyList"); } + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + //if (ds.Tables[0].Rows.Count != 0 || ds != null) //{ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess锛�"; objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; return objJsonResult; //} //else @@ -67,68 +78,86 @@ } } - - /// <summary> - /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳 - ///鍙傛暟锛歴tring sql銆� - ///杩斿洖鍊硷細object銆� - /// </summary> - [Route("Xt_SystemParameter/AddBill1")] + #region 绯荤粺鍙傛暟鏌ヨ 缂栬緫 + [Route("Xt_SystemParameter/Edit")] [HttpPost] - public object AddBill1([FromBody] JObject oMain) + public object Xt_SystemParameterEdit([FromBody] JObject msg) { + DataSet ds; + var _value = msg["msg"].ToString(); + string msg3 = _value.ToString(); + string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg1 = sArray[0].ToString(); + string msg2 = sArray[1].ToString(); + //string msg_HUSEORGID = sArray[2].ToString(); + Int64 HItemID = 0; + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + + ListModels oListModels = new ListModels(); try { - var _value = oMain["oMain"].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 = sArray[2].ToString(); - string msg5 = sArray[3].ToString(); - //鍙嶅簭鍒楀寲 - msg2 = "[" + msg2.ToString() + "]"; - List<SystemParameter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SystemParameter>>(msg2); - - long HItemID = int.Parse(msg3); - string HModClass = list[0].HModClass; - string Hkey = list[0].HKey; - string HCaption = list[0].HCaption; - string HValue = list[0].Hvalue; - string HReadonly = list[0].HReadonly; - string HExplanation = list[0].HExplanation; - string HFarmat = list[0].HFarmat; - - - - //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� - oCN.BeginTran(); - //涓昏〃 - oCN.RunProc("Update Xt_BillType set " + - ",HValue= '" + HValue + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); - //淇敼瀛愰」鐩唬鐮� - //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); - //灏嗕笂绾� 涓洪潪鏈骇 - // - oCN.Commit(); - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�"; - //objJsonResult.data = null; - return objJsonResult; + DAL.ClsXt_SystemParameter_Ctl oBill = new DAL.ClsXt_SystemParameter_Ctl(); + List<Model.ClsXt_SystemParameter_Model> lsmain = new List<Model.ClsXt_SystemParameter_Model>(); + msg1 = msg1.Replace("\\", ""); + msg1 = msg1.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_Xt_SystemParameter(msg1); + IList list = lsmain; + //淇濆瓨 + oBill.oModel = lsmain[0]; + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (oBill.oModel.HInterID == 0) + { + oBill.oModel.HInterID = DBUtility.ClsPub.CreateBillID("8003", ref DBUtility.ClsPub.sExeReturnInfo); + //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅 + while (true) + { + ds = oCN.RunProcReturn("select * from Xt_SystemParameter where HInterID = " + oBill.oModel.HInterID, "Xt_SystemParameter"); + if (ds != null && ds.Tables[0].Rows.Count > 0) + { + oBill.oModel.HInterID = DBUtility.ClsPub.CreateBillID("8003", ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + break; + } + } + bResult = oBill.AddNew(); + } + else + { + bResult = oBill.ModifyByID(oBill.oModel.HInterID); + } + if (bResult) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); + objJsonResult.data = 1; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = 1; + return objJsonResult; + } } catch (Exception e) { - oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "Exception锛�" + e.Message; - objJsonResult.data = null; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; return objJsonResult; } } + #endregion - // + } } \ No newline at end of file -- Gitblit v1.9.1