diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs index 1c90136f4..f0b11ec1b 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs @@ -920,8 +920,9 @@ public class AssembleIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { - - if(request.Data.Count==0) + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + + if (request.Data.Count==0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); } @@ -941,7 +942,7 @@ public class AssembleIssueJobAppService { foreach (var detail in entity.Details) { - var detailDto = new KittingIssueJobDetailDTO(); + var detailDto = new AssembleIssueJobDetailDTO(); if (!string.IsNullOrEmpty(detail.TransferLibFromLocationCode)) { var fromloc = new LocationDTO(); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs index a2d5889e3..ed373fa31 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs @@ -933,6 +933,8 @@ public class CoatingIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs index d3d0ca3a3..a0d570f9a 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs @@ -892,6 +892,9 @@ public class InjectionIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs index 9b5938c9c..d7b039baa 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs @@ -894,6 +894,8 @@ public class KittingIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); + if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs index 43704c671..3b94d313c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs @@ -893,6 +893,8 @@ public class SparePartIssueJobAppService [HttpPost("call-back-agv")] public async Task CallBackAgvIssueAsync(AgvRequestDto request) { + + _logger.LogInformation($"发料回库{JsonSerializer.Serialize(request)}"); if (request.Data.Count == 0) { return ReturnMessage("-1", "请求Data明细数量不能为0"); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index 4b69e0b91..bc856a819 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs @@ -78,7 +78,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase IPostionLocationAppService postionLocationAppService, IItemBasicAppService itemBasicAppService, UnitOfWorkManager unitOfWorkManager, - IProductionLineAppService _productionLineAppService, + IProductionLineAppService productionLineAppService, IExpectOutAppService expectOutAppService) : base(repository) { _unitOfWorkManager = unitOfWorkManager; @@ -96,6 +96,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase _agvOptions = agvOptions; _postionLocationAppService = postionLocationAppService; _itemBasicAppService = itemBasicAppService; + _productionLineAppService = productionLineAppService; } #region 东阳使用 @@ -701,7 +702,6 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase var transferNoteDetailInputs = new List(); var detailInput = new TransferNoteDetailInput(); - var fromlocation = await _locationAppService.GetByCodeAsync(detail.BeginPosition).ConfigureAwait(false); @@ -710,23 +710,26 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase errors.Add($"来源起始点{detail.BeginPosition}库位没查到"); } - LocationDTO tolocation = await _locationAppService.GetByCodeAsync(detail.EndPosition).ConfigureAwait(false); - if (tolocation == null) + if (detail.OrderType != "90" && detail.OrderType != "1") { - errors.Add($"结束点{detail.EndPosition}库位没查到"); + throw new UserFriendlyException("类型不是MES冻结解冻或完工转储类型(50、51)"); } - var productionline=await _productionLineAppService.GetByLocationCodeAsync(tolocation.Code).ConfigureAwait(false); - if (productionline == null) + + if(detail.OrderType=="1") { - errors.Add($"结束点{detail.EndPosition}库位不在生产线中!"); + var productionline = await _productionLineAppService.GetByLocationCodeAsync(fromlocation.Code).ConfigureAwait(false); + if (productionline == null) + { + errors.Add($"结束点{detail.BeginPosition}库位不在生产线中!"); + } } + LocationDTO tolocation = await _locationAppService.GetByCodeAsync(detail.EndPosition).ConfigureAwait(false); + if (tolocation == null) + { + errors.Add($"结束点{detail.EndPosition}库位没查到"); + } - - transfer.Type = productionline.ProductionLineType.ToString(); - - - //switch (tolocation.WarehouseCode) //{ diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs index 1187f1a9c..2c565672c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs @@ -306,10 +306,8 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase @@ -319,14 +317,13 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase p.HandledToQty); } - requestDetail.IssuedQty = allIssuedQty; requestDetail.ReceivedQty = allReceivedQty; } } await _repository.UpdateAsync(kittingIssueRequest).ConfigureAwait(false); - await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false); + //await _tranferLibRequestAppService.CancelByCallRequestNumberAsync(jobNumber).ConfigureAwait(false); } #endregion