From 1d6cff884285c996289e790aff5db2a3e4ab29bd Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 07 十二月 2021 17:39:41 +0800
Subject: [PATCH] 工资 集体
---
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
index 69329ae..5a974ca 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
@@ -27,7 +27,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Pay_GroupBalBill/GetGroupBalBill")]
+ [Route("Pay_GroupBalBill/GetGroupBalBill")]
[HttpGet]
public object GetGroupBalBill(string sWhere)
{
@@ -65,7 +65,7 @@
}
}
-
+
#region[宸ヨ祫缁撶畻闆嗕綋鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Pay_GroupBalBill/Pay_GroupBalBillListCheckDetail")]
[HttpGet]
@@ -89,19 +89,25 @@
public object Pay_GroupBalBillListProjectDetai(string sqlWhere)
{
DataSet ds;
+ DataSet ds1;
+ List<object> list = new List<object>();
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT HMaterID,HMaterCode,HMaterName, HDeptID,閮ㄩ棬浠ｇ爜,閮ㄩ棬" +
- ",HGroupID,鐝粍浠ｇ爜,鐝粍,鎽樿,鍐呴儴鍗曟嵁鍙�,琛ㄥご澶囨敞,鍒跺崟浜�,鍒跺崟鏃ユ湡" +
- ",瀹℃牳浜�,瀹℃牳鏃ユ湡,淇敼浜�,淇敼鏃ユ湡,鍏抽棴浜�, 鍏抽棴鏃ユ湡,HProcID,HProcNumber,HProcName" +
- ",鏁伴噺,閲戦 FROM h_v_Pay_GroupBalBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
+ string sql = @"SELECT HMaterID,HMaterCode,HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,HUnitNumber,HUnitName
+ HProcID,HProcNumber,HProcName,HSourceID,HSourceNumber,HSourceName,宸ユ椂 HTimes,鏁伴噺 HQty,宸ヤ环 HPrice,閲戦 HMoney, HSumMoney,HOtherSubsidy,HOtherDeduct,HPayMoney FROM h_v_Pay_GroupBalBillList where 1 = 1 " + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Pay_GroupBalBillList");
+ string sql1 = @"select
+ HEmpID ,b.HNumber HEmpNumber, b.HName HEmpName, b.HEmpRate HEmpRate, HBaseTimes, HMoney, HOtherSubsidy, HOtherSubsidy, HYF,'' HISZF ,'' HISFT , a.HRemark
+from Pay_GroupBalBillEmp a
+ left join Gy_Employee b on a.HEmpID = b.HItemID " + sqlWhere.Replace("hmainid", "HInterID");
+ ds1 = oCN.RunProcReturn(sql1, "Pay_GroupBalBillEmp");
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = list;
}
catch (Exception e)
{
@@ -113,7 +119,7 @@
return objJsonResult;
}
#endregion
-
+
/// <summary>
///宸ヨ祫缁撶畻涓汉鍗曞垹闄ゅ姛鑳�
/// </summary>
@@ -148,7 +154,7 @@
[Route("Pay_GroupBalBill/getGroupBalBillPrice")]
[HttpGet]
- public object getGroupBalBillPrice(string HMaterID,string HProcID)
+ public object getGroupBalBillPrice(string HMaterID, string HProcID)
{
try
{
--
Gitblit v1.9.1