From 6961765d761e4830b563b9689caaef978243acd8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 13 六月 2022 15:39:27 +0800
Subject: [PATCH] 工艺路线导入功能完善
---
WebAPI/Controllers/WebAPIController.cs | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 95a5aeb..dfa6370 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -832,23 +832,26 @@
}
}
+
/// <summary>
/// 鑾峰彇渚涘簲鍟嗗垪琛�
/// </summary>
/// <returns></returns>
[Route("Web/GetSupplierList_Json")]
[HttpGet]
- public object GetSupplierList_Json(string Supplier)
+ public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ 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 != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
}
try
{
- ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ 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)
{
objjson.code = "0";
@@ -1231,7 +1234,7 @@
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
if (sWhere != "")
{
- sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+ sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
}
try
{
--
Gitblit v1.9.1