From 2ffc4b7794e47bd8cf9f7b9662b0f92322406bb7 Mon Sep 17 00:00:00 2001 From: 王 垚 <1402714037@qq.com> Date: 星期一, 27 六月 2022 16:17:18 +0800 Subject: [PATCH] 工资管理调整 --- WebAPI/Controllers/WebAPIController.cs | 96 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 74 insertions(+), 22 deletions(-) diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index 75245a2..8cdcc7a 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -128,7 +128,7 @@ objjson.code = "0"; objjson.count = 0; - objjson.Message = "鐧诲綍寮傚父锛�"+e.Message; + objjson.Message = "鐧诲綍寮傚父锛�" + e.Message; objjson.data = null; return objjson; ; } @@ -209,7 +209,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; - objJsonResult.Message = "鍒犻櫎澶辫触锛�"; + objJsonResult.Message = "鍒犻櫎澶辫触锛�"; objJsonResult.data = null; return objJsonResult; } @@ -729,7 +729,7 @@ /// <returns></returns> [Route("Web/GetStockPlaceList_Json_NEW")] [HttpGet] - public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID) + public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID) { WebS.WebService1 oWeb = new WebS.WebService1(); sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + HOrgID + ""; @@ -1637,7 +1637,7 @@ /// <returns></returns> [Route("DeltetGy_BadReason")] [HttpGet] - public object DeltetGy_BadReason(string HItemID,string user) + public object DeltetGy_BadReason(string HItemID, string user) { DataSet ds; //string ModRightNameCheck = "Sc_ProcessReport_check"; @@ -2099,7 +2099,7 @@ [Route("Web/GetClassTimePrjGroupBillList_Json")] [HttpGet] - public object GetClassTimePrjGroupBillList_Json(string sWhere,string user) + public object GetClassTimePrjGroupBillList_Json(string sWhere, string user) { if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user)) { @@ -2153,6 +2153,58 @@ return objjson; } } + /// <summary> + /// 鏍哥畻鏂瑰紡缁勭紪杈� + /// </summary> + /// <param name="sWhere"></param> + /// <param name="user"></param> + /// <returns></returns> + [Route("Web/GetClassTimePrjGroupBillEdit_Json")] + [HttpGet] + public object GetClassTimePrjGroupBillEdit_Json(string sWhere) + { + //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user)) + //{ + // objJsonResult.code = "0"; + // objJsonResult.count = 0; + // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + // objJsonResult.data = null; + // return objJsonResult; + //} + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as 浠撳簱鍚嶇О from Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere; + ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup"); + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo; + objjson.data = null; + return objjson; + } + else + { + objjson.code = "1"; + objjson.count = 1; + objjson.Message = "鑾峰彇鎴愬姛!"; + objjson.data = ds.Tables[0]; + return objjson; + } + } + catch (Exception ex) + { + + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + ex.ToString(); + objjson.data = null; + return objjson; + } + } + + #region 鍒犻櫎鏍哥畻鏂瑰紡缁� /// <summary> /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳 @@ -2201,9 +2253,9 @@ /// <returns></returns> [Route("Web/SaveGetClassTimePrjGroupList")] [HttpGet] - public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem) + public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem) { - + try { int HItemID = int.Parse(HItem); @@ -2216,18 +2268,18 @@ objJsonResult.data = null; return objJsonResult; } - string sql=""; - if (refSav== "Add") + string sql = ""; + if (refSav == "Add") { - sql = "Insert Into Gy_ClassTimePrjGroup " + - "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" + - ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" + - ") " + - " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") "; + sql = "Insert Into Gy_ClassTimePrjGroup " + + "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" + + ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" + + ") " + + " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") "; } else { - sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID; + sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID; } oCN.RunProc(sql); objJsonResult.code = "1"; @@ -2713,7 +2765,7 @@ [HttpGet] public object GetMaintainItemtemByMouldProjectID(int MouldProjectID) { - + if (MouldProjectID <= 0) { objjson.code = "0"; @@ -2825,7 +2877,7 @@ { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList "); - ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList"); + ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; @@ -2853,7 +2905,7 @@ } } - /// <summary> + /// <summary> /// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰 /// </summary> /// <returns></returns> @@ -2931,7 +2983,7 @@ from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID left join Gy_Maintain m on m.HItemID=t.HMaintainItemID left join Gy_Employee e on e.HItemID=t.HManagerID - where a.HInterID=" + EquipProjectID ); + where a.HInterID=" + EquipProjectID); string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID left join h_v_IF_Material m on b.HMaterID=m.HItemID @@ -3063,8 +3115,8 @@ return objjson; } } - - + + /// <summary> /// 鑾峰彇缁翠慨椤圭洰鍒楄〃 /// </summary> @@ -3289,7 +3341,7 @@ WebS.WebService1 oWebs = new WebS.WebService1(); try { - ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID); + ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objJsonResult.code = "0"; -- Gitblit v1.9.1