From 26e4ec20ae8370f2b4e43ec7e77688d47d068a3b Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期四, 14 十月 2021 08:32:22 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index 05154c3..6b1c2db 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -83,12 +83,21 @@
[Route("Sc_MouldOtherInBill/GetMouldOtherInBill")]
[HttpGet]
- public object GetMouldOtherInBill(string sWhere)
+ public object GetMouldOtherInBill(string sWhere,string user, string Organization)
{
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBillList", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- ds = Sc_MouldOtherInBill(sWhere);
+ ds = Sc_MouldOtherInBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -105,16 +114,16 @@
}
}
- public static DataSet Sc_MouldOtherInBill(string sWhere)
+ public static DataSet Sc_MouldOtherInBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherInBillList ", "h_v_Sc_MouldOtherInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldOtherInBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
}
@@ -122,16 +131,16 @@
#endregion
- #region[鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ #region[鍣ㄥ叿鍏朵粬鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldOtherInBill/Sc_MouldOtherInBillListCheckDetai")]
[HttpGet]
- public ApiResult<DataSet> Sc_MouldOtherInBillListCheckDetai(string HID)
+ public ApiResult<DataSet> Sc_MouldOtherInBillListCheckDetai(string HID)
{
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from where hmainid= " + HID + " ", "h_v_Sc_MouldOtherInBillList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldOtherInBillList where hmainid= " + HID + " ", "h_v_Sc_MouldOtherInBillList");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ��搴撳崟鍙�" };
@@ -139,7 +148,7 @@
}
#endregion
- #region[鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ #region[鍣ㄥ叿鍏朵粬鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
[Route("Sc_MouldOtherInBill/Sc_MouldOtherInBillListProjectDetai")]
[HttpGet]
public object Sc_MouldOtherInBillListProjectDetai(string sqlWhere)
@@ -188,7 +197,7 @@
}
#endregion
- #region 鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟淇濆瓨/缂栬緫
+ #region 鍣ㄥ叿鍏朵粬鍏ュ簱鍗曚繚瀛�/缂栬緫
/// <summary>
/// 淇濆瓨妯″叿棰嗙敤鍗�
/// </summary>
@@ -203,12 +212,22 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string msg4 = sArray[2].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherInBill_Edit", 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsSc_MouldOtherInBill oBill = new DLL.ClsSc_MouldOtherInBill();
List<Model.ClsSc_MouldOtherInBillMain> lsmain = new List<Model.ClsSc_MouldOtherInBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -323,24 +342,24 @@
}
#endregion
- #region [鍣ㄥ叿鍒嗗竷寮忚皟鍏ュ崟鍒犻櫎鍔熻兘]
+ #region [鍣ㄥ叿鍏朵粬鍏ュ簱鍗曞垹闄ゅ姛鑳絔
/// <summary>
/// 妯″叿澶勭悊棰嗙敤鍗曞垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sc_MouldOtherInBill/DeltetMouldOtherInBill")]
[HttpGet]
- public object DeltetMouldOtherInBill(string HInterID)
+ public object DeltetMouldOtherInBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldOtherOutBill_Delete", 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
--
Gitblit v1.9.1