From e2c6a1dee0e9fcc1656c2ed0e1059fcadbfa08ec Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 25 二月 2026 09:54:19 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e83bff7..9f5f033 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1150,7 +1150,52 @@
}
}
+ /// <summary>
+ /// 鑾峰彇浠撳簱鍒楄〃 --娣诲姞妯″叿浠撳簱鏉′欢 鐢ㄤ簬鍙煡璇㈡ā鍏蜂粨搴�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetWarehouseList_Json_MJ")]
+ [HttpGet]
+ public object GetWarehouseList_Json_MJ(string Warehouse, Int64 HOrgID)
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1 and HWarehouseType='妯″叿浠撳簱' and HUSEORGID =" + HOrgID + "";
+ //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+ if (Warehouse != "")
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' or HUSEORGID like '%" + Warehouse + "%' ) ";
+ }
+ try
+ {
+ WebS.WebService1 oWeb = new WebS.WebService1();
+ ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
/// <summary>
/// 鑾峰彇浠撲綅鍒楄〃
@@ -1492,11 +1537,11 @@
{
if (Employee != "")
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString() + " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' ) ";
}
else
{
- sWhere = " Where HStopFlag=0 and HWHID=" + HGroupID.ToString();
+ sWhere = " Where HStopFlag=0 and HGroupID=" + HGroupID.ToString();
}
}
try
--
Gitblit v1.9.1