From 328034521b127d65fdff9c89a0f8dd493b44680f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 14 十二月 2023 13:31:36 +0800
Subject: [PATCH] 工序出站汇报单 增加子表查询
---
WebAPI/Controllers/WebAPIController.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 2472e33..1455b61 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1188,16 +1188,21 @@
[HttpGet]
public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
+ sWhere = " Where HStopFlag=0 and HUSEORGID =" + HOrgID + "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (Supplier != "")
+ if (Supplier != "" && Supplier != null)
{
sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + HOrgID + "%' ) ";
+ //sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + HOrgID + "%' ) ";
}
try
{
- WebS.WebService1 oWeb = new WebS.WebService1();
- ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ string sql = "select HItemID,HNumber,HName from Gy_Supplier " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_Supplier");
+
+ //WebS.WebService1 oWeb = new WebS.WebService1();
+ //ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
//ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
--
Gitblit v1.9.1