From f0b15e2fc7bdccb18d27cba0c9dfd667e36c20a6 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 24 七月 2024 17:56:46 +0800
Subject: [PATCH] 不良评审申请单,选着工序流转卡,查询数据增加过滤条件,设备故障登记单,生产质量汇报单,异常反馈单, 取样单,增加字段保存
---
WebAPI/Controllers/WebAPIController.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b1d9647..db4fc44 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -11914,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 + "%' ";
}
@@ -11923,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