diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs index c219299d0..2b680a649 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/AgvJobs/AgvJobOutputService.cs @@ -76,8 +76,8 @@ public class AgvJobOutputService : ApplicationService - - ///// + + /////// ///// 装配闻荫调用海康AGV接口测试 ///// ///// @@ -85,8 +85,11 @@ public class AgvJobOutputService : ApplicationService //[HttpPost("assemble-test-callagv-id")] //public async Task Assemble_CallAgvAsync(Guid id) //{ - // var jobdto= await _assembleIssueJobAppService.GetAsync(id).ConfigureAwait(false); - // var ret= await _assembleIssueJobAppService.CallAgvAsync(jobdto,"123","321").ConfigureAwait(false); + // var jobdto = await _assembleIssueJobAppService.GetAsync(id).ConfigureAwait(false); + + + + // var ret = await _assembleIssueJobAppService.CallAgvAsync(jobdto, "123", "321").ConfigureAwait(false); // return ret; //} @@ -109,7 +112,7 @@ public class AgvJobOutputService : ApplicationService //[HttpPost("coating-test-callagv-id")] //public async Task Coating_CallAgvAsync(Guid id) //{ - // var jobdto= await _coatingIssueJobAppService.GetAsync(id).ConfigureAwait(false); + // var jobdto = await _coatingIssueJobAppService.GetAsync(id).ConfigureAwait(false); // var ret = await _coatingIssueJobAppService.CallAgvAsync(jobdto).ConfigureAwait(false); // return ret; //} @@ -155,7 +158,7 @@ public class AgvJobOutputService : ApplicationService //[HttpPost("kitting-test-callagv-id")] //public async Task Kitting_CallAgvAsync(Guid id) //{ - // var jobdto=await _kittingIssueJobAppService.GetAsync(id).ConfigureAwait(false); + // var jobdto = await _kittingIssueJobAppService.GetAsync(id).ConfigureAwait(false); // var ret = await _kittingIssueJobAppService.CallAgvAsync(jobdto).ConfigureAwait(false); // return ret; //} @@ -240,7 +243,7 @@ public class AgvJobOutputService : ApplicationService // var ret = await _unplannedReceiptJobAppService.CallAgvAsync(jobdto).ConfigureAwait(false); // return ret; //} - + 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 e10234455..b5086a7d1 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 @@ -490,7 +490,7 @@ public class AssembleIssueJobAppService var jobDto=ObjectMapper.Map(job); - var isDoingAgv=await DoingAgvAsync(jobDto, transferLibNoteDetail.HandledToLocationCode, jobDetail.RecommendToLocationCode).ConfigureAwait(false); + var isDoingAgv=await DoingAgvAsync(jobDto, transferLibNoteDetail.HandledFromLocationCode, jobDetail.RecommendToLocationCode).ConfigureAwait(false); if (isDoingAgv) { 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 ad19e004d..953b452e0 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 @@ -1170,7 +1170,7 @@ public class CoatingIssueJobAppService Message = "OK" }; - return ret;//暂时无接口直接返回 + //return ret;//暂时无接口直接返回 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 45484b4ca..a247cfddb 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 @@ -1131,7 +1131,7 @@ public class InjectionIssueJobAppService Message = "OK" }; - return ret;//暂时无接口直接返回 + using var unitOfWork = _unitOfWorkManager.Begin(); 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 a0ba1e316..ad874747f 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 @@ -1128,7 +1128,7 @@ public class KittingIssueJobAppService ReqCode = job.KittingRequestNumber, Message = "OK" }; - return ret;//暂时无接口直接返回 + // 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 b0b9beebb..7ba61be8d 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,7 +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/Notes/TransferNotes/TransferNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs index d446f24b2..129e99eb1 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 @@ -450,7 +450,7 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase private async Task CheckPackingCode(string packingCode) { var packingcode = await _expectOutAppService.GetListByPackingCodeAsync(packingCode).ConfigureAwait(false); - if (packingcode != null) + if (packingcode != null && packingCode.Any()) { throw new UserFriendlyException($"箱码{packingCode}在预计出中已存在!"); }