From 07c3408a0a2295917c0d0a34b319ea8e83801047 Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 01 十二月 2022 15:47:33 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 570 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 551 insertions(+), 19 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs index 6cc7d53..15f0284 100644 --- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs +++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs @@ -1,4 +1,5 @@ -锘縰sing Newtonsoft.Json.Linq; +锘縰sing Newtonsoft.Json; +using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; @@ -25,20 +26,67 @@ /// </summary> [Route("Gy_Department/list")] [HttpGet] - public object list(string sWhere) + public object list(string sWhere, string user, string Organization) { try { + List<object> columnNameList = new List<object>(); + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄�"; + objJsonResult.data = null; + return objJsonResult; + } + string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'"); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList"); + ds = oCN.RunProcReturn(sql1 + sWhere + "order by 閮ㄩ棬浠g爜", "h_v_IF_DepartmentList"); } else { - string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 "; - string sql = sql1 + sWhere; + string sql = sql1 + sWhere + "order by 閮ㄩ棬浠g爜 "; ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList"); } + + //娣诲姞鍒楀悕 + 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鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + /// <summary> + /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/cx")] + [HttpGet] + public object cx(long HInterID) + { + try + { + ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentListDetail where HitemID = " + HInterID, "h_v_IF_DepartmentListDetail"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -67,34 +115,448 @@ } /// <summary> - /// 閮ㄩ棬鍒楄〃鍒犻櫎鎸夐挳 - ///鍙傛暟锛歴tring sql銆� - ///杩斿洖鍊硷細object銆� + /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘 /// </summary> - [Route("Gy_Department/Delete_Json")] + /// <returns></returns> + [Route("DeltetGy_Department")] [HttpGet] - public object Delete_Json(string HNumber,string HName) + public object DeltetGy_Department(string HItemID, string user) { + DataSet ds; + DataSet ds1; try { - ds = oCN.RunProcReturn("delete from Gy_Department where HNmber = " + HNumber + " and HName = " + HName , "Gy_Department"); - + //鍒犻櫎鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Gy_Department_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)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HItemID涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.BeginTran();//寮�濮嬩簨鍔� + ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "false锛�"; + objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department Where HParentID='" + HItemID + "'", "Gy_Department"); + if (ds1.Tables[0].Rows.Count != 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒"; objJsonResult.data = null; return objJsonResult; } - else + string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]); + if (HUseFlag == "宸蹭娇鐢�") { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒"; + objJsonResult.data = null; return objJsonResult; } + //v + //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]); + //if (HStopflag) + //{ + // oCN.RollBack();//鍥炴粴浜嬪姟 + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + oCN.RunProc("delete from Gy_Department where HItemID=" + HItemID); + oCN.Commit();//鎻愪氦浜嬪姟 + objJsonResult.code = "0"; + 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; + } + } + + //[Route("Gy_Department/LoadTree")] + //[HttpGet] + //public object LoadTree_Json() + //{ + // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName); + //} + + + /// <summary> + /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/JY_Json")] + [HttpGet] + public object JY_Json(long HItemID) + { + try + { + ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "绂佺敤鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/FJY_Json")] + [HttpGet] + public object FJY_Json(long HItemID) + { + try + { + ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/AddBill")] + [HttpPost] + public object AddBill([FromBody] JObject oMain) + { + try + { + var _value = oMain["oMain"].ToString(); + string msg1 = _value.ToString(); + //鍙嶅簭鍒楀寲 + msg1 = "[" + msg1.ToString() + "]"; + + DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl(); + DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View(); + + + + List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1); + + long HItemID = list[0].HItemID; + string HNumber = list[0].HNumber; + string HName = list[0].HName; + string HShortNumber = list[0].HShortNumber; + string HRemark = list[0].HRemark; + string HUseFlag = list[0].HUseFlag; + long HParentID = list[0].HParentID; + string HBarCode = list[0].HBarCode; + string HHelpCode = list[0].HHelpCode; + long HSecManagerID = list[0].HSecManagerID; + string HCreator = list[0].HCreator; + long HCreateOrgID = list[0].HCreateOrgID; + //DateTime HCreateDate = list[0].HCreateDate; + long HUseOrgID = list[0].HUseOrgID; + string HUpdater = list[0].HUpDater; + //DateTime HUpdateDate = list[0].HUpDateDate; + string HChecker = list[0].HChecker; + //DateTime HCheckDate = list[0].HCheckDate; + string HDeleteMan = list[0].HDeleteMan; + //DateTime HDeleteDate = list[0].HDeleteDate; + + + if (!DBUtility.ClsPub.AllowNumber(HNumber)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒"; + objJsonResult.data = null; + return objJsonResult; + } + + + + //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙� + oCN.BeginTran(); + //涓昏〃 + oCN.RunProc("Insert Into Gy_Department " + + "(HNumber,HShortNumber,HName,HParentID" + + ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" + + ",HCREATEORGID,HUSEORGID" + + ") " + + " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" + + ",'',0,'" + HRemark + "',0,''" + + "," + HCreateOrgID + "," + HUseOrgID + "" + + ") "); + //淇敼涓婄骇涓洪潪鏈骇浠g爜 + oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + //objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; + } + } + + + /// <summary> + /// 淇濆瓨鎸夐挳 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/AddBill1")] + [HttpPost] + public object AddBill1([FromBody] JObject oMain) + { + + try + { + DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl(); + DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View(); + + 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 msg4 = sArray[2].ToString(); + //string msg5 = sArray[3].ToString(); + + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲 + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); + msg2 = "[" + msg2.ToString() + "]"; + List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2); + + long HItemID = list[0].HItemID; + string HNumber = list[0].HNumber; + string HName = list[0].HName; + string HShortNumber = list[0].HShortNumber; + string HRemark = list[0].HRemark; + string HUseFlag = list[0].HUseFlag; + long HParentID = list[0].HParentID; + string HBarCode = list[0].HBarCode; + string HHelpCode = list[0].HHelpCode; + string HUpDater = list[0].HUpDater; + long HEmpID = list[0].HEmpID; + bool HStopflag = list[0].HStopflag; + long HSecManagerID = list[0].HSecManagerID; + //string HCreator = list[0].HCreator; + long HCreateOrgID = list[0].HCreateOrgID; + //DateTime HCreateDate = list[0].HCreateDate; + long HUseOrgID = long.Parse(msg4); + string HUpdater = list[0].HUpDater; + //DateTime HUpdateDate = list[0].HUpDateDate; + string HChecker = list[0].HChecker; + //DateTime HCheckDate = list[0].HCheckDate; + string HDeleteMan = list[0].HDeleteMan; + //DateTime HDeleteDate = list[0].HDeleteDate; + long HLevel = 1; + bool HEndFlag = true; + long HEntityID = 1; + + //鍒ゆ柇鏉冮檺 + //if (!ClsPub.Security_Log(msg5, 1, false, msg4)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + + //if (!DBUtility.ClsPub.AllowNumber(HNumber)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "浠g爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + //if (oDept.HavSameNumber(HItemID, HNumber)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "浠g爜閲嶅锛�"; + // objJsonResult.data = null; + // return objJsonResult; + //} + + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + if (HItemID == 0) + { + //鏂板 + oCN.BeginTran(); + oCN.RunProc("Insert into Gy_Department " + + " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + + ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " + + " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() + + "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" + + "," + HEntityID.ToString() + "," + HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼涓婄骇涓洪潪鏈骇浠g爜 + oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + oCN.Commit(); + } + else + { + oCN.BeginTran(); + //涓昏〃 + oCN.RunProc("Update Gy_Department set " + + " HNumber='" + HNumber + "'" + + ",HName='" + HName + "'" + + ",HHelpCode='" + HHelpCode + "'" + + ",HShortNumber='" + HShortNumber + "'" + + ",HParentID=" + HParentID + + ",HEmpID=" + HEmpID.ToString() + + ",HStopflag=" + Convert.ToString(HStopflag ? 1 : 0) + + //",HUpdater='" + HUpdater + "'" + + //",HUpdateDate= getdate()" + + ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); + //淇敼瀛愰」鐩唬鐮� + //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); + //灏嗕笂绾� 涓洪潪鏈骇 + oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); + oCN.Commit(); + } + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); + objJsonResult.data = 1; + return objJsonResult; + } + catch (Exception e) + { + //oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 鑾峰彇鏈�澶у熀纭�璧勬枡ID + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/GetMAXBillID")] + [HttpGet] + public object GetMAXBillID() + { + try + { + ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Department", "Gy_Department"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = ""; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + /// <summary> + /// 閮ㄩ棬鍒楄〃淇敼鎸夐挳鏂规硶 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Gy_Department/xg")] + [HttpGet] + public object xg(long HInterID) + { + try + { + ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HInterID, "Gy_Department"); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = ""; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; } catch (Exception e) { @@ -108,6 +570,76 @@ - // + [Route("Gy_Department/LoadTree")] + [HttpGet] + public object LoadTree_Json(string sWhere) + { + SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN(); + //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList"); + ds = oCN.RunProcReturn("select * from h_v_DepartmentLoadTree", "h_v_DepartmentLoadTree"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "false锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + } + + [Route("Gy_Department/SaveGy_DepartmentListApi")] + [HttpPost] + public object SaveGy_DepartmentListApi([FromBody] JObject oMain) + { + try + { + var model = oMain["model"].ToString(); + //鍙嶅簭鍒楀寲 + model = "[" + model + "]"; + List<Department> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(model); + string sql = string.Empty; + oCN.BeginTran(); + sql = $"delete Gy_Department where HItemID = {lsmain[0].HItemID}"; + oCN.RunProc(sql); + sql = "set identity_insert Gy_Department on"; + oCN.RunProc(sql); + //涓昏〃 + oCN.RunProc("Insert Into Gy_Department " + + "(HItemID,HNumber,HShortNumber,HName,HParentID" + + ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" + + ",HCREATEORGID,HUSEORGID"+ + ") " + + " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HName + "',0" + + ",'',0,'" + lsmain[0].HRemark + "',0,''" + + "," + lsmain[0].HCreateOrgID + "," + lsmain[0].HUseOrgID + "" + + ") "); + sql = "set identity_insert Gy_Department off"; + oCN.RunProc(sql); + oCN.Commit(); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + //objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.Message; + objJsonResult.data = null; + return objJsonResult; + } + } + } } \ No newline at end of file -- Gitblit v1.9.1