From 22971886a0e1897aabf62b228215bbee3f2d5a6c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 13:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/工资管理/Pay_OtherBalBillController.cs | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
index e2fd0b2..a4c0f83 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_OtherBalBillController.cs"
@@ -24,18 +24,26 @@
public DLL.ClsPay_OtherBalBill BillOld0 = new DLL.ClsPay_OtherBalBill(); //
/// <summary>
- /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
+ /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃(鍏朵粬)
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
[Route("Pay_OtherBalBill/GetOtherBalBill")]
[HttpGet]
- public object GetOtherBalBill(string sWhere)
+ public object GetOtherBalBill(string sWhere,string user)
{
try
{
-
+ if (!DBUtility.ClsPub.Security_Log("Pay_OtherBalBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetOtherBalBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -56,12 +64,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by 鏃ユ湡 desc", "h_v_Pay_OtherBalBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_OtherBalBillList order by hmainid desc", "h_v_Pay_OtherBalBillList");
}
else
{
string sql1 = "select * from h_v_Pay_OtherBalBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + " order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Pay_OtherBalBillList");
}
@@ -131,7 +139,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string refSav = sArray[2].ToString();
- //string msg4 = sArray[3].ToString();
+ string msg4 = sArray[3].ToString();
string UserName = "";
string s = "";
@@ -139,15 +147,15 @@
ListModels oListModels = new ListModels();
try
{
- ////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Pay_SingleBalBill_Edit", 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Pay_OtherBalBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DLL.ClsPay_OtherBalBill oBill = new DLL.ClsPay_OtherBalBill();
List<Models.ClsPay_OtherBalBillMain> lsmain = new List<Models.ClsPay_OtherBalBillMain>();
@@ -318,10 +326,18 @@
/// <returns></returns>
[Route("Pay_OtherBalBill/DeltetOtherBalBill")]
[HttpGet]
- public object Pay_OtherBalBill(string HInterID)
+ public object Pay_OtherBalBill(string HInterID,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Pay_OtherBalBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
oCN.RunProc("Delete From Pay_OtherBalBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Pay_OtherBalBillSub where HInterID = " + HInterID);
--
Gitblit v1.9.1