From 37487293a23255f403dae3998efa296ecc875f65 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期日, 07 四月 2024 17:13:13 +0800
Subject: [PATCH] F8则出来这个物料工艺路线的工作中心下属的全部生产资源；（选择框可以另外单独做 一个）
---
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 219 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 129 insertions(+), 90 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..90155fb 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"
@@ -17,7 +17,6 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
/// <summary>
/// 杩斿洖鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -25,36 +24,46 @@
/// </summary>
[Route("Gy_ClassTimePrjSub/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrjSub", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where 1=1 ", "h_v_Gy_ClassTimePrjSubList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_ClassTimePrjSubList where 1=1 order by HInterID desc", "h_v_Gy_ClassTimePrjSubList");
}
else
{
string sql1 = "select * from h_v_Gy_ClassTimePrjSubList where 1=1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by HInterID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjSubList");
}
- 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;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -77,7 +86,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";
@@ -123,61 +132,67 @@
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 msg5 = sArray[3].ToString();
+ string msg3 = sArray[1].ToString();
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_ClassTimePrjSub_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
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";
@@ -198,71 +213,40 @@
}
}
/// <summary>
- /// 浠撳簱鍒楄〃鍒犻櫎鍔熻兘
+ /// 鏍哥畻璁板綍鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("DeltetGy_ClassTimePrjSub")]
[HttpGet]
- public object DeltetGy_ClassTimePrjSub(string HItemID)
+ public object DeltetGy_ClassTimePrjSub(string HItemID, string user)
{
DataSet ds;
DataSet ds1;
try
{
-
+ if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrjSub_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.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 +262,63 @@
}
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ClassTimePrjSub/Calc")]
+ [HttpGet]
+ public object Calc(string HEntryID, string HYear, string HPeriod)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(HEntryID) || HEntryID == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏍哥畻鏂瑰紡缁勶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HYear == "" || HPeriod == "" || !IsDate($"{HYear}-{HPeriod}-1"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇疯緭鍏ユ湁闄愮殑骞存湀浠斤紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = $"exec h_p_Pay_GetAvgMoneyTest {HYear},{HPeriod},{HEntryID}";
+ ds = oCN.RunProcReturn(sql, "Pay_GetAvgMoneyTest");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
-
-
+ public bool IsDate(string strDate)
+ {
+ try
+ {
+ DateTime.Parse(strDate);
+ return true;
+ }
+ catch
+ {
+ return false;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1