From 33572be8da5fd6534b56e1e22d70e8cf56f5fe41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 27 四月 2025 17:00:11 +0800
Subject: [PATCH] 开发料桶转运功能
---
Wms/Wms/Controllers/BasisController.cs | 97 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index eac6a92..f059a89 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -44,6 +44,7 @@
private readonly IFunSettingServer _setting; //鍔熻兘璁惧畾
private readonly IInterfaceServer _interface;//鎺ュ彛绠＄悊
private readonly IOperationSysServer _operation; //鎿嶄綔鏃ュ織
+ private readonly IRoleWareHouseServer _roleWareSvs; //鎿嶄綔鏃ュ織
/// <summary>
/// 鏋勯�犲嚱鏁�
/// </summary>
@@ -58,7 +59,7 @@
/// <param name="department">閮ㄩ棬</param>
/// <param name="setting">鍔熻兘璁惧畾</param>
/// <param name="operation">鎿嶄綔鏃ュ織</param>
- public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation)
+ public BasisController(ICustomerServer customerSvc, ILogisticsInfoServer logisticsSvc, IUserInforServer userInforServer, IRolesServer rolesServer, IRoleRightServer roleRightServer, IRBACServer rBACServer, IUnitServer unitSvc, IPackagServer packagServer, IMaterialsServer mate, IDepartmentServer department, IFunSettingServer setting, IInterfaceServer interfaceS, IOperationSysServer operation, IRoleWareHouseServer roleWareSvs)
{
_customerSvc = customerSvc;//瀹㈡埛Svc
_logisticsSvc = logisticsSvc;//鐗╂祦Svc
@@ -73,6 +74,7 @@
_setting = setting; //鍔熻兘璁惧畾
_interface = interfaceS;//鎺ュ彛绠＄悊
_operation = operation; //鎿嶄綔鏃ュ織
+ _roleWareSvs = roleWareSvs;
}
//鍩烘湰淇℃伅绠＄悊
@@ -754,6 +756,99 @@
#endregion
+ #region 瑙掕壊浠撳簱鏉冮檺
+
+ /// <summary>
+ /// 鑾峰彇瑙掕壊鏉冮檺淇℃伅鍒楄〃(鍗曡〃)
+ /// </summary>
+ /// <param name="id">瑙掕壊鏉冮檺id</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetRoleWareHouseOneListById(int id)
+ {
+ try
+ {
+ List<SysRoleWareHouse> roleRights = _roleWareSvs.GetRoleWareHouseOneListById(id);
+ return Ok(new { data = roleRights, msg = "鎴愬姛", core = 0 });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", msg = e.Message, core = 1 });
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁瑙掕壊id鑾峰彇褰撳墠鎵�鎷ユ湁鏉冮檺
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetHouseList()
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+ string UserId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(UserId))
+ {
+ throw new Exception("鏈幏鍙栧埌鐢ㄦ埛淇℃伅");
+ }
+
+ var housedto = _roleWareSvs.GetHouseList(UserId);
+ return Ok(new { data = housedto, code = 0, msg = "鎴愬姛" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { data = "", msg = e.Message, core = 1 });
+ }
+
+ }
+
+ /// <summary>
+ /// 鍒嗛厤瑙掕壊鏉冮檺淇℃伅
+ /// </summary>
+ /// <param name="WareHouseNo">鑿滃崟鍙�</param>
+ /// <param name="id">瑙掕壊id</param>
+ /// <returns></returns>
+ /// <exception cref="Exception">鎹曡幏寮傚父</exception>
+ [HttpPost]
+ public async Task<IActionResult> InsertRoleWareHouse(string WareHouseNo, int id)
+ {
+ //鎹曡幏寮傚父
+ try
+ {
+ //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+
+ //鏍规嵁Id鑾峰彇瑙掕壊鍙�
+ SysRoles roles = _rolesServer.GetRoleInfoById(id);
+
+ //淇濆瓨瑙掕壊鏉冮檺淇℃伅
+ int i = await _roleWareSvs.InsertRoleWareHouse(WareHouseNo, roles.RoleNo, userId);
+ //鍒ゆ柇鏄惁鏂板鎴愬姛
+ if (i == 0)
+ {
+ return Ok(new { data = i, msg = "鍒嗛厤澶辫触", code = 1 });
+ }
+ else
+ {
+ await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roles.RoleNo, "淇敼", "鍒嗛厤浠撳簱鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo, Convert.ToInt32(userId));
+ return Ok(new { data = i, msg = "鍒嗛厤鎴愬姛", code = 0 });
+ }
+ }
+ catch (Exception ex)
+ {
+ return Ok(new { data = "", msg = "鏂板瑙掕壊鏉冮檺淇℃伅寮傚父"+ ex.Message, code = 1 });
+ }
+ }
+
+
+ #endregion
+
#region 閮ㄩ棬绠＄悊
/// <summary>
--
Gitblit v1.8.0