From 9b0e1426f7c05eccf2f27deedf132ea93342eda1 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期一, 05 二月 2024 11:12:52 +0800
Subject: [PATCH] 储位管理增加批量禁止选中多种仓库限制，区域管理新增代码。
---
Wms/Wms/Controllers/SysController.cs | 94 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 93 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/SysController.cs b/Wms/Wms/Controllers/SysController.cs
index 94988f0..ac02a38 100644
--- a/Wms/Wms/Controllers/SysController.cs
+++ b/Wms/Wms/Controllers/SysController.cs
@@ -735,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>
@@ -1012,7 +1056,7 @@
}
}
/// <summary>
- /// 娣诲姞鍌ㄤ綅淇℃伅
+ /// 娣诲姞绔嬩綋搴撳偍浣嶄俊鎭�
/// </summary>
/// <param name="model">妯″瀷</param>
/// <returns></returns>
@@ -1057,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>
--
Gitblit v1.8.0