添加 发料的承接

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/DTOs/AssembleIssueJobDTO.cs

@@ -38,4 +38,24 @@ public class AssembleIssueJobDTO : SfsJobDTOBase<AssembleIssueJobDetailDTO>
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
 
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/AssembleIssueJobs/Inputs/AssembleIssueJobEditInput.cs

@@ -66,5 +66,26 @@ public class AssembleIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCre
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/DTOs/CoatingIssueJobDTO.cs

@@ -37,4 +37,25 @@ public class CoatingIssueJobDTO : SfsJobDTOBase<CoatingIssueJobDetailDTO>
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/Inputs/CoatingIssueJobEditInput.cs

@@ -66,5 +66,26 @@ public class CoatingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCrea
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/DTOs/InjectionIssueJobDTO.cs

@@ -37,4 +37,25 @@ public class InjectionIssueJobDTO : SfsJobDTOBase<InjectionIssueJobDetailDTO>
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/InjectionJobs/Inputs/InjectionIssueJobEditInput.cs

@@ -66,5 +66,26 @@ public class InjectionIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/DTOs/KittingIssueJobDTO.cs

@@ -37,4 +37,25 @@ public class KittingIssueJobDTO : SfsJobDTOBase<KittingIssueJobDetailDTO>
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/KittingIssueJobs/Inputs/KittingIssueJobEditInput.cs

@@ -66,5 +66,26 @@ public class KittingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCrea
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/DTOs/SparePartIssueJobDTO.cs

@@ -37,4 +37,25 @@ public class SparePartIssueJobDTO : SfsJobDTOBase<SparePartIssueJobDetailDTO>
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/SparePartIssueJobs/Inputs/SparePartIssueJobEditInput.cs

@@ -66,5 +66,26 @@ public class SparePartIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     public bool UseOnTheWayLocation { get; set; }
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJobAppService.cs

@@ -15,6 +15,9 @@ using MyNamespace;
 using Omu.ValueInjecter;
 using Volo.Abp;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Timing;
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -25,6 +28,7 @@ using Win_in.Sfs.Wms.Store.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.proxy;
 using Win_in.Sfs.Wms.Store.Notes;
 using Win_in.Sfs.Wms.Store.Options;
+using static Volo.Abp.Identity.Settings.IdentitySettingNames;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
@@ -46,6 +50,7 @@ public class AssembleIssueJobAppService
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
     private readonly IOptions<RestoOptions> _options;
     private readonly ILogger<AssembleIssueJobAppService> _logger;
+    private readonly ICurrentUser _currentUser;
 
     public AssembleIssueJobAppService(
         ILogger<AssembleIssueJobAppService> logger,
@@ -53,7 +58,7 @@ public class AssembleIssueJobAppService
         ILocationAppService locationAppService,
         IAssembleIssueNoteAppService assembleIssueNoteAppService, IExpectOutAppService expectOutAppService
         , IHttpClientFactory httpClientFactory
-        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base(
         repository, assembleIssueJobManager)
     {
         _assembleIssueJobManager = assembleIssueJobManager;
@@ -63,6 +68,7 @@ public class AssembleIssueJobAppService
         _httpClientFactory = httpClientFactory;
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
+        _currentUser = currentUser;
         _logger = logger;
     }
 
@@ -292,6 +298,35 @@ public class AssembleIssueJobAppService
         }
     }
 
+    [HttpPost("accept/{id}")]
+    [UnitOfWork]
+    public override async Task AcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims=true;
+        entity.ClaimsUserName = _currentUser.UserName;
+        entity.ClaimsUserId = _currentUser.Id.ToString();
+        entity.AcceptTime = Clock.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-accept/{id}")]
+    [UnitOfWork]
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = false;
+        entity.ClaimsUserName = string.Empty;
+        entity.ClaimsUserId = string.Empty;
+        entity.AcceptTime = DateTime.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
     #region 立库
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -14,6 +14,8 @@ using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -42,6 +44,7 @@ public class CoatingIssueJobAppService
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
     private readonly IOptions<RestoOptions> _options;
     private readonly ILogger<CoatingIssueJobAppService> _logger;
+    private readonly ICurrentUser _currentUser;
 
     protected ICoatingIssueRequestAppService CoatingIssueRequestAppService =>
         LazyServiceProvider.LazyGetRequiredService<ICoatingIssueRequestAppService>();
@@ -53,7 +56,7 @@ public class CoatingIssueJobAppService
         ILocationAppService locationAppService,
         ICoatingIssueNoteAppService coatingIssueNoteAppService, IExpectOutAppService expectOutAppService
         , IHttpClientFactory httpClientFactory
-        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base(
         repository, coatingIssueJobManager)
     {
         _coatingIssueJobManager = coatingIssueJobManager;
@@ -63,6 +66,7 @@ public class CoatingIssueJobAppService
         _httpClientFactory = httpClientFactory;
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
+        _currentUser = currentUser;
         _logger = logger;
     }
 
@@ -306,6 +310,35 @@ public class CoatingIssueJobAppService
         }
     }
 
+    [HttpPost("accept/{id}")]
+    [UnitOfWork]
+    public override async Task AcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = true;
+        entity.ClaimsUserName = _currentUser.UserName;
+        entity.ClaimsUserId = _currentUser.Id.ToString();
+        entity.AcceptTime = Clock.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-accept/{id}")]
+    [UnitOfWork]
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = false;
+        entity.ClaimsUserName = string.Empty;
+        entity.ClaimsUserId = string.Empty;
+        entity.AcceptTime = DateTime.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
     #region 立库
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs

@@ -13,6 +13,8 @@ using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
 using Volo.Abp.ObjectMapping;
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -40,6 +42,7 @@ public class InjectionIssueJobAppService
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
     private readonly IOptions<RestoOptions> _options;
+    private readonly ICurrentUser _currentUser;
 
     protected IInjectionIssueRequestAppService InjectionIssueRequestAppService =>
         LazyServiceProvider.LazyGetRequiredService<IInjectionIssueRequestAppService>();
@@ -49,7 +52,7 @@ public class InjectionIssueJobAppService
         ILocationAppService locationAppService,
         IInjectionIssueNoteAppService injectionIssueNoteAppService, IExpectOutAppService expectOutAppService
         , IHttpClientFactory httpClientFactory
-        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base(
         repository, injectionIssueJobManager)
     {
         _injectionIssueJobManager = injectionIssueJobManager;
@@ -59,6 +62,7 @@ public class InjectionIssueJobAppService
         _httpClientFactory = httpClientFactory;
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
+        _currentUser = currentUser;
     }
     [HttpPost("get-by-number-2")]
     public async Task<InjectionIssueJobDTO> GetByNumber2Async(string number)
@@ -285,6 +289,35 @@ public class InjectionIssueJobAppService
         }
     }
 
+    [HttpPost("accept/{id}")]
+    [UnitOfWork]
+    public override async Task AcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = true;
+        entity.ClaimsUserName = _currentUser.UserName;
+        entity.ClaimsUserId = _currentUser.Id.ToString();
+        entity.AcceptTime = Clock.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-accept/{id}")]
+    [UnitOfWork]
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = false;
+        entity.ClaimsUserName = string.Empty;
+        entity.ClaimsUserId = string.Empty;
+        entity.AcceptTime = DateTime.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
     #region 立库
 
     /// <summary>

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

@@ -12,6 +12,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -39,6 +41,7 @@ public class KittingIssueJobAppService
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
     private readonly IOptions<RestoOptions> _options;
+    private readonly ICurrentUser _currentUser;
 
     protected IKittingIssueRequestAppService KittingIssueRequestAppService =>
         LazyServiceProvider.LazyGetRequiredService<IKittingIssueRequestAppService>();
@@ -48,7 +51,7 @@ public class KittingIssueJobAppService
         ILocationAppService locationAppService,
         IKittingIssueNoteAppService kittingIssueNoteAppService, IExpectOutAppService expectOutAppService
         , IHttpClientFactory httpClientFactory
-        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base(
         repository, kittingIssueJobManager)
     {
         _kittingIssueJobManager = kittingIssueJobManager;
@@ -58,6 +61,7 @@ public class KittingIssueJobAppService
         _httpClientFactory = httpClientFactory;
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
+        _currentUser = currentUser;
     }
 
     [HttpPost("get-by-number-2")]
@@ -284,6 +288,35 @@ public class KittingIssueJobAppService
         }
     }
 
+    [HttpPost("accept/{id}")]
+    [UnitOfWork]
+    public override async Task AcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = true;
+        entity.ClaimsUserName = _currentUser.UserName;
+        entity.ClaimsUserId = _currentUser.Id.ToString();
+        entity.AcceptTime = Clock.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-accept/{id}")]
+    [UnitOfWork]
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = false;
+        entity.ClaimsUserName = string.Empty;
+        entity.ClaimsUserId = string.Empty;
+        entity.AcceptTime = DateTime.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
     #region 立库
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJobAppService.cs

@@ -12,6 +12,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MyNamespace;
 using Volo.Abp;
+using Volo.Abp.Uow;
+using Volo.Abp.Users;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
@@ -39,6 +41,7 @@ public class SparePartIssueJobAppService
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly ITransferLibRequestAppService _transferLibRequestAppService;
     private readonly IOptions<RestoOptions> _options;
+    private readonly ICurrentUser _currentUser;
 
     protected ISparePartIssueRequestAppService SparePartIssueRequestAppService =>
         LazyServiceProvider.LazyGetRequiredService<ISparePartIssueRequestAppService>();
@@ -48,7 +51,7 @@ public class SparePartIssueJobAppService
         ILocationAppService locationAppService,
         ISparePartIssueNoteAppService sparePartIssueNoteAppService, IExpectOutAppService expectOutAppService
         , IHttpClientFactory httpClientFactory
-        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService) : base(
+        , IOptions<RestoOptions> options, ITransferLibRequestAppService transferLibRequestAppService, ICurrentUser currentUser) : base(
         repository, sparePartIssueJobManager)
     {
         _sparePartIssueJobManager = sparePartIssueJobManager;
@@ -58,6 +61,7 @@ public class SparePartIssueJobAppService
         _httpClientFactory = httpClientFactory;
         _options = options;
         _transferLibRequestAppService = transferLibRequestAppService;
+        _currentUser = currentUser;
     }
 
     [HttpPost("add-many")]
@@ -277,6 +281,35 @@ public class SparePartIssueJobAppService
         }
     }
 
+    [HttpPost("accept/{id}")]
+    [UnitOfWork]
+    public override async Task AcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = true;
+        entity.ClaimsUserName = _currentUser.UserName;
+        entity.ClaimsUserId = _currentUser.Id.ToString();
+        entity.AcceptTime = Clock.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-accept/{id}")]
+    [UnitOfWork]
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var entity = await _repository.FindAsync(id).ConfigureAwait(false);
+        entity.IsClaims = false;
+        entity.ClaimsUserName = string.Empty;
+        entity.ClaimsUserId = string.Empty;
+        entity.AcceptTime = DateTime.Now;
+        await _repository.UpdateAsync(entity).ConfigureAwait(false);
+    }
+
     #region 立库
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/AssembleIssueJobs/AssembleIssueJob.cs

@@ -45,4 +45,25 @@ public class AssembleIssueJob : SfsJobAggregateRootBase<AssembleIssueJobDetail>
     public override List<AssembleIssueJobDetail> Details { get; set; } = new List<AssembleIssueJobDetail>();
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs

@@ -41,4 +41,25 @@ public class CoatingIssueJob : SfsJobAggregateRootBase<CoatingIssueJobDetail>
     public override List<CoatingIssueJobDetail> Details { get; set; } = new List<CoatingIssueJobDetail>();
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJob.cs

@@ -41,4 +41,25 @@ public class InjectionIssueJob : SfsJobAggregateRootBase<InjectionIssueJobDetail
     public override List<InjectionIssueJobDetail> Details { get; set; } = new List<InjectionIssueJobDetail>();
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJob.cs

@@ -41,4 +41,25 @@ public class KittingIssueJob : SfsJobAggregateRootBase<KittingIssueJobDetail>
     public override List<KittingIssueJobDetail> Details { get; set; } = new List<KittingIssueJobDetail>();
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/SparePartIssueJobs/SparePartIssueJob.cs

@@ -41,4 +41,25 @@ public class SparePartIssueJob : SfsJobAggregateRootBase<SparePartIssueJobDetail
     public override List<SparePartIssueJobDetail> Details { get; set; } = new List<SparePartIssueJobDetail>();
 
     public EnumIssueSendType EnumIssueSendType { get; set; }
+
+    /// <summary>
+    /// 已承接
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "是否已承接")]
+    public bool IsClaims { get; set; }
+
+    /// <summary>
+    /// 承接人ID
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人ID")]
+    public string ClaimsUserId { get; set; }
+
+    /// <summary>
+    /// 承接人
+    /// </summary>
+    /// <returns></returns>
+    [Display(Name = "承接人")]
+    public string ClaimsUserName { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleIssueRequestAutoMapperProfile.cs

@@ -13,6 +13,9 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<AssembleIssueRequest, AssembleIssueJobEditInput>()
            .ForMember(x => x.AssembleRequestNumber, y => y.MapFrom(d => d.Number))
+           .ForMember(x => x.IsClaims, y => y.MapFrom(d => false))
+           .Ignore(x => x.ClaimsUserName)
+           .Ignore(x => x.ClaimsUserId)
            .Ignore(x => x.WarehouseCode)
            .Ignore(x => x.UpStreamJobNumber)
            .Ignore(x => x.JobType)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingIssueRequestAutoMapperProfile.cs

@@ -13,6 +13,9 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<CoatingIssueRequest, CoatingIssueJobEditInput>()
             .ForMember(x => x.CoatingRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.IsClaims, y => y.MapFrom(d => false))
+            .Ignore(x => x.ClaimsUserName)
+            .Ignore(x => x.ClaimsUserId)
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/InjectionIssueRequestAutoMapperProfile.cs

@@ -13,6 +13,9 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<InjectionIssueRequest, InjectionIssueJobEditInput>()
             .ForMember(x => x.InjectionRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.IsClaims, y => y.MapFrom(d => false))
+            .Ignore(x => x.ClaimsUserName)
+            .Ignore(x => x.ClaimsUserId)
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/KittingIssueRequestAutoMapperProfile.cs

@@ -13,6 +13,9 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<KittingIssueRequest, KittingIssueJobEditInput>()
             .ForMember(x => x.KittingRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.IsClaims, y => y.MapFrom(d => false))
+            .Ignore(x => x.ClaimsUserName)
+            .Ignore(x => x.ClaimsUserId)
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/SparePartIssueRequestAutoMapperProfile.cs

@@ -13,6 +13,9 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<SparePartIssueRequest, SparePartIssueJobEditInput>()
             .ForMember(x => x.SparePartRequestNumber, y => y.MapFrom(d => d.Number))
+            .ForMember(x => x.IsClaims, y => y.MapFrom(d => false))
+            .Ignore(x => x.ClaimsUserName)
+            .Ignore(x => x.ClaimsUserId)
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)