From 56239876629dcb4d8b0a7e2aaed5ce38fe01fe39 Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期二, 26 十月 2021 10:05:21 +0800 Subject: [PATCH] nothing --- WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs | 369 +++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 259 insertions(+), 110 deletions(-) diff --git a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs index 55563f8..c7c581e 100644 --- a/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs +++ b/WebAPI/Controllers/BaseSet/Xt_DataDictionary_TableController.cs @@ -19,42 +19,33 @@ /// <summary> - /// 杩斿洖鍒楄〃 + /// 杩斿洖閮ㄩ棬鍒楄〃 ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> [Route("Xt_DataDictionary_Table/list")] [HttpGet] - public object list(string sWhere) + public object list(string sWhere,string Organization) { try { + 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_DataDictionary_Table where 1=1 ", "h_v_IF_DataDictionary_Table"); + ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList"); } else { - string sql1 = "select * from h_v_IF_DataDictionary_Table where 1=1 "; - string sql = sql1 + sWhere; - ds = oCN.RunProcReturn(sql, "h_v_IF_DataDictionary_Table"); + string sql = sql1 + sWhere + "order by HItemID desc"; + ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList"); } - 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; - } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } catch (Exception e) { @@ -65,19 +56,20 @@ return objJsonResult; } } + /// <summary> /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍 ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Xt_DataDictionary_Table/cx")] + [Route("Gy_Department/cx")] [HttpGet] public object cx(long HInterID) { try { - ds = oCN.RunProcReturn("select * from h_v_IF_DataDictionary_TableDetail where HitemID = " + HInterID, "h_v_IF_DataDictionary_TableDetail"); + 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"; @@ -106,12 +98,12 @@ } /// <summary> - /// 鍒犻櫎鍔熻兘 + /// 閮ㄩ棬鍒楄〃鍒犻櫎鍔熻兘 /// </summary> /// <returns></returns> - [Route("DeltetXt_DataDictionary_Table")] + [Route("DeltetGy_Department")] [HttpGet] - public object DeltetXt_DataDictionary_Table(string HItemID) + public object DeltetGy_Department(string HItemID) { DataSet ds; DataSet ds1; @@ -137,7 +129,7 @@ return objJsonResult; } oCN.BeginTran();//寮�濮嬩簨鍔� - ds = oCN.RunProcReturn("select * from Xt_DataDictionary_Table where HItemID=" + HItemID, "Xt_DataDictionary_Table"); + ds = oCN.RunProcReturn("select * from Gy_Department where HItemID=" + HItemID, "Gy_Department"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -146,7 +138,7 @@ objJsonResult.data = null; return objJsonResult; ; } - ds1 = oCN.RunProcReturn("Select HItemID from Xt_DataDictionary_Table Where HParentID='" + HItemID + "'", "Xt_DataDictionary_Table"); + ds1 = oCN.RunProcReturn("Select HItemID from Gy_Department Where HParentID='" + HItemID + "'", "Gy_Department"); if (ds1.Tables[0].Rows.Count != 0) { objJsonResult.code = "0"; @@ -155,9 +147,28 @@ objJsonResult.data = null; return objJsonResult; } - - - oCN.RunProc("delete from Xt_DataDictionary_Table where HItemID=" + HItemID); + string HUseFlag = Convert.ToString(ds.Tables[0].Rows[0]["HUseFlag"]); + if (HUseFlag == "宸蹭娇鐢�") + { + 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; @@ -176,20 +187,26 @@ } } - + //[Route("Gy_Department/LoadTree")] + //[HttpGet] + //public object LoadTree_Json() + //{ + // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName); + //} + /// <summary> - /// 绂佺敤鎸夐挳 + /// 閮ㄩ棬鍒楄〃绂佺敤鎸夐挳 ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Xt_DataDictionary_Table/JY_Json")] + [Route("Gy_Department/JY_Json")] [HttpGet] public object JY_Json(long HItemID) { try { - ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 1 where HItemID = " + HItemID, "Xt_DataDictionary_Table"); + ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 1 where HItemID = " + HItemID, "Gy_Department"); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -208,17 +225,17 @@ } /// <summary> - /// 鍙嶇鐢ㄦ寜閽� + /// 閮ㄩ棬鍒楄〃鍙嶇鐢ㄦ寜閽� ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Xt_DataDictionary_Table/FJY_Json")] + [Route("Gy_Department/FJY_Json")] [HttpGet] public object FJY_Json(long HItemID) { try { - ds = oCN.RunProcReturn("update Xt_DataDictionary_Table set HStopFlag = 0 where HItemID = " + HItemID, "Xt_DataDictionary_Table"); + ds = oCN.RunProcReturn("update Gy_Department set HStopFlag = 0 where HItemID = " + HItemID, "Gy_Department"); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -241,7 +258,7 @@ ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Xt_DataDictionary_Table/AddBill")] + [Route("Gy_Department/AddBill")] [HttpPost] public object AddBill([FromBody] JObject oMain) { @@ -252,49 +269,69 @@ //鍙嶅簭鍒楀寲 msg1 = "[" + msg1.ToString() + "]"; - //DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl(); - //DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View(); + DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl(); + DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View(); - List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg1); + List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1); long HItemID = list[0].HItemID; - long HModNameID = list[0].HModNameID; - long HBillTypeID = list[0].HBillTypeID; - string HTableName = list[0].HTableName; - string HTableCaption = list[0].HTableCaption; - string HFieldName = list[0].HFieldName; - string HFieldCaption = list[0].HFieldCaption; - string HDataType = list[0].HDataType; - string HDefaultValue = list[0].HDefaultValue; + string HNumber = list[0].HNumber; + string HName = list[0].HName; + string HShortNumber = list[0].HShortNumber; string HRemark = list[0].HRemark; - bool HStopflag = list[0].HStopflag; - DateTime HMakeTime = list[0].HMakeTime; - string HMakeEmp = list[0].HMakeEmp; - DateTime HModifyTime = list[0].HModifyTime; - string HModifyEmp = list[0].HModifyEmp; + 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 Xt_DataDictionary_Table " + - "(HModNameID,HBillTypeID,HTableName,HTableCaption" + - ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" + - ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" + - ",HModifyEmp" + + oCN.RunProc("Insert Into Gy_Department " + + "(HNumber,HShortNumber,HName,HParentID" + + ",HLevel,HEndFlag,HRemark,HStopFlag,HUseFlag" + + ",HCREATEORGID,HUSEORGID,HBarCode,HCreator" + + ",HUpdater,HChecker,HDeleteMan" + + ",HSecManagerID,HCreateDate" + ") " + - " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HTableName + "'"+ - ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" + - ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" + - ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" + + " values('" + HNumber + "','" + HShortNumber + "','" + HName + "',0" + + ",'',0,'" + HRemark + "',0,''" + + "," + HCreateOrgID + "," + HUseOrgID + ",'" + HBarCode + "','" + HCreator + "'" + + ",'" + HUpdater + "','" + HChecker + "','" + HDeleteMan + "'" + + "," + HSecManagerID + ", getdate()" + ") "); //淇敼涓婄骇涓洪潪鏈骇浠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 = null; - objJsonResult.data = null; + objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; + //objJsonResult.data = null; return objJsonResult; } catch (Exception e) @@ -314,15 +351,15 @@ ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� /// </summary> - [Route("Xt_DataDictionary_Table/AddBill1")] + [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(); + 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(); @@ -333,23 +370,63 @@ //string msg5 = sArray[3].ToString(); //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; - List<Xt_DataDictionary_Table> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Xt_DataDictionary_Table>>(msg2); + List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2); long HItemID = list[0].HItemID; - long HModNameID = list[0].HModNameID; - long HBillTypeID = list[0].HBillTypeID; - string HTableName = list[0].HTableName; - string HTableCaption = list[0].HTableCaption; - string HFieldName = list[0].HFieldName; - string HFieldCaption = list[0].HFieldCaption; - string HDataType = list[0].HDataType; - string HDefaultValue = list[0].HDefaultValue; + 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; - DateTime HMakeTime = list[0].HMakeTime; - string HMakeEmp = list[0].HMakeEmp; - DateTime HModifyTime = list[0].HModifyTime; - string HModifyEmp = list[0].HModifyEmp; + 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; + long HLevel = 1; + bool HEndFlag = true; + long HEntityID = 1; + + //鍒ゆ柇鏉冮檺 + //if (!ClsPub.Security_Log(msg5, 1, true, 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; + //} //淇濆瓨 //淇濆瓨瀹屾瘯鍚庡鐞� @@ -357,39 +434,27 @@ { //鏂板 oCN.BeginTran(); - oCN.RunProc("Insert Into Xt_DataDictionary_Table " + - "(HModNameID,HBillTypeID,HTableName,HTableCaption" + - ",HFieldName,HFieldCaption,HDataType,HDefaultValue,HRemark" + - ",HStopflag,HMakeTime,HMakeEmp,HModifyTime" + - ",HModifyEmp" + - ") " + " values(" + HModNameID + "," + HBillTypeID + "," + HBillTypeID + ",'" + HTableName + "'" + - ",'" + HTableCaption + "','" + HFieldName + "','" + HFieldCaption + "','" + HDataType + "'" + - ",'" + HDefaultValue + "','" + HRemark + "'," + Convert.ToString(HStopflag ? 1 : 0) + "" + - ",'" + HMakeTime + "','" + HMakeEmp + "','" + HModifyTime + "','" + HModifyEmp + "'" + - ") ", ref DBUtility.ClsPub.sExeReturnInfo); + 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 Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); + oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); } else { oCN.BeginTran(); //涓昏〃 - oCN.RunProc("Update Xt_DataDictionary_Table set " + - " HModNameID= "+ HModNameID + - " HBillTypeID= " + HBillTypeID + - " HBillTypeID= " + HBillTypeID + - ",HTableName='" + HTableName + "'" + - ",HTableCaption='" + HTableCaption + "'" + - ",HFieldName='" + HFieldName + "'" + - ",HDataType='" + HDataType + "'" + - ",HFieldName='" + HFieldName + "'" + - ",HFieldCaption='" + HFieldCaption + "'" + - ",HRemark='" + HRemark + "'" + - ",HMakeTime='" + HMakeTime + "'" + - ",HMakeEmp='" + HMakeEmp + "'" + - ",HModifyTime='" + HModifyTime + "'" + - ",HModifyEmp='" + HModifyEmp + "'" + + 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()" + @@ -397,7 +462,7 @@ //淇敼瀛愰」鐩唬鐮� //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); //灏嗕笂绾� 涓洪潪鏈骇 - oCN.RunProc("Update Xt_DataDictionary_Table set HStopflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo); + oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo); oCN.Commit(); } objJsonResult.code = "0"; @@ -418,7 +483,91 @@ } } + /// <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) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + [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; + } + } -- Gitblit v1.9.1