修改 Kitting

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

@@ -173,4 +173,15 @@ public class KittingIssueJobsController : AbpController
 
         return jobDto;
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="requestNumber"></param>
+    /// <returns></returns>
+    [HttpPost("by-request-number/{requestNumber}")]
+    public virtual async Task<List<KittingIssueJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    {
+        return await _kittingIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false);
+    }
 }

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/IssueRequest/KittingRequestController.cs

@@ -73,10 +73,10 @@ public class KittingRequestController : AbpController
         {
             MaxResultCount = pageSize,
             SkipCount = (pageIndex - 1) * pageSize,
-            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Sorting = $"{nameof(KittingIssueRequestDTO.CreationTime)} ASC",
             Condition = new Condition
             {
-                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+                Filters = new List<Filter> { new(nameof(KittingIssueRequestDTO.RequestStatus), jsonStatus, "In") }
             }
         };
 
@@ -122,4 +122,14 @@ public class KittingRequestController : AbpController
         var result = await _kittingIssueRequestAppService.GetAsync(id).ConfigureAwait(false);
         return Ok(result);
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("IsHasNewJob")]
+    public virtual async Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber)
+    {
+        return await _kittingIssueRequestAppService.IsHasNewJobAsync(requestNumber, jobNumber).ConfigureAwait(false);
+    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/KittingIssueRequests/IKittingIssueRequestAppService.cs

@@ -12,4 +12,5 @@ public interface IKittingIssueRequestAppService
 {
     Task<KittingIssueRequestDTO> CreateAndHandleAsync(KittingIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
+    Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs

@@ -79,10 +79,10 @@ public class KittingIssueJobAppService
     }
 
 
-    [HttpPost("cancel-by-request/{injectionNumber}")]
-    public virtual async Task CancelByMaterialRequestAsync(string injectionNumber)
+    [HttpPost("cancel-by-request/{requestNumber}")]
+    public virtual async Task CancelByMaterialRequestAsync(string requestNumber)
     {
-        var entities = await _repository.GetListAsync(p => p.KittingRequestNumber == injectionNumber)
+        var entities = await _repository.GetListAsync(p => p.KittingRequestNumber == requestNumber)
             .ConfigureAwait(false);
         foreach (var entity in entities)
         {
@@ -154,6 +154,7 @@ public class KittingIssueJobAppService
     public async Task ExecuteDetailAsync(Guid masterId, Guid detailId, KittingIssueJobDetailDTO issueJobDetailDto)
     {
         var kittingIssueJob = await _repository.GetAsync(masterId).ConfigureAwait(false);
+        kittingIssueJob.JobStatus = EnumJobStatus.Doing;
 
         var kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
         kittingIssueJobDto.Details = new List<KittingIssueJobDetailDTO> { issueJobDetailDto };
@@ -162,7 +163,7 @@ public class KittingIssueJobAppService
 
         kittingIssueJobDto = ObjectMapper.Map<KittingIssueJob, KittingIssueJobDTO>(kittingIssueJob);
 
-        if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.QtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
+        if (kittingIssueJob.EnumIssueSendType == EnumIssueSendType.BoxQtyType) //按箱叫料 因为任务只有1箱 所以可以直接完成
         {
             await UpdateJobStatusDoneAsync(kittingIssueJob, issueJobDetailDto).ConfigureAwait(false);
         }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/KittingIssueRequests/KittingIssueRequestAppService.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -175,6 +176,33 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         kittingIssueRequest.RequestStatus = EnumRequestStatus.Completed;
     }
 
+    [HttpPost("IsHasNewJob")]
+    public async Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber)
+    {
+        var joblIssueJobDtos=await _kittingIssueJobAppService.GetByRequestNumberAsync(requestNumber).ConfigureAwait(false);
+        if (joblIssueJobDtos != null && joblIssueJobDtos.Any())
+        {
+            var jobNumberList = joblIssueJobDtos.Select(p => p.Number);
+
+            var difference = jobNumberList.Except(jobNumber);
+            if (difference.Any())
+            {
+                var result = "已生成任务号";
+                difference.ForEach(p=> result+="【"+p+"】");
+                result += "的任务";
+                return result;
+            }
+            else
+            {
+                return "无任务生成，请检查库存";
+            }
+        }
+        else
+        {
+            return "无任务生成，请检查库存";
+        }
+    }
+
     #region 校验
 
     private void CheckStatus(EnumRequestStatus targetStatus, EnumRequestStatus nowStatus)