From 54c3139ff45224901d522c25ffe9bf04f3eea837 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 19 七月 2021 08:54:25 +0800
Subject: [PATCH] nothing

---
 WebAPI/Controllers/WebAPIController.cs |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 9cfbcaf..cca193c 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1790,20 +1790,19 @@
         {
             if (ICMOBill != "")
             {
-                sWhere = "where 1=1 and 鐢熶骇璁㈠崟鍙� like '%" + ICMOBill + "%' and HSTOCKINORGID=" + OrganizationID;
+                sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
             }
             try
             {
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where HSTOCKINORGID=" + OrganizationID, "h_v_S_Sc_ICMOBillList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')=''  order by 鍗曟嵁鍙� desc,hsubid ", "h_v_IF_ICMOBillList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_S_Sc_ICMOBillList ";
-                    string sql = sql1 + sWhere;
-                    ds = oCN.RunProcReturn(sql, "h_v_S_Sc_ICMOBillList");
+                    string sql = "select * from h_v_IF_ICMOBillList "+ sWhere+ " and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')=''  order by 鍗曟嵁鍙� desc,hsubid ";
+                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {

--
Gitblit v1.9.1