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-22 17:38:43 +08:00
parent 6cd499ca56 79352ba056
commit fb58f10861
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ namespace WMS.Web.Domain.Entitys
if (idStr.Length >= 8) break;
}
//this.Number = CNSpellTranslator.GetFirstSpell(this.Name) + idStr;
this.BillNo = "CKZL" + idStr;
this.BillNo = "CKRW" + idStr;
}
/// <summary>
@@ -209,6 +209,7 @@ namespace WMS.Web.Domain.Entitys
else
details_new.Add(d);
}
this.CreateTime = list.Max(o => o.CreateTime);//取最新的时间
this.OperatorId = creatorId;
this.OperateTime = DateTime.Now;
this.Status = OutStockStatus.Wait;

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

@@ -29,10 +29,11 @@ namespace WMS.Web.Domain.Services
private readonly IBoxRepositories _boxRepositories;
private readonly ISerialNumberService _serialNumberService;
private readonly IBoxInventoryService _boxInventoryService;
private readonly IBoxInventoryRepositories _boxInventoryRepositories;
public ChangeMoveBoxService(IMapper mapper, ILoginService loginService,
IChangeBoxRecordRepositories changeBoxRecordRepositories, IBasicsRepositories basbicsRepositories,
IMoveBoxRecordRepositories moveBoxRecordRepositories, IBoxRepositories boxRepositories,
ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService)
ISerialNumberService serialNumberService, IBoxInventoryService boxInventoryService, IBoxInventoryRepositories boxInventoryRepositories)
{
_mapper = mapper;
_loginService = loginService;
@@ -42,6 +43,7 @@ namespace WMS.Web.Domain.Services
_boxRepositories = boxRepositories;
_serialNumberService = serialNumberService;
_boxInventoryService = boxInventoryService;
_boxInventoryRepositories = boxInventoryRepositories;
}
/// <summary>
/// 改箱保存
@@ -76,13 +78,13 @@ namespace WMS.Web.Domain.Services
boxList.Add(destBox);
var subStock = await _basbicsRepositories.GetSubUcStockAsync(dto.SubStockId, loginInfo.UserInfo.CompanyId);
var boxInventory = await _boxInventoryRepositories.Get(dto.SrcBoxId);
List<ChangeBoxRecord> list = new List<ChangeBoxRecord>();
foreach (var d in dto.Details)
{
ChangeBoxRecord entity = new ChangeBoxRecord();
entity.Create(loginInfo.UserInfo.StaffId, d.Qty, d.MaterialId, d.SerialNumbers, dto.SrcBoxId, dto.DestBoxId);
entity.SrcSubStockId = 0;//原乡仓位需要去拉一下库存获取
entity.SrcSubStockId = boxInventory?.SubStockId ?? 0;//原乡仓位需要去拉一下库存获取
if (subStock != null)
{
entity.DestSubStockId = dto.SubStockId;