From 4441719f8b9dba3bb533c6b4c43627d1443dc171 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 21 十一月 2022 10:32:16 +0800
Subject: [PATCH] 工作日设置
---
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
index 55ba567..643d544 100644
--- a/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
@@ -27,36 +27,47 @@
/// </summary>
[Route("Sc_PPBomBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_PPBomBillList_Query", 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_IF_PPBomBillList " + sWhere, "h_v_IF_PPBomBillList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_PPBomBillList order by hmainid desc ", "h_v_IF_PPBomBillList");
}
else
{
string sql1 = "select * from h_v_IF_PPBomBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_IF_PPBomBillList");
}
- 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)
{
@@ -75,19 +86,19 @@
[HttpGet]
public object DeOrAuditBill(int HInterID, int IsAudit, string CurUserName)
{
- // string ModRightNameCheck = ""; 璇ユā鍧楃殑瀹℃牳鍔熻兘
+ string ModRightNameCheck = "Sc_PPBomBillList_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘
DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
try
{
//鍒ゆ柇鏄惁鏈夊鏍告潈闄�
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒ゆ柇id鏄惁灏忎簬0
if (HInterID <= 0)
@@ -164,7 +175,7 @@
//鍙嶅鏍�
if (IsAudit == 1)
{
- if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -199,7 +210,7 @@
{
string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
oCN.BeginTran();//鎵撳紑浜嬪姟
- oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=2,hchecker='" + HChecker + "',hcheckdate='" + DateTime.Now + "' where HInterID='" + lngBillKey);
+ oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=2,hchecker='" + HChecker + "',hcheckdate='" + DateTime.Now + "' where HInterID=" + lngBillKey);
oCN.Commit();//鍏抽棴浜嬪姟
sReturn = "瀹℃牳鎴愬姛";
return true;
@@ -217,7 +228,7 @@
{
string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
oCN.BeginTran();//鎵撳紑浜嬪姟
- oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID='" + lngBillKey);
+ oCN.RunProc("update Sc_PPBomBillMain set HBillStatus=1,hchecker='',hcheckdate=null where HInterID=" + lngBillKey);
oCN.Commit();//鍏抽棴浜嬪姟
sReturn = "鍙嶅鏍告垚鍔�";
return true;
--
Gitblit v1.9.1