From 939bfaf9b15dc4c037a1d5530a3ea14cb4e3bbd3 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期五, 27 二月 2026 17:17:11 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/WebAPIController.cs | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 117 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e83bff7..b1aebc8 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>
/// 鑾峰彇浠撲綅鍒楄〃
@@ -1466,14 +1511,71 @@
}
}
+ #region 鑾峰彇鑱屽憳鍒楄〃 (娣诲姞杞﹂棿绛涢��)
+ [Route("Web/GetEmployeeList_Json")]
+ [HttpGet]
+ public object GetEmployeeList_Json3(string Employee, Int64 HGroupID, Int64 HDeptID = -1)
+ {
+ // 缁欓儴闂�(杞﹂棿)ID璁剧疆榛樿鍊硷紝褰撴病鏈変紶鍏ュ�兼垨鑰呭�间负0鐨勬椂鍊欙紝璧版棫鏈夌殑鍑芥暟锛屽惁鍒欒蛋鏂扮殑閫昏緫
+ if(HDeptID == -1 || HDeptID == 0)
+ {
+ return GetEmployeeList_Json2(Employee, HGroupID);
+ }else
+ {
+ sWhere = $" Where HStopFlag=0 and HEndFlag=1 and HDeptID=${HDeptID}";
+
+ if(Employee != "")
+ {
+ sWhere += " and ( HNumber like '%" + Employee + "%' or HName like '%" + Employee + "%' )";
+ }
+ if(HGroupID != 0)
+ {
+ sWhere += " and HGroupID=" + HGroupID.ToString();
+ }
+
+ try
+ {
+ string sql = $"Select * from h_v_IF_Emp {sWhere} Order by HNumber";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_Emp");
+ 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;
+ }
+
+ }
+ }
+ #endregion
+
/// <summary>
/// 鑾峰彇鑱屽憳鍒楄〃
/// </summary>
/// <returns></returns>
- [Route("Web/GetEmployeeList_Json")]
- [HttpGet]
- public object GetEmployeeList_Json(string Employee, Int64 HGroupID)
+ // [Route("Web/GetEmployeeList_Json")]
+ // [HttpGet]
+ public object GetEmployeeList_Json2(string Employee, Int64 HGroupID)
{
sWhere = " Where HStopFlag=0 and HEndFlag=1";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
@@ -1492,11 +1594,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
@@ -1531,6 +1633,7 @@
}
}
+
/// <summary>
/// 鑾峰彇鐝鍒楄〃
@@ -23237,5 +23340,14 @@
}
}
#endregion
+
+ #region APP 鏍规嵁妯″潡鑾峰彇璇ユā鍧椾笅闇�瑕佹樉绀烘秷鎭爣璇嗙殑瀛愭ā鍧�
+ [Route("Web/getMessageIdentified")]
+ [HttpGet]
+ public object getMessageIdentified(string user, string moduleName)
+ {
+ return null;
+ }
+ #endregion
}
}
--
Gitblit v1.9.1