18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-24 15:10:57 +08:00
parent 93466fe435 216a3abf27
commit a608931943
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WMS.Web.Domain/Entitys/MoveBoxRecord.cs
View File

@@ -75,7 +75,7 @@ namespace WMS.Web.Domain.Entitys
/// 创建
/// </summary>
/// <param name="creatorId"></param>
public void Create(MoveBoxType type, int boxId,string orgCode, string stockCode, int subStockId, int creatorId)
public void Create(MoveBoxType type, int boxId,decimal qty, string orgCode, string stockCode, int subStockId, int creatorId)
{
this.BoxId = boxId;
this.Type = type;
@@ -83,6 +83,7 @@ namespace WMS.Web.Domain.Entitys
this.StockCode = stockCode;
SrcSubStockId = type == MoveBoxType.Up ? 0 : subStockId;//上架 原仓位是0 目标仓位有值
DestSubStockId = type == MoveBoxType.Up ? subStockId : 0; //下架 原仓位有值 目标仓位是0
this.Qty = qty;
this.CreatorId = creatorId;
this.CreateTime = DateTime.Now;
}

2
src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
View File

@@ -144,7 +144,7 @@ namespace WMS.Web.Domain.Services
{
var subStock = await _basbicsRepositories.GetSubUcStockAsync(d.SubStockId, loginInfo.UserInfo.CompanyId);
var entity = new MoveBoxRecord();
entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId);
entity.Create(IsUp == true ? MoveBoxType.Up : MoveBoxType.Down, d.BoxId,d.Qty, subStock?.ErpOrgCode, subStock?.StockCode, d.SubStockId, loginInfo.UserInfo.StaffId);
entityList.Add(entity);
}

2
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -88,7 +88,7 @@ namespace WMS.Web.Repositories
if (!string.IsNullOrEmpty(dto.Creator))
{
var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId);
ids = staffList.Where(w => EF.Functions.Like(w.Name, "%" + dto.Creator + "%")).Select(s => s.Id).ToList();
ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
}
#region erp基础资料
List<int> mIds = new List<int>();