修改 kitting编辑

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/ThirdLocationJobController.cs

@@ -51,10 +51,11 @@ public class ThirdLocationJobController : AbpController
     ///     执行任务明细
     /// </summary>
     /// <returns></returns>
-    [HttpPost("ExecuteDetail/{masterId}")]
-    public async Task ExecuteDetailAsync(Guid masterId, List<ThirdLocationJobDetailDTO> detailDtoList)
+    [HttpPost("ExecuteDetail")]
+    public virtual async Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList)
     {
-        await _thirdLocationJobAppService.ExecuteDetailAsync(masterId,detailDtoList).ConfigureAwait(false);
+        return await _thirdLocationJobAppService.ExecuteDetailAsync(detailDtoList).ConfigureAwait(false);
+        //return await _thirdLocationJobAppService.ExecuteDetail2Async(detailDtoList).ConfigureAwait(false);
     }
 
     /// <summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Kittings/KittingAppService.cs

@@ -110,30 +110,7 @@ public class KittingAppService : SfsBaseDataWithCodeAppServiceBase<Kitting, Kitt
     [Route("{id}")]
     public override async Task<KittingDTO> UpdateAsync(Guid id, KittingEditInput input)
     {
-        var detailquery = await _repository.WithDetailsAsync().ConfigureAwait(false);
-        var first = detailquery.FirstOrDefault(p => p.Code == input.Code);
-        if (first != null)
-        {
-            throw new UserFriendlyException($"已存在编码:{input.Code}的Kitting箱");
-        }
-        else
-        {
-            return await base.UpdateAsync(id, input).ConfigureAwait(false);
-        }
-        //var detailquery = _repository.WithDetails();
-        //var first = detailquery.FirstOrDefault(p => p.Id == id);
-        //var ids=input.Details.Select(p => p.Id);
-        //first.Details.Where(p =>ids.Contains(p.Id));
-       
-
-        //var entity = ObjectMapper.Map<KittingEditInput, Kitting>(input);
-        ////entity.SetId(id);
-        ////entity.Code = first.Code;
-        //await _repository.UpsertAsync(entity).ConfigureAwait(false);
-        //var firstEntity = detailquery.FirstOrDefault(p => p.Id == id);
-        //return ObjectMapper.Map<Kitting, KittingDTO>(first);
-
-
+        return await base.UpdateAsync(id, input).ConfigureAwait(false);
     }
 
     [HttpPost("update")]

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/ThirdLocationJobs/IThirdLocationJobAppService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,11 +9,6 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public interface IThirdLocationJobAppService
     : ISfsJobAppServiceBase<ThirdLocationJobDTO, SfsJobRequestInputBase, ThirdLocationJobCheckInput, ThirdLocationJobEditInput>
 {
-    /// <summary>
-    ///     执行任务明细
-    /// </summary>
-    /// <returns></returns>
-    Task ExecuteDetailAsync(Guid masterId,List<ThirdLocationJobDetailDTO> detailDto);
 
     Task<List<ThirdLocationJobDTO>> GetByRequestNumberAsync(string requestNumber);
 
@@ -23,4 +18,11 @@ public interface IThirdLocationJobAppService
     /// <param name="id"></param>
     /// <returns></returns>
     Task CompleteAsync(Guid id);
+
+    /// <summary>
+    ///     执行任务明细
+    /// </summary>
+    /// <returns></returns>
+    Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList);
+    
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ThirdLocationJobs/ThirdLocationJobAppService.cs

@@ -84,10 +84,10 @@ public class ThirdLocationJobAppService
     ///     执行任务明细
     /// </summary>
     /// <returns></returns>
-    [HttpPost("ExecuteDetail/{masterId}")]
-    public async Task ExecuteDetailAsync(Guid masterId,List<ThirdLocationJobDetailDTO> detailDtoList)
+    [HttpPost("execute-detail")]
+    public virtual async Task<ThirdLocationJobDTO> ExecuteDetailAsync(List<ThirdLocationJobDetailDTO> detailDtoList)
     {
-        var thirdLocationJob=await _repository.GetAsync(masterId).ConfigureAwait(false);
+        var thirdLocationJob=await _repository.GetAsync(detailDtoList.First().MasterID).ConfigureAwait(false);
         thirdLocationJob.JobStatus = EnumJobStatus.Partial;
 
         var tempDetailDto= new List<ThirdLocationJobDetailDTO>();
@@ -105,7 +105,7 @@ public class ThirdLocationJobAppService
         var transferLogs = await BuildTransferLogsByFromTransportAsync(thirdLocationJob, tempDetailDto).ConfigureAwait(false);
         await _transferLogAppService.AddManyAsync(transferLogs).ConfigureAwait(false);
 
-        var jobDto=await GetAsync(masterId).ConfigureAwait(false);
+        var jobDto=await GetAsync(detailDtoList.First().MasterID).ConfigureAwait(false);
         var tempDetailDtos = new List<ThirdLocationJobDetailDTO>();
         foreach (var detailDto in detailDtoList)
         {
@@ -122,7 +122,9 @@ public class ThirdLocationJobAppService
 
         await UpdateJobStatusAsync(thirdLocationJob).ConfigureAwait(false);
 
-        await _repository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
+        var result=await _repository.UpdateAsync(thirdLocationJob).ConfigureAwait(false);
+
+        return ObjectMapper.Map<ThirdLocationJob, ThirdLocationJobDTO>(result);
     }
 
     /// <summary>