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 fca185326..b2e8329f1 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 @@ -1018,12 +1018,13 @@ public class AssembleIssueJobAppService #if DEBUG #endif var errors = new List(); - var ret = new AgvResultObject - { - Code = "0", - Message = "OK", - ReqCode = "", - }; + + var ret = ReturnMessage("0", "OK"); + + + + + using var unitOfWork = _unitOfWorkManager.Begin(); try { @@ -1066,12 +1067,8 @@ public class AssembleIssueJobAppService } if (errors.Count > 0) { - return ret = new AgvResultObject() - { - Code = "-1", - ReqCode = "", - Message = string.Join(",", errors.ToArray()) - }; + return ReturnMessage("-1", string.Join(",", errors.ToArray())); + } detailInput.ToLocationCode = tolocationDto.Code; detailInput.ToLocationGroup = tolocationDto.LocationGroupCode; @@ -1107,24 +1104,13 @@ public class AssembleIssueJobAppService } catch (Exception ex) { - ret = new AgvResultObject - { - Code = "-1", - ReqCode = "", - Message = ex.Message - }; + ret = ReturnMessage("-1", ex.Message); await unitOfWork.RollbackAsync().ConfigureAwait(false); - } if (errors.Count > 0) { - ret = new AgvResultObject - { - Code = "-1", - Message = string.Join(",", errors.ToArray()), - ReqCode = "" - }; + ret = ReturnMessage("-1", string.Join(",",errors.ToArray())); await unitOfWork.RollbackAsync().ConfigureAwait(false); } return ret; @@ -1147,6 +1133,17 @@ public class AssembleIssueJobAppService #if DEBUG #endif + return + new AgvResultObject + { + Code = "0", + ReqCode = job.AssembleRequestNumber, + Message = "OK" + }; + + + + var ret = new AgvResultObject { Code = "0", 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 c505fa4b7..c860c2d95 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 @@ -1008,8 +1008,8 @@ public class CoatingIssueJobAppService /// /// 返回信息 /// - /// 0成功其他失败 - /// OK成功其他错误信息 + /// 0成功其他失败 + /// OK成功其他错误信息 /// private AgvResultObject ReturnMessage(string code, string message) { @@ -1170,6 +1170,11 @@ public class CoatingIssueJobAppService ReqCode = job.CoatingRequestNumber, Message = "OK" }; + + return ret;//暂时无接口直接返回 + + + using var unitOfWork = _unitOfWorkManager.Begin(); try { 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 d728e68f5..f50a6ca7e 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 @@ -258,8 +258,22 @@ public class InjectionIssueJobAppService jobDetail.TransferLibToQty = transferLibNoteDetail.HandledToQty; jobDetail.TransferLibToSupplierBatch = transferLibNoteDetail.HandledToSupplierBatch; jobDetail.TransferLibToWarehouseCode = transferLibNoteDetail.HandledToWarehouseCode; + var jobDto = ObjectMapper.Map(job); + var isDoingAgv = await DoingAgvAsync(jobDto, jobDetail.TransferLibToLocationCode, jobDetail.RecommendToLocationCode).ConfigureAwait(false); - await _repository.UpdateAsync(job).ConfigureAwait(false); + if (isDoingAgv) + { + job.JobStatus = EnumJobStatus.WaitAgv; + job.IsClaims = true; + job.ClaimsUserId = string.IsNullOrEmpty(_options.Value.StereosUser) + ? "AGV" + : _options.Value.StereosUser; + job.ClaimsUserName = string.IsNullOrEmpty(_options.Value.StereosPassword) + ? "AGV" + : _options.Value.StereosPassword; + } + + job = await _repository.UpdateAsync(job).ConfigureAwait(false); } /// @@ -1119,6 +1133,10 @@ public class InjectionIssueJobAppService ReqCode = job.InjectionRequestNumber, Message = "OK" }; + + return ret;//暂时无接口直接返回 + + using var unitOfWork = _unitOfWorkManager.Begin(); try { 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 d411cfca9..d5525a364 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 @@ -1132,6 +1132,8 @@ public class KittingIssueJobAppService ReqCode = job.KittingRequestNumber, Message = "OK" }; + return ret;//暂时无接口直接返回 + using var unitOfWork = _unitOfWorkManager.Begin(); try { 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 8d888a483..be508225a 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 @@ -1134,6 +1134,7 @@ public class SparePartIssueJobAppService ReqCode = job.SparePartRequestNumber, Message = "OK" }; + return ret;//暂时无接口直接返回 using var unitOfWork = _unitOfWorkManager.Begin(); try { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs index 392a66530..3b12d6686 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs @@ -738,25 +738,18 @@ public class UnplannedIssueJobAppService { return ReturnMessage("-1", "请求明细Data数量不能为0"); } - var agvRequest = request.Data.First(); var job = await _repository.FindAsync(p => p.Number == agvRequest.OrderNum).ConfigureAwait(false); if (job == null) { - return ReturnMessage("-1", $"{agvRequest.OrderNum}未找到该任务"); - } if (job.JobStatus != EnumJobStatus.WaitAgv) { - return ReturnMessage("-1", "该任务状态不是等待AGV中"); - } - - var toLocationDto = await _locationAppService.GetByCodeAsync(agvRequest.EndPosition ).ConfigureAwait(false);//agvRequest.BeginPosition调试时确认 if (toLocationDto == null) { @@ -810,12 +803,19 @@ public class UnplannedIssueJobAppService #if DEBUG return new AgvResultObject(); #endif + + + + var ret = new AgvResultObject { Code = "0", ReqCode = job.UnplannedIssueRequestNumber, Message = "OK" }; + + return ret;//暂时无接口直接返回 + using var unitOfWork = _unitOfWorkManager.Begin(); try { diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs index ede6b06fd..19b10a2d5 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs @@ -450,12 +450,16 @@ public class UnplannedReceiptJobAppService #if DEBUG return new AgvResultObject(); #endif + + var ret = new AgvResultObject { Code = "0", ReqCode = job.UnplannedReceiptRequestNumber, Message = "OK" }; + return ret;//暂时无接口直接返回 + using var unitOfWork = _unitOfWorkManager.Begin(); try {