From ce0366bb8db4f9665e715b8647df6eb15fa07f68 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 25 一月 2024 14:07:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/基础资料/工资基础资料/Gy_WorkPayTypeController.cs | 169 +++++++++++++++++++++++++++----------------------------
1 files changed, 83 insertions(+), 86 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeController.cs"
similarity index 71%
copy from "WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
copy to "WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeController.cs"
index 051b596..4464185 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkPayTypeController.cs"
@@ -12,11 +12,11 @@
namespace WebAPI.Controllers
{
- public class Gy_ClassTimePrjGroupController : ApiController
+ public class Gy_WorkPayTypeController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- const string ModCaption = "鏍哥畻鏂瑰紡缁�";
- public const string ModRightName = "Gy_ClassTimePrjGroup";
+ const string ModCaption = "宸ヨ祫绫诲瀷";
+ public const string ModRightName = "Gy_WorkPayType";
public const string ModRightNameAdd = ModRightName + "_Add"; //鏂板
public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
@@ -25,18 +25,18 @@
public DataSet ds = new DataSet();
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
- DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
+ DAL.ClsGy_WorkPayType_Ctl oBill = new DAL.ClsGy_WorkPayType_Ctl();
+ DAL.ClsGy_WorkPayType_View oBillHlp = new DAL.ClsGy_WorkPayType_View();
- #region 鏍哥畻鏂瑰紡缁勫垪琛�
+ #region 宸ヨ祫绫诲瀷鍒楄〃
/// <summary>
- /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛ㄤ俊鎭�
+ /// 鑾峰彇宸ヨ祫绫诲瀷鍒楄〃淇℃伅
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayTypeList_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
+ public object GetGy_WorkPayTypeList_Json(string sWhere, string HMaker)
{
try
{
@@ -51,7 +51,7 @@
}
//杩斿洖鍒楄〃淇℃伅
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_ClassTimePrjGroupList");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_WorkPayTypeList");
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -78,14 +78,14 @@
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫垹闄�
+ #region 宸ヨ祫绫诲瀷鍒犻櫎
/// <summary>
- /// 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// 鍒犻櫎宸ヨ祫绫诲瀷
/// </summary>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Delete_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
+ public object GetGy_WorkPayType_Delete_Json(Int64 HItemID, string HMaker)
{
try
{
@@ -100,25 +100,25 @@
}
//鍒ゆ柇瀛樺湪鎬�
- if (oClassTimePrjHlp.GetInfoByID(HItemID))
+ if (oBillHlp.GetInfoByID(HItemID))
{
//鍒ゆ柇鏄惁瀛樺湪瀛愰」
- if (oClassTimePrj.HavChildCodes(HItemID))
+ if (oBill.HavChildCodes(HItemID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ゆ牳绠楁柟寮忕粍瀛樺湪瀛愰」鐩�,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.Message = "姝ゅ伐璧勭被鍨嬪瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
//鍒犻櫎鏁版嵁
- if (oClassTimePrj.DeleteByID(HItemID))
+ if (oBill.DeleteByID(HItemID))
{
//鍐欏叆鏃ュ織
- DBUtility.ClsPub.Add_Log("", "鍒犻櫎鏍哥畻鏂瑰紡缁勶紝浠ｇ爜锛�" + oClassTimePrjHlp.omodel.HNumber + ",鍚嶇О锛�" + oClassTimePrjHlp.omodel.HName, HMaker);
+ DBUtility.ClsPub.Add_Log("", "鍒犻櫎宸ヨ祫绫诲瀷锛屼唬鐮侊細" + oBillHlp.omodel.HNumber + ",鍚嶇О锛�" + oBillHlp.omodel.HName, HMaker);
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -126,7 +126,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒";
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -135,7 +135,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭被鍨嬶紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -144,24 +144,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鍒犻櫎宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勫鏍搞�佸弽瀹℃牳
+ #region 宸ヨ祫绫诲瀷瀹℃牳銆佸弽瀹℃牳
/// <summary>
- /// 瀹℃牳銆佸弽瀹℃牳鏍哥畻鏂瑰紡缁�
+ /// 瀹℃牳銆佸弽瀹℃牳宸ヨ祫绫诲瀷
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Check_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
+ public object GetGy_WorkPayType_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
{
string sErrMsg = "";
try
@@ -178,11 +178,11 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "瀹℃牳宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -190,18 +190,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "瀹℃牳宸ヨ祫绫诲瀷澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
- if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶅鏍稿伐璧勭被鍨嬫垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -209,7 +209,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶅鏍稿伐璧勭被鍨嬪け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -227,24 +227,24 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勭鐢ㄣ�佸弽绂佺敤
+ #region 宸ヨ祫绫诲瀷绂佺敤銆佸弽绂佺敤
/// <summary>
- /// 绂佺敤銆佸弽绂佺敤鏍哥畻鏂瑰紡缁�
+ /// 绂佺敤銆佸弽绂佺敤宸ヨ祫绫诲瀷
/// </summary>
/// <param name="HItemID">鍐呯爜</param>
/// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
/// <param name="HMaker">鎿嶄綔浜�</param>
/// <returns></returns>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Stop_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
+ public object GetGy_WorkPayType_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
{
string sErrMsg = "";
try
@@ -261,11 +261,11 @@
if (IsStop == 0) //绂佺敤鍒ゆ柇
{
- if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.StopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.Message = "绂佺敤宸ヨ祫绫诲瀷鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -273,18 +273,18 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.Message = "绂佺敤宸ヨ祫绫诲瀷澶辫触锛�" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
}
else if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
{
- if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
+ if (oBill.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐璧勭被鍨嬫垚鍔燂紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -292,7 +292,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.Message = "鍙嶇鐢ㄥ伐璧勭被鍨嬪け璐ワ紒" + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -310,20 +310,20 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "绂佺敤鎴栧弽绂佺敤宸ヨ祫绫诲瀷澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
- #region 鏍哥畻鏂瑰紡缁勪繚瀛�
+ #region 宸ヨ祫绫诲瀷淇濆瓨
/// <summary>
- /// 鏍哥畻鏂瑰紡缁勪繚瀛�
+ /// 宸ヨ祫绫诲瀷淇濆瓨
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Save_Json")]
[HttpPost]
- public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
+ public object GetGy_WorkPayType_Save_Json([FromBody] JObject oMain)
{
try
{
@@ -364,37 +364,34 @@
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
- List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
- oClassTimePrj.oModel.HItemID = list[0].HItemID;
- oClassTimePrj.oModel.HNumber = list[0].HNumber;
- oClassTimePrj.oModel.HName = list[0].HName;
- oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
- oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
- oClassTimePrj.oModel.HEndFlag = true;
- oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
- oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
- oClassTimePrj.oModel.HRemark = list[0].HRemark;
- oClassTimePrj.oModel.HMakeEmp = HMaker;
- oClassTimePrj.oModel.HModifyEmp = HMaker;
- oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
- oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
- oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
- //
- oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
- oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
+ List<Model.ClsGy_WorkPayType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_WorkPayType_Model>>(msg2);
+ oBill.oModel.HItemID = list[0].HItemID;
+ oBill.oModel.HNumber = list[0].HNumber;
+ oBill.oModel.HName = list[0].HName;
+ oBill.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
+ oBill.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
+ oBill.oModel.HEndFlag = true;
+ oBill.oModel.HStopflag = list[0].HStopflag;
+ oBill.oModel.HUseFlag = list[0].HUseFlag;
+ oBill.oModel.HRemark = list[0].HRemark;
+ oBill.oModel.HMakeEmp = HMaker;
+ oBill.oModel.HModifyEmp = HMaker;
+ oBill.oModel.HCheckEmp = list[0].HCheckEmp;
+ oBill.oModel.HUSEORGID = list[0].HUSEORGID;
+ oBill.oModel.HCREATEORGID = list[0].HUSEORGID;
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
if (sParent.Trim() == "")
{
- oClassTimePrj.oModel.HParentID = 0;
+ oBill.oModel.HParentID = 0;
}
else
{
- ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
+ ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oBill.oModel.HItemID, ModRightName);
if (ds.Tables[0].Rows.Count > 0)
{
- oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
+ oBill.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
}
else
{
@@ -407,14 +404,14 @@
}
//淇濆瓨鍘熶唬鐮�
- DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
+ DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oBill.oModel.HItemID + "'", ModRightName);
if (dsOldNumber.Tables[0].Rows.Count > 0)
{
- oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
+ oBill.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
//鏄惁鏂颁唬鐮佹槸鑷繁瀛愰」鐩殑銆�瀛愰」鐩�
- if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
+ if (sParent.Length >= oBill.HOldNumber.Length)
{
- if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
+ if (sParent.Substring(0, oBill.HOldNumber.ToString().Length) == oBill.HOldNumber.Trim())
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -426,12 +423,12 @@
}
else
{
- oClassTimePrj.HOldNumber = "";
+ oBill.HOldNumber = "";
}
//淇濆瓨鍓嶅垽鏂�
//瀹℃牳浠ｇ爜鏄惁鍚堢悊
- if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
+ if (!DBUtility.ClsPub.AllowNumber(oBill.oModel.HNumber))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -440,7 +437,7 @@
return objJsonResult;
}
//鏄惁閲嶅浠ｇ爜
- if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
+ if (oBill.HavSameNumber(oBill.oModel.HItemID, oBill.oModel.HNumber))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -453,7 +450,7 @@
if (OperationType == "1")
{
//鏂板
- if (oClassTimePrj.AddNew())
+ if (oBill.AddNew())
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -472,7 +469,7 @@
}
else
{
- if(oClassTimePrj.oModel.HCheckEmp!="")
+ if(oBill.oModel.HCheckEmp!="")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -481,7 +478,7 @@
return objJsonResult;
}
//淇敼
- if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
+ if (oBill.ModifyByID(oBill.oModel.HItemID))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -511,22 +508,22 @@
#endregion
- #region 鏄剧ず鏍哥畻鏂瑰紡缁勪俊鎭�
+ #region 鏄剧ず宸ヨ祫绫诲瀷淇℃伅
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
/// </summary>
- [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
+ [Route("Gy_WorkPayTypeController/GetGy_WorkPayType_Json")]
[HttpGet]
- public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
+ public object GetGy_WorkPayType_Json(Int64 HItemID)
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_WorkPayTypeListDetail where HItemID=" + HItemID, "h_v_Gy_WorkPayTypeListDetail");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭被鍨嬶紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -543,7 +540,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "杩斿洖鏍哥畻鏂瑰紡缁勪俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "杩斿洖宸ヨ祫绫诲瀷淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1