From 54c10168f9082762cb3ff02cde879a6c2d73f9b5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 07 十二月 2022 16:33:05 +0800
Subject: [PATCH] 收料通知单子表插入语句去除 HGIVEAWAY 字段
---
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs | 141 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 111 insertions(+), 30 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 c3d376f..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)
{
@@ -123,9 +132,18 @@
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);
@@ -142,7 +160,7 @@
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HMaker = list[0].HMaker;
-
+
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HInterID == 0)
@@ -158,7 +176,8 @@
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.Commit();
}
- else {
+ else
+ {
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -194,18 +213,25 @@
}
}
/// <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))
{
@@ -236,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