From 1e7283cacb5eb6de492c6c6874aeaa316063989c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 13 三月 2024 16:46:35 +0800
Subject: [PATCH] Merge branch 'csc'
---
Wms/Wms/Controllers/SysController.cs | 245 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 236 insertions(+), 9 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index fe4cd03..1ec3250 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -20,6 +20,7 @@
using System.Security.Cryptography;
using Model.ModelDto;
using Model.ModelDto.LogDto;
+using Newtonsoft.Json.Linq;
namespace Wms.Controllers
{
@@ -42,7 +43,7 @@
private readonly IExceptionServer _table; //寮傚父澶勭悊
private readonly IHeaderSettingsServer _headerSet;//琛ㄥご璁剧疆
- private readonly IMaterialCategory _category;//鐗╂枡绫诲埆
+ private readonly IMaterialCategoryServer _category;//鐗╂枡绫诲埆
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -58,7 +59,7 @@
/// <param name="operation">鎿嶄綔鏃ュ織</param>
/// <param name="table">寮傚父澶勭悊</param>
/// <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)
+ public SysController(IWareHouseServer wareHouseSvc, IStorageAreaServer areaSvc, IStorageRoadwayServer roadwaySvc, IStorageLocatServer locatSvc, IPalletsServer palletSvc, IPalletTrackServer palletTrackSvc, IMenuServer menuSvc, IDictionaryServer dic, IOperationSysServer operation, IExceptionServer table, IHeaderSettingsServer headerSet, IMaterialCategoryServer category)
{
_wareHouseSvc = wareHouseSvc; //浠撳簱
_areaSvc = areaSvc; //鍖哄煙
@@ -734,6 +735,50 @@
return Ok(new { code = 1, msg = e.Message });
}
}
+
+ /// <summary>
+ /// 娣诲姞鍖哄煙淇℃伅
+ /// </summary>
+ /// <param name="model">妯″瀷</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult InsertStorageArea(SysStorageArea model)
+ {
+ 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 = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ model.CreateUser = int.Parse(userId);
+ string bolls = _areaSvc.InsertStorageArea(model);
+ var arr = bolls.Split(":");
+ if (arr[0] != "-1")
+ {
+ SysStorageArea area = _areaSvc.GetStorageMaxArea();
+ _operation.InsertOperation("浠撳簱璁剧疆", "鍖哄煙绠＄悊", area.AreaNo, "娣诲姞", "娣诲姞鍖哄煙淇℃伅 鍖哄煙鍙凤細" + area.AreaNo, Convert.ToInt32(userId));
+ return Ok(new { code = 0, msg = bolls, data = "" });
+ }
+ else
+ {
+ return Ok(new { code = 1, msg = bolls, data = "" });
+ }
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+
+ }
+
/// <summary>
/// 淇敼鍖哄煙淇℃伅
/// </summary>
@@ -1011,7 +1056,7 @@
}
}
/// <summary>
- /// 娣诲姞鍌ㄤ綅淇℃伅
+ /// 娣诲姞绔嬩綋搴撳偍浣嶄俊鎭�
/// </summary>
/// <param name="model">妯″瀷</param>
/// <returns></returns>
@@ -1056,6 +1101,54 @@
return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
}
}
+
+ /// <summary>
+ /// 娣诲姞骞冲簱鍌ㄤ綅淇℃伅
+ /// </summary>
+ /// <param name="model">妯″瀷</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public async Task<IActionResult> AddPkStorageLocat(AddLocateVm model)
+ {
+ if (ModelState.IsValid)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ //var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ //if (claimsIdentity == null)
+ //{
+ // return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ //}
+ //var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ //if (string.IsNullOrWhiteSpace(userId))
+ //{
+ // return Ok(new { code = 400, ErrorMsg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ //}
+ var bolls = await _locatSvc.AddPkStorageLocat(model, 1);
+ if (bolls > 0)
+ {
+ await _operation.InsertOperation("浠撳簱璁剧疆", "鍌ㄤ綅绠＄悊", model.RoadwayNo, "娣诲姞", "娣诲姞鍌ㄤ綅淇℃伅 鍌ㄤ綅鍙凤細" + model.RoadwayNo, 1);
+ return Ok(new { code = 200, ErrorMsg = "娣诲姞鎴愬姛", data = bolls });
+ }
+ else
+ {
+ return Ok(new { code = 400, ErrorMsg = "娣诲姞澶辫触", data = "" });
+ }
+
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 400, ErrorMsg = "璇疯仈绯荤鐞嗗憳/" + e.Message });
+ }
+ }
+ else //鏁版嵁鏍煎紡閿欒
+ {
+ return Ok(new { code = 400, ErrorMsg = "鏁版嵁鏍煎紡閿欒" });
+ }
+ }
+
/// <summary>
/// 淇敼鍌ㄤ綅淇℃伅
/// </summary>
@@ -1443,6 +1536,7 @@
#region 鍌ㄤ綅鍥句緥
+ #region 绔嬪簱
/// <summary>
/// 鏍规嵁浠撳簱 鎺�
/// </summary>
@@ -1559,6 +1653,41 @@
});
}
+
+
+ #endregion
+
+ #region 骞冲簱
+
+ /// <summary>
+ /// 鏍规嵁浠撳簱 鎺�
+ /// </summary>
+ /// <param name="wareHouseNo">浠撳簱</param>
+ /// <param name="row">鎺�</param>
+ /// <param name="depth">娣卞害</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetFlatLibraryLegend(string wareHouseNo, string row)
+ {
+ //鑾峰彇鍌ㄤ綅淇℃伅
+ List<SysStorageLocat> storagelist = _locatSvc.GetFlatLibraryLegend(wareHouseNo, row);
+
+ //Dictionary<string, int> dic = new Dictionary<string, int>()
+ //{
+ // "B01"
+ //};
+
+ return Ok(new
+ {
+ data = storagelist,
+ //dic,
+ code = 0,
+ msg = ""
+ });
+ }
+
+ #endregion
+
/// <summary>
/// 鏍规嵁鍌ㄤ綅鍦板潃鑾峰彇鍌ㄤ綅涓婄殑鎵樼洏鍜岀墿鍝佷俊鎭�
/// </summary>
@@ -1620,8 +1749,100 @@
{
data = "",
code = 0,
- msg = "鑾峰彇鐗╂枡绫诲埆淇℃伅寮傚父"
+ msg = ex.Message
});
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╂枡绫诲埆涓嬫媺鑿滃崟淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpGet]
+ public IActionResult GetMaterialCategories1()
+ {
+ try
+ {
+ var list = _category.GetMaterialCategories();
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "鑾峰彇鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = ex.Message
+ });
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁Id鑾峰彇鐗╂枡绫诲埆淇℃伅
+ /// </summary>
+ /// <param name="Id">Id</param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ [HttpGet]
+ public IActionResult GetMaterialCategoriesById(int Id)
+ {
+ try
+ {
+ var list = _category.GetMaterialCategoriesById(Id);
+ return Ok(new
+ {
+ data = list,
+ code = 1,
+ msg = "鏍规嵁Id鑾峰彇鐗╂枡绫诲埆淇℃伅鎴愬姛"
+ });
+ }
+ catch (Exception ex)
+ {
+ return Ok(new
+ {
+ data = "",
+ code = 0,
+ msg = ex.Message
+ });
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍖哄煙淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetStorageAreaList()
+ {
+ try
+ {
+ var bolls = _category.GetStorageAreaList();
+
+ List<XmSelectDto> list = new List<XmSelectDto>();
+
+ foreach (var item in bolls)
+ {
+ XmSelectDto list1 = new XmSelectDto()
+ {
+ name = item.AreaName, //鍖哄煙鍚嶇О
+ value = item.AreaNo, //鍖哄煙鍙�
+ selected = false, //鏄惁閫変腑
+ };
+ list.Add(list1);
+ }
+
+ return Ok(new { code = 0, msg = "鍖哄煙淇℃伅", data = bolls, list });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
}
}
@@ -1651,6 +1872,8 @@
var list = _category.InsertMaterialCategories(category);
+ _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绫诲埆", category.CategoryNo, "娣诲姞", "娣诲姞绫诲埆淇℃伅 绫诲埆鍙凤細" + category.CategoryNo, Convert.ToInt32(userId));
+
return Ok(new
{
data = list,
@@ -1666,7 +1889,7 @@
{
data = "",
code = 0,
- msg = "鏂板鐗╂枡绫诲埆淇℃伅寮傚父"
+ msg = ex.Message
});
}
}
@@ -1697,6 +1920,8 @@
var list = _category.ExitMaterialCategories(category);
+ _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绫诲埆", category.CategoryNo, "缂栬緫", "缂栬緫绫诲埆淇℃伅 绫诲埆鍙凤細" + category.CategoryNo, Convert.ToInt32(userId));
+
return Ok(new
{
data = list,
@@ -1712,7 +1937,7 @@
{
data = "",
code = 0,
- msg = "缂栬緫鐗╂枡绫诲埆淇℃伅寮傚父"
+ msg = ex.Message
});
}
}
@@ -1724,7 +1949,7 @@
/// <returns></returns>
/// <exception cref="Exception"></exception>
[HttpPost]
- public IActionResult DeleteMaterialCategories(SysMaterialCategory category)
+ public IActionResult DeleteMaterialCategories(MaterialCategoryDto category)
{
try
{
@@ -1739,9 +1964,11 @@
{
return Ok(new { code = 1, msg = "涓鸿幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- category.UpdateUser = int.Parse(userId);
+ category.UpdateUser = userId;
var list = _category.DeleteMaterialCategories(category);
+
+ _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绫诲埆", category.CategoryNo, "鍒犻櫎", "鍒犻櫎绫诲埆淇℃伅 绫诲埆鍙凤細" + category.CategoryNo, Convert.ToInt32(userId));
return Ok(new
{
@@ -1758,7 +1985,7 @@
{
data = "",
code = 0,
- msg = "鍒犻櫎鐗╂枡绫诲埆淇℃伅寮傚父"
+ msg = ex.Message
});
}
}
--
Gitblit v1.8.0