From 5854826c9eed1e26367103d4196ae851628370ef Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 05 八月 2024 15:03:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 1c84ba2..db4fc44 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -10496,7 +10496,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -10504,7 +10503,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹暟鎹凡瀛樺湪!";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -11915,7 +11914,7 @@
[HttpGet]
public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID)
{
- if (ICMOBill != "")
+ if (ICMOBill != "" & ICMOBill != null)
{
sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
}
@@ -11924,7 +11923,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn(" select * from h_v_Sc_ProcessExchangeBillList where 1=1 and 鏃ユ湡>=DATEADD(MONTH,-2,GETDATE()) order by 鍗曟嵁鍙� desc,hsubid", "h_v_Sc_ProcessExchangeBillList");
}
else
{
--
Gitblit v1.9.1