From c3ad7025d45c0cd270396e83e6ba0e200d64c575 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 31 七月 2022 14:59:32 +0800
Subject: [PATCH] 修改了 生产任务单维护根据单据号倒序排列 以及流转卡 已经有下游进出站单后，不允许删除
---
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
index fc43e58..a4e787c 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
@@ -28,12 +28,21 @@
/// </summary>
[Route("Gy_GroupEmpBill/GetGroupEmpBill")]
[HttpGet]
- public object GetGroupEmpBill(string sWhere)
+ public object GetGroupEmpBill(string sWhere,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = Sc_GetGroupEmpBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -54,12 +63,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by 鏃ユ湡 desc", "h_v_Gy_GroupEmpBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by hmainid desc", "h_v_Gy_GroupEmpBillList");
}
else
{
string sql1 = "select * from h_v_Gy_GroupEmpBillList 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_Gy_GroupEmpBillList");
}
@@ -129,23 +138,23 @@
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 UserName = msg4;
string s = "";
long mouldid;
ListModels oListModels = new ListModels();
try
{
- ////缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Gy_GroupEmpBill_Edit", 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Group_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DLL.ClsGy_GroupEmpBill oBill = new DLL.ClsGy_GroupEmpBill();
List<Models.ClsGy_GroupEmpListMain> lsmain = new List<Models.ClsGy_GroupEmpListMain>();
@@ -234,10 +243,18 @@
/// <returns></returns>
[Route("Gy_GroupEmpBill/DeltetGroupEmpBill")]
[HttpGet]
- public object DeltetGroupEmpBill(string HInterID)
+ public object DeltetGroupEmpBill(string HInterID,string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.BeginTran();
oCN.RunProc("Delete From Gy_GroupEmpListMain where HInterID = " + HInterID);
oCN.RunProc("Delete From Gy_GroupEmpListSub where HInterID = " + HInterID);
--
Gitblit v1.9.1