From 76734ab6683a6f26ae9e853495c5cb82c3c70c3b Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 十二月 2021 21:05:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 115 +++++++++++++++++++++++++--------------------------------
1 files changed, 50 insertions(+), 65 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
index 428bbbb..f7ec5a2 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjSubController.cs"
@@ -77,7 +77,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where HitemID=" + HInterID, "h_v_Gy_ClassTimePrjSubList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where HInterID=" + HInterID, "h_v_Gy_ClassTimePrjSubList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -131,53 +131,50 @@
List<Gy_ClassTimePrjSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_ClassTimePrjSub>>(msg2);
long HInterID = list[0].HInterID;
- long HItemID = list[0].HItemID;
+ long HEntryID = list[0].HEntryID;
+ string HYear = list[0].HYear;
+ decimal HPeriod = list[0].HPeriod;
+ string HSumWorkTimes = list[0].HSumWorkTimes;
+ decimal HSumMoney = list[0].HSumMoney;
+ string HRate = list[0].HRate;
+ decimal HOldRate = list[0].HOldRate;
+
string HNumber = list[0].HNumber;
string HName = list[0].HName;
- long hparentid = list[0].hparentid;
string HMaker = list[0].HMaker;
- string HSumWorkTimes = list[0].HSumWorkTimes;
- string HRate = list[0].HRate;
- decimal HSumMoney = list[0].HSumMoney;
- string HYear = list[0].HYear;
- decimal HPeriod = list[0].HSumMoney;
- decimal HOldRate = list[0].HOldRate;
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
- if (HItemID == 0)
+ if (HInterID == 0)
{
oCN.BeginTran();
oCN.RunProc("Insert into Gy_ClassTimePrjSub" +
- " (HInterID,HMaker,HMakeDate,HSumWorkTimes" +
+ " (HEntryID,HMaker,HMakeDate,HSumWorkTimes" +
",HRate,HSumMoney,HYear,HPeriod" +
",HOldRate) " +
- " Values(" + HInterID + ",'" + HMaker + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'," + HSumWorkTimes.ToString() +
+ " Values(" + HEntryID + ",'" + HMaker + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'," + HSumWorkTimes.ToString() +
"," + HRate + "," + HSumMoney.ToString() + "," + HYear.ToString() + "," + HPeriod.ToString() +
"," + HOldRate.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
- else {
+ else
+ {
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
oCN.RunProc("Update Gy_ClassTimePrjSub set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HMaker='" + HMaker + "'" +
- ",hparentid=" + hparentid.ToString() +
+ "HMaker='" + HMaker + "'" +
",HSumWorkTimes=" + HSumWorkTimes.ToString() +
",HSumMoney=" + HSumMoney.ToString() +
",HYear=" + HYear.ToString() +
",HPeriod=" + HPeriod.ToString() +
",HOldRate=" + HOldRate.ToString() +
- ",HRate= '" + HRate + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ ",HEntryID=" + HEntryID.ToString() +
+ ",HRate= '" + HRate + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
- oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
- //
oCN.Commit();
}
objJsonResult.code = "0";
@@ -209,60 +206,22 @@
DataSet ds1;
try
{
-
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (string.IsNullOrWhiteSpace(HItemID))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
+ objJsonResult.Message = "HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
}
oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Gy_ClassTimePrjSub where HItemID=" + HItemID, "Gy_ClassTimePrjSub");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- //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;
- //}
- ds1 = oCN.RunProcReturn("Select HItemID from Gy_ClassTimePrjSub Where HParentID='" + HItemID + "'", "Gy_ClassTimePrjSub");
- if (ds1.Tables[0].Rows.Count != 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰锛屼笉鑳藉垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- 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;
- }
-
- oCN.RunProc("delete from Gy_ClassTimePrjSub where HItemID=" + HItemID);
+ oCN.RunProc("delete from Gy_ClassTimePrjSub where HInterID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -278,8 +237,34 @@
}
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrjSub/ModifyByID")]
+ [HttpPost]
+ public object Calc(string HEntryID, string HYear, string HPeriod)
+ {
+ try
+ {
+ oCN.RunProcReturn("exec h_p_Pay_GetAvgMoney " + HYear.ToString() + "," + HPeriod.ToString() + "," + HEntryID.ToString(), "pjgz");
-
-
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ 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;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1