From 426134e8a0dbb5fc63a0bc64eeff2de6aac4b81a Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 31 一月 2024 08:42:46 +0800
Subject: [PATCH] 1
---
Wms/Wms/Controllers/SysController.cs | 195 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 187 insertions(+), 8 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 8ef43b0..fe4cd03 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -41,6 +41,9 @@
private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織
private readonly IExceptionServer _table; //寮傚父澶勭悊
private readonly IHeaderSettingsServer _headerSet;//琛ㄥご璁剧疆
+
+ private readonly IMaterialCategory _category;//鐗╂枡绫诲埆
+
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -54,7 +57,8 @@
/// <param name="dic">鏁版嵁瀛楀吀</param>
/// <param name="operation">鎿嶄綔鏃ュ織</param>
/// <param name="table">寮傚父澶勭悊</param>
- public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet)
+ /// <param name="category">鐗╂枡绫诲埆</param>
+ public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategory category)
{
_wareHouseSvc = wareHouseSvc; //浠撳簱
_areaSvc = areaSvc; //鍖哄煙
@@ -69,6 +73,7 @@
_table = table; //寮傚父澶勭悊
_headerSet = headerSet;//琛ㄥご璁剧疆
+ _category = category;//鐗╂枡绫诲埆
}
#region 鑿滃崟绠＄悊
@@ -225,7 +230,7 @@
}
catch (Exception ex)
{
- return Ok(new { data = "", code = 3, msg = "鏂板鑿滃崟淇℃伅寮傚父锛�"+ ex.Message });
+ return Ok(new { data = "", code = 3, msg = "鏂板鑿滃崟淇℃伅寮傚父锛�" + ex.Message });
}
}
@@ -1138,7 +1143,7 @@
{
_operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", storage.LocatNo, "淇敼", "淇敼鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + storage.LocatNo, Convert.ToInt32(userId));
}
-
+
return Ok(new { code = 0, msg = "缂栬緫鎴愬姛", data = "" });
}
else
@@ -1384,11 +1389,11 @@
int uid = Convert.ToInt32(userId);
//鏇存敼浜�
tabledto.UpdateUser = uid;
- string strMesage = _table.EditStatus(tabledto);
+ string strMesage = _table.EditStatus(tabledto);
if (strMesage == "")
{
return Ok(new { code = 0, msg = "澶勭悊鎴愬姛" });
- }
+ }
else
{
return Ok(new { code = 1, msg = strMesage });
@@ -1444,12 +1449,13 @@
/// <param name="wareHouseNo">浠撳簱</param>
/// <param name="roadway">宸烽亾鍙�</param>
/// <param name="row">鎺�</param>
+ /// <param name="depth">娣卞害</param>
/// <returns></returns>
[HttpGet]
- public IActionResult GetStorageLocatLists(string wareHouseNo, string roadway,string row)
+ public IActionResult GetStorageLocatLists(string wareHouseNo, string roadway, string row, string depth)
{
//鑾峰彇鍌ㄤ綅淇℃伅
- List<SysStorageLocat> storagelist = _locatSvc.GetStorageLocatLists(wareHouseNo, roadway, row);
+ List<SysStorageLocat> storagelist = _locatSvc.GetStorageLocatLists(wareHouseNo, roadway, row, depth);
//鑾峰彇鏈�澶у眰绾�
int maxLayer = _locatSvc.GetMaxLayer(wareHouseNo, roadway, row);
@@ -1527,7 +1533,7 @@
[HttpGet]
public IActionResult GetStorageProportion1(string wareHouseNo, string roadwayNo)
{
- List<GetLocateVm> getLocateVms = _locatSvc.GetStorageProportion1(wareHouseNo,roadwayNo);
+ List<GetLocateVm> getLocateVms = _locatSvc.GetStorageProportion1(wareHouseNo, roadwayNo);
return Ok(new
{
data = getLocateVms,
@@ -1586,6 +1592,179 @@
#endregion
+ #region 鐗╂枡绫诲埆
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绫诲埆淇℃伅
+ /// </summary>
+ /// <param name="categoryName">绫诲埆鍚嶇О</param>
+ /// <param name="areaNo">鍖哄煙缂栫爜</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpGet]
+ public IActionResult GetMaterialCategories(string categoryName, string areaNo)
+ {
+ try
+ {
+ var list = _category.GetMaterialCategories(categoryName, areaNo);
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "鑾峰彇鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = "鑾峰彇鐗╂枡绫诲埆淇℃伅寮傚父"
+ });
+ }
+ }
+
+ /// <summary>
+ /// 鏂板绫诲埆淇℃伅
+ /// </summary>
+ /// <param name="category">鐗╂枡绫诲埆瀹炰綋</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpPost]
+ public IActionResult InsertMaterialCategories(SysMaterialCategory category)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ category.CreateUser = int.Parse(userId);
+
+ var list = _category.InsertMaterialCategories(category);
+
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "鏂板鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+
+
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = "鏂板鐗╂枡绫诲埆淇℃伅寮傚父"
+ });
+ }
+ }
+
+ /// <summary>
+ /// 缂栬緫绫诲埆淇℃伅
+ /// </summary>
+ /// <param name="category">鐗╂枡绫诲埆瀹炰綋</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpPost]
+ public IActionResult ExitMaterialCategories(SysMaterialCategory category)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ category.UpdateUser = int.Parse(userId);
+
+ var list = _category.ExitMaterialCategories(category);
+
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "缂栬緫鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+
+
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = "缂栬緫鐗╂枡绫诲埆淇℃伅寮傚父"
+ });
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎绫诲埆淇℃伅
+ /// </summary>
+ /// <param name="category">鐗╂枡绫诲埆瀹炰綋</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpPost]
+ public IActionResult DeleteMaterialCategories(SysMaterialCategory category)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ category.UpdateUser = int.Parse(userId);
+
+ var list = _category.DeleteMaterialCategories(category);
+
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "鍒犻櫎鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+
+
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = "鍒犻櫎鐗╂枡绫诲埆淇℃伅寮傚父"
+ });
+ }
+ }
+
+ #endregion
+
#region 鏁版嵁琛ㄦ牸琛ㄥご鑷畾涔�(閫氱敤鏂规硶)
--
Gitblit v1.8.0