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-12-29 15:02:39 +08:00
parent a68436cee6 2e2806c3b0
commit af2d418154
7 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,13 +247,22 @@ namespace WMS.Web.Domain.Services
{
_logger.LogInformation($"移箱:{JsonConvert.SerializeObject(dto)} 是否上架:{IsUp} 操作人:{loginInfo.UserInfo.StaffId}");
//1.下架时 需要验证箱是否在库存里
var boxIds = dto.Select(s => s.BoxId).ToList();
var boxList = await _boxInventoryRepositories.GetList(boxIds);
if (!IsUp)
{
var boxIds = dto.Select(s => s.BoxId).ToList();
var boxList = await _boxInventoryRepositories.GetList(boxIds);
if (boxIds.Count() != boxList.Count())
return Result.ReFailure(ResultCodes.BoxInventoryNoDataError);
}
else
{
//上架时 箱子不能在库存里
if (boxList.Count() > 0)
{
var boxs = await _boxRepositories.GetEntityList(boxList.Select(s => s.BoxId).ToList());
return Result.ReFailure($"箱号{ string.Join(",", boxs.Select(s => s.BoxBillNo))} 已上架", 343433);
}
}
List<MoveBoxRecord> entityList = new List<MoveBoxRecord>();
foreach (var d in dto)
{

3
src/WMS.Web.Domain/Services/TakeStockService.cs
View File

@@ -218,10 +218,7 @@ namespace WMS.Web.Domain.Services
UnitId = new ErpNumberDto(unitNumber), //物料带出来
StockId = new ErpNumberDto(d.StockCode),
SubStockId = new ErpSubStockDto(d.StockCode, d.Erp_SubStockCode),
BeforeQty = d.BeforeQty,
AfterQty = d.AfterQty,
FinalQty = entity.ResultType == TakeStockType.Profit ? d.FinalQty : 0,
LossQty = entity.ResultType == TakeStockType.Loss ? d.FinalQty : 0,
Fnote = d.Remark
});
}

1
src/WMS.Web.Domain/Values/ResultCodes.cs
View File

@@ -66,6 +66,7 @@ namespace WMS.Web.Domain.Values
public static ValueTuple<int, string> BoxInventoryHaveInventoryError = (800013, "箱号已上架入库");
public static ValueTuple<int, string> InventoryInOutDetailsWriteError = (800014, "写入物料收发明细失败！");
public static ValueTuple<int, string> InventoryDetailsWriteError = (800014, "写入即时库存明细失败！");
public static ValueTuple<int, string> MoveInventoryError = (800015, "箱已经上架,不能重复上架");
public static ValueTuple<int, string> SerialNumbersNoData = (610000, "序列号不存在");
public static ValueTuple<int, string> SerialNumbersBoxError = (610002, "序列号已经绑定箱");