From c5e3b9421bf76855e51cb6192941ac39d5d11808 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 30 七月 2021 14:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/Controllers/WebAPIController.cs | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 0249ff2..73bf700 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -713,14 +713,8 @@
/// <returns></returns>
[Route("Web/GetMaterialList_Json")]
[HttpGet]
- public object GetMaterialList_Json(string Material)
+ public object GetMaterialList_Json(string sWhere)
{
- sWhere = " Where HStopFlag=0 and HEndFlag=1";
- //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (Material != "")
- {
- sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
- }
try
{
ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
--
Gitblit v1.9.1