From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验
---
Wms/Wms/Controllers/BasisController.cs | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index e208bcb..87c97b8 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -22,6 +22,7 @@
using Model.ModelDto.LogDto;
using Utility;
using Model.ModelVm.LogVm;
+using System.Diagnostics;
namespace Wms.Controllers
{
@@ -62,7 +63,10 @@
/// <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, UserManager userManager)
+ 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, UserManager userManager)
{
_customerSvc = customerSvc;//瀹㈡埛Svc
_logisticsSvc = logisticsSvc;//鐗╂祦Svc
@@ -197,7 +201,7 @@
{
pwdOld = Md5Tools.CalcMd5(pwdOld);
pwdNew = Md5Tools.CalcMd5(pwdNew);
- pwdNewTwo = Md5Tools.CalcMd5(pwdNewTwo);
+ //pwdNewTwo = Md5Tools.CalcMd5(pwdNewTwo);
//鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
SysUserInfor user = await _userInforServer.GetUserInfoById(_userManager.UserId);
if (user == null)
@@ -205,7 +209,7 @@
if (user.PassWord != pwdOld)
throw Oops.Bah("鍘熷瘑鐮佷笉姝ｇ‘");
//淇敼瀵嗙爜
- int i = await _userInforServer.UptUserPassWord(pwdNew, _userManager.UserId);
+ int i = await _userInforServer.UptUserPassWord(pwdNew, pwdNewTwo, _userManager.UserId);
if (i <= 0)
throw Oops.Bah("淇敼瀵嗙爜澶辫触");
}
@@ -321,7 +325,6 @@
/// </summary>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<FunctionMenuDto>> GetRBACLists(int id)
{
return await _rBACServer.GetMenuByroleIdNew(id);
@@ -356,7 +359,13 @@
[HttpGet]
public async Task<List<RoleRightDto>> GetRoleRightList()
{
- return await _roleRightServer.GetRoleMenuList();
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.Start();
+ var model = await _roleRightServer.GetRoleMenuList();
+ stopwatch.Stop();
+
+ var time = stopwatch.ElapsedMilliseconds;
+ return model;
}
/// <summary>
@@ -892,11 +901,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<CustomerDto>> GetCustomerList(GetCustomerVm model)
+ public async Task<SqlSugarPagedList> GetCustomerList(GetCustomerVm model)
{
RefAsync<int> count = new RefAsync<int>();
var bolls = await _customerSvc.GetCustomerList(model.CustomerNo, model.CustomerName, model.Type, model.LinkMan, model.Phone, model.Page, model.Limit, count);
- return new SqlSugarPagedList<CustomerDto>() { Items = bolls, Total = count };
+ return new SqlSugarPagedList() { Items = bolls, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯瀹㈡埛淇℃伅
@@ -974,11 +983,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<LogisticsInfoDto>> GetLogisticsInfoList(GetLogisticsInfoVm model)
+ public async Task<SqlSugarPagedList> GetLogisticsInfoList(GetLogisticsInfoVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _logisticsSvc.GetLogisticsInfoList(model.CarrierName, model.LinkMan, model.Phone, model.LicensePlate, model.Type, model.Page, model.Limit, count);
- return new SqlSugarPagedList<LogisticsInfoDto>() { Items = list, Total = count };
+ return new SqlSugarPagedList() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鐗╂祦淇℃伅
@@ -1034,7 +1043,7 @@
public async Task DelLogisticsInfo(IdVm model)
{
await _logisticsSvc.DelLogisticsInfo(model.Id, _userManager.UserId);
- SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsInfo(model.Id);
+ SysLogisticsInfo logisit = await _logisticsSvc.GetLogisticsDelInfo(model.Id);
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂祦绠＄悊", logisit.CarrierName, "鍒犻櫎", "鍒犻櫎鐗╂祦淇℃伅 鍏徃鍚嶇О锛�" + logisit.CarrierName, _userManager.UserId);
}
/// <summary>
@@ -1058,11 +1067,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<UnitDto>> GetUnitList(GetUnitVm model)
+ public async Task<SqlSugarPagedList> GetUnitList(GetUnitVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _unitSvc.GetUnitList(model.UnitNo, model.UnitName, model.Page, model.Limit, count);
- return new SqlSugarPagedList<UnitDto>() { Items = list, Total = count };
+ return new SqlSugarPagedList() { Items = list, Total = count };
}
/// <summary>
/// 鏌ヨ鍗曟潯鍗曚綅淇℃伅
@@ -1146,11 +1155,11 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<PackagDto>> GetPackagList(GetPackagVm model)
+ public async Task<SqlSugarPagedList> GetPackagList(GetPackagVm model)
{
RefAsync<int> count = new RefAsync<int>();
var list = await _packagSvc.GetPackagList(model.PackagNo, model.PackagName, model.Level, model.Page, model.Limit, count);
- return new SqlSugarPagedList<PackagDto> { Items = list, Total = count };
+ return new SqlSugarPagedList { Items = list, Total = count };
}
/// <summary>
@@ -1211,8 +1220,7 @@
/// </summary>
/// <returns></returns>
[HttpPost]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
- public async Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model)
+ public async Task<SqlSugarPagedList> GetSysOperationList(GetOperationVm model)
{
return await _operation.GetSysOperationList(model);
}
@@ -1223,7 +1231,6 @@
/// <param name="dicName">瀛楀吀鍚嶇О</param>
/// <returns></returns>
[HttpGet]
- [ServiceFilter(typeof(ApiResponseActionFilter))]
public async Task<List<SysDictionary>> GetDicTypeList(string dicName)
{
return await _operation.GetDicTypeList(dicName);
@@ -1238,7 +1245,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<InterfaceDto>> GetInterfaceList(InterfaceVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceList(InterfaceVm model)
{
return await _interface.GetInterfaceList(model);
}
@@ -1249,7 +1256,7 @@
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
- public async Task<SqlSugarPagedList<InterfaceDetailDto>> GetInterfaceDetailList(InterfaceDetailVm model)
+ public async Task<SqlSugarPagedList> GetInterfaceDetailList(InterfaceDetailVm model)
{
return await _interface.GetInterfaceDetailList(model);
}
--
Gitblit v1.8.0