修改预计出

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

@@ -0,0 +1,175 @@
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.AspNetCore.Mvc;
+using Win_in.Sfs.Auth.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs.IssueJobs;
+
+/// <summary>
+/// </summary>
+[ApiController]
+[Route($"{PdaHostConst.ROOT_ROUTE}job/kitting-issue")]
+public class KittingIssueJobsController : AbpController
+{
+    private readonly IKittingIssueJobAppService _kittingIssueJobAppService;
+
+    private readonly IUserWorkGroupAppService _userWorkGroupAppService;
+
+    public KittingIssueJobsController(IKittingIssueJobAppService kittingIssueJobAppService)
+    {
+        _kittingIssueJobAppService = kittingIssueJobAppService;
+    }
+
+    /// <summary>
+    ///     获取列表
+    /// </summary>
+    /// <param name="pageSize"></param>
+    /// <param name="pageIndex"></param>
+    /// <param name="isFinished"></param>
+    /// <returns></returns>
+    [HttpPost("list")]
+    public virtual async Task<PagedResultDto<KittingIssueJobDTO>> GetListAsync(int pageSize, int pageIndex,
+        bool isFinished)
+    {
+        var status = new List<int>();
+        if (isFinished)
+        {
+            status.Add((int)EnumJobStatus.Done);
+        }
+        else
+        {
+            status.Add((int)EnumJobStatus.Open);
+            status.Add((int)EnumJobStatus.Wait);
+            status.Add((int)EnumJobStatus.Doing);
+            status.Add((int)EnumJobStatus.Partial);
+        }
+
+        var jsonStatus = JsonSerializer.Serialize(status);
+
+        var request = new SfsJobRequestInputBase
+        {
+            MaxResultCount = pageSize,
+            SkipCount = (pageIndex - 1) * pageSize,
+            Sorting = $"{nameof(ContainerJobDTO.CreationTime)} ASC",
+            Condition = new Condition
+            {
+                Filters = new List<Filter> { new(nameof(ContainerJobDTO.JobStatus), jsonStatus, "In") }
+            }
+        };
+
+        var list = await _kittingIssueJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
+
+        return list;
+    }
+
+    /// <summary>
+    ///     承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("take/{id}")]
+    public virtual async Task TakeAsync(Guid id)
+    {
+        await _kittingIssueJobAppService.AcceptAsync(id).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-take/{id}")]
+    public virtual async Task CancelTakeAsync(Guid id)
+    {
+        await _kittingIssueJobAppService.CancelAcceptAsync(id).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    ///     执行任务明细
+    /// </summary>
+    /// <returns></returns>
+    [HttpPost("ExecuteDetail/{masterId}")]
+    public async Task ExecuteDetailAsync(Guid masterId, Guid detailId, KittingIssueJobDetailDTO issueJobDetailDto)
+    {
+        await _kittingIssueJobAppService.ExecuteDetailAsync(masterId,detailId,issueJobDetailDto).ConfigureAwait(false);
+    }
+
+    /// <summary>
+        ///     获取任务数量
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("count")]
+    public virtual async Task<ActionResult<long>> CountAsync()
+    {
+        var status = new List<int>
+        {
+            (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing, (int)EnumJobStatus.Partial, (int)EnumJobStatus.Wait
+        };
+        var jsonStatus = JsonSerializer.Serialize(status);
+
+        var request = new SfsJobRequestInputBase
+        {
+            Sorting = $"{nameof(InspectJobDTO.Priority)} ASC",
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    //new(nameof(InspectJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(InspectJobDTO.JobStatus), jsonStatus, "In")
+                }
+            }
+        };
+
+        var count = await _kittingIssueJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false);
+
+        return Ok(count);
+    }
+
+    /// <summary>
+    ///     获取盘点任务详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("{id}")]
+    public virtual async Task<ActionResult<KittingIssueJobDTO>> GetAsync(Guid id)
+    {
+        var result = await _kittingIssueJobAppService.GetAsync(id).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    ///     根据Job Number 获取盘点任务列表
+    /// </summary>
+    /// <param name="jobNumber"></param>
+    /// <returns></returns>
+    [HttpGet("by-number/{jobNumber}")]
+    public virtual async Task<ActionResult<KittingIssueJobDTO>> GetByNumberAsync(string jobNumber)
+    {
+        var jobDto = await _kittingIssueJobAppService.GetByNumberAsync(jobNumber).ConfigureAwait(false);
+        if (jobDto == null)
+        {
+            throw new UserFriendlyException($"未找到编号为 {jobNumber} 的任务");
+        }
+
+        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        if (!wlgCodes.Contains(jobDto.WorkGroupCode))
+        {
+            return new NotFoundObjectResult($"任务属于工作组 {jobDto.WorkGroupCode}");
+        }
+
+        if (jobDto.JobStatus == EnumJobStatus.Doing && jobDto.AcceptUserId != CurrentUser.Id)
+        {
+            return new NotFoundObjectResult($"任务正在被 {jobDto.AcceptUserName} 处理");
+        }
+
+        return jobDto;
+    }
+}

be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Stores/TransferLibJobController.cs → be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/TransferLibJobController.cs

@@ -31,7 +31,7 @@ public class TransferLibJobController : AbpController
     }
 
     /// <summary>
-    /// 获取盘点任务详情
+    /// 
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>

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

@@ -0,0 +1,35 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Pda.Controllers.Stores;
+
+/// <summary>
+///     Kitting叫料请求
+/// </summary>
+[ApiController]
+[Route($"{PdaHostConst.ROOT_ROUTE}store/kitting-request")]
+public class KittingRequestController : AbpController
+{
+    private readonly IKittingIssueRequestAppService _kittingIssueRequestAppService;
+
+    /// <summary>
+    /// </summary>
+    /// <param name="kittingIssueRequestAppService"></param>
+    public KittingRequestController(IKittingIssueRequestAppService kittingIssueRequestAppService)
+    {
+        _kittingIssueRequestAppService = kittingIssueRequestAppService;
+    }
+
+    /// <summary>
+    ///     Kitting叫料申请
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("")]
+    public virtual async Task CreateAsync(KittingIssueRequestEditInput input)
+    {
+        await _kittingIssueRequestAppService.CreateAndHandleAsync(input).ConfigureAwait(false);
+    }
+}

be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application.Contracts/ExpectOuts/IExpectOutAppService.cs

@@ -45,4 +45,6 @@ public interface IExpectOutAppService
         EnumInventoryStatus enumInventoryStatus,
         string lot,
         decimal qty);
+
+    Task RemoveByNumberAsync(string number);
 }

be/Modules/Inventory/src/Win_in.Sfs.Wms.Inventory.Application/ExpectOuts/ExpectOutAppService.cs

@@ -64,8 +64,6 @@ public class ExpectOutAppService
         if (expectOut != null)
         {
             expectOut.Qty -= qty;
-        }
-
             if (expectOut.Qty == 0)
             {
                 await _repository.DeleteAsync(expectOut).ConfigureAwait(false);
@@ -75,6 +73,17 @@ public class ExpectOutAppService
                 await _repository.UpdateAsync(expectOut).ConfigureAwait(false);
             }
         }
+    }
+
+    [HttpPost("remove/job-number")]
+    public virtual async Task RemoveByNumberAsync(string number)
+    {
+        var expectOut = await _repository.GetListAsync(p => p.JobNumber == number).ConfigureAwait(false);
+        if (expectOut != null && expectOut.Any())
+        {
+            await _repository.DeleteManyAsync(expectOut).ConfigureAwait(false);
+        }
+    }
 
     [HttpPost("remove/{id}")]
     public virtual async Task RemoveAsync(Guid id)

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

@@ -278,6 +278,8 @@ public class KittingIssueJobAppService
             kittingIssueJobDetailDto.Status, kittingIssueJobDetailDto.HandledToLot,
             kittingIssueJobDetailDto.HandledToQty).ConfigureAwait(false);
 
+        await _expectOutAppService.RemoveByNumberAsync(kittingIssueJob.Number).ConfigureAwait(false);
+
         await KittingIssueRequestAppService.UpdateStatusCompletedAsync(kittingIssueJob.KittingRequestNumber)
             .ConfigureAwait(false);