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

修复bug

Browse Source
This commit is contained in:
18942506660
2024-03-18 11:21:11 +08:00
parent 015ce9b6c7
commit d35b7b116e
10 changed files with 242 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
View File

@@ -58,6 +58,13 @@ namespace WMS.Web.Domain.IService.Public
/// <param name="materialId"></param>
/// <returns></returns>
string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, int materialId);
/// <summary>
/// 获取物料基本单位名称
/// </summary>
/// <param name="erpMaterials"></param>
/// <param name="materialnumber"></param>
/// <returns></returns>
string GetMaterialUnitName(List<ErpMaterialDto> erpMaterials, string materialnumber);
/// <summary>
/// 获取物料的条码

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

@@ -114,7 +114,7 @@ namespace WMS.Web.Domain.Services
{
foreach (var bd in box.Details)
{
var bDe = box.Details.FirstOrDefault(f => f.MaterialId == bd.MaterialId);
var bDe = box.Details.FirstOrDefault(f => f.MaterialNumber == bd.MaterialNumber);
if (bDe == null)
return Result.ReFailure(ResultCodes.BoxMateriaNoData);
var ex = bd.SerialNumbers.Except(bDe.SerialNumbers).ToList();
@@ -158,12 +158,12 @@ namespace WMS.Web.Domain.Services
var subIds = dto.Select(s => s.SubStockCode).ToList();
var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockCode).ToList(), loginInfo.UserInfo.CompanyId);
foreach (var dt in dto)
{
var subStock = subStocks.FirstOrDefault(f => f.Code == dt.SubStockCode);
var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId);
var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0));
var subStock_s = subStocks_s.FirstOrDefault(f => f.Code == (boxi?.SubStockCode ?? ""));
foreach (var d in dt.Details)
{
ChangeBoxRecord entity = new ChangeBoxRecord();

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

@@ -133,7 +133,7 @@ namespace WMS.Web.Domain.Services
var boxInventoryDetails = boxInventoryList.SelectMany(s => s.Details).ToList();
foreach (var b in boxInventoryDetails)
{
var num = boxInventoryDetails.Where(w => w.MaterialId == b.MaterialId).Sum(s => s.Qty);
var num = boxInventoryDetails.Where(w => w.MaterialNumber == b.MaterialNumber).Sum(s => s.Qty);
var taskDetail = outStockTask.Details.FirstOrDefault(f => f.MaterialNumber == b.MaterialNumber);
if (taskDetail == null) return Result.ReFailure(ResultCodes.BoxOutStockTaskMaterialError);
//箱子里该物料的总数量大于出库单(应出库数量-已出库数量) 不能出库

2
src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
View File

@@ -181,7 +181,7 @@ namespace WMS.Web.Domain.Services.Public
}
return mat.BaseUnitName;
}
/// <summary>
/// 获取物料的条码
/// </summary>

6
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -145,7 +145,7 @@ namespace WMS.Web.Domain.Services
};
if (moveBoxRecord.Type == MoveBoxType.Up)
{
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockId);
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, moveBoxRecord.DestSubStockCode);
op.Remark += "\r\n" + "仓位:" + srcSubStock;
}
sList.Add(op);
@@ -322,7 +322,7 @@ namespace WMS.Web.Domain.Services
var boxId = inStock.Details.FirstOrDefault(s => s.SerialNumbers.Contains(entity.SerialNumber))?.BoxId ?? 0;
var box = boxList.FirstOrDefault(f => f.Id == boxId);
var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialNumber == entity.MaterialNumber);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockId);
var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, inStock.SubStockCode);
//修改序列号和箱绑定关系
entity.InStock(instockDetail.SourceBillNo, inStock.Type);
entity.Bind(boxId, box?.CompleteCartonTime ?? DateTime.Now);
@@ -410,7 +410,7 @@ namespace WMS.Web.Domain.Services
};
if (backRecord.Type == BackRecordType.OutstockOn)
{
var subStockId = backRecord?.SubStockId ?? 0;
var subStockId = backRecord?.SubStockCode ?? "";
var srcSubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, subStockId);
op.Remark += "\r\n" + "仓位:" + srcSubStock;
}