fjykTec/ModernWMS
1
1
Fork 0
mirror of https://github.com/fjykTec/ModernWMS.git synced 2024-09-20 06:56:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release'

Browse source
This commit is contained in:
liufu 2023-03-16 15:28:59 +08:00
parent f1ac12d997 89570f4032
commit 8e0972b392
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/ModernWMS.Core/Models/MultiLanguage.en-us.resx
View file

@ -639,4 +639,10 @@
<data name="old_password" xml:space="preserve">
<value>old password</value>
</data>
<data name="location_exist_stock_not_delete" xml:space="preserve">
<value>Inventory exists in the warehouse location. Cannot delete the warehouse location</value>
</data>
<data name="username_existed" xml:space="preserve">
<value>User name already exists</value>
</data>
</root>

6
backend/ModernWMS.Core/Models/MultiLanguage.zh-cn.resx
View file

@ -639,4 +639,10 @@
<data name="old_password" xml:space="preserve">
<value>旧密码</value>
</data>
<data name="location_exist_stock_not_delete" xml:space="preserve">
<value>库位存在库存，不能删除</value>
</data>
<data name="username_existed" xml:space="preserve">
<value>用户名已存在</value>
</data>
</root>

7
backend/ModernWMS.WMS/Services/Goodslocation/GoodslocationService.cs
View file

@ -212,7 +212,12 @@
/// <returns></returns>
public async Task<(bool flag, string msg)> DeleteAsync(int id)
{
var qty = await _dBContext.GetDbSet<GoodslocationEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();
var exist_stock = await _dBContext.GetDbSet<StockEntity>().AsNoTracking().Where(t => t.qty > 0 && t.goods_location_id == id).AnyAsync();
if (exist_stock)
{
return (false, _stringLocalizer["location_exist_stock_not_delete"]);
}
var qty = await _dBContext.GetDbSet<GoodslocationEntity>().Where(t => t.id.Equals(id)).ExecuteDeleteAsync();
if (qty > 0)
{
return (true, _stringLocalizer["delete_success"]);

5
backend/ModernWMS.WMS/Services/user/UserService.cs
View file

@ -309,6 +309,11 @@ namespace ModernWMS.WMS.Services
public async Task<(bool flag, string msg)> Register(RegisterViewModel viewModel)
{
var DbSet = _dBContext.GetDbSet<userEntity>();
var num_exist = await DbSet.AnyAsync(t => t.user_num == viewModel.user_name);
if (num_exist)
{
return (false, _stringLocalizer["username_existed"]);
}
var entity = viewModel.Adapt<userEntity>();
var time = DateTime.Now;
entity.user_num = entity.user_name;