Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

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

@@ -0,0 +1,195 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Polly.Caching;
+using Volo.Abp;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.AspNetCore.Mvc;
+using Win_in.Sfs.Auth.Application.Contracts;
+using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Pda.Controllers.Jobs;
+
+/// <summary>
+/// 注塑叫料任务
+/// </summary>
+[ApiController]
+[Route($"{PdaHostConst.ROOT_ROUTE}job/injection")]
+public class InjectionJobController : AbpController
+{
+    private readonly IInjectionJobAppService _injectionJobAppService;
+
+    private readonly IUserWorkGroupAppService _userWorkGroupAppService;
+
+    private readonly IDictAppService _dictApp;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="injectionJobAppService"></param>
+    /// <param name="userWorkGroupAppService"></param>
+    public InjectionJobController(
+        IInjectionJobAppService injectionJobAppService,
+        IDictAppService dictApp
+        , IUserWorkGroupAppService userWorkGroupAppService)
+    {
+        _userWorkGroupAppService = userWorkGroupAppService;
+        _injectionJobAppService = injectionJobAppService;
+        _dictApp = dictApp;
+    }
+
+    /// <summary>
+    /// 获取任务详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet("{id}")]
+
+    public virtual async Task<ActionResult<InjectionJobDTO>> GetAsync(Guid id)
+    {
+        var result = await _injectionJobAppService.GetAsync(id).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// 获取列表 筛选
+    /// </summary>
+    /// <param name="sfsRequestDTO"></param>
+    /// <returns></returns>
+    [HttpPost("list")]
+    public virtual async Task<PagedResultDto<InjectionJobDTO>> GetListAsync(SfsJobRequestInputBase sfsRequestDTO)
+    {
+        var list = await _injectionJobAppService.GetPagedListByFilterAsync(sfsRequestDTO, true).ConfigureAwait(false);
+        return list;
+    }
+
+    /// <summary>
+    /// 获取列表
+    /// </summary>
+    /// <param name="pageSize"></param>
+    /// <param name="pageIndex"></param>
+    /// <returns></returns>
+    [HttpGet("list")]
+    public virtual async Task<PagedResultDto<InjectionJobDTO>> GetListAsync(int pageSize, int pageIndex)
+    {
+        var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
+        var jsonStatus = JsonSerializer.Serialize(status);
+
+        var request = new SfsJobRequestInputBase
+        {
+            MaxResultCount = pageSize,
+            SkipCount = (pageIndex - 1) * pageSize,
+            Sorting = $"{nameof(InjectionJobDTO.CreationTime)} ASC",
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(IssueJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+
+        };
+
+        var list = await _injectionJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
+
+
+        return list;
+    }
+
+    /// <summary>
+    /// 根据Job Number 获取任务列表
+    /// </summary>
+    /// <param name="jobNumber"></param>
+    /// <returns></returns>
+    [HttpGet("by-number/{jobNumber}")]
+    public virtual async Task<ActionResult<InjectionJobDTO>> GetByNumberAsync(string jobNumber)
+    {
+        var jobDto = await _injectionJobAppService.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;
+    }
+
+    /// <summary>
+    /// 获取任务数量
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("count")]
+    public virtual async Task<ActionResult<long>> CountAsync()
+    {
+        var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
+        var jsonCodes = JsonSerializer.Serialize(wlgCodes);
+
+        var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
+        var jsonStatus = JsonSerializer.Serialize(status);
+
+        var request = new SfsJobRequestInputBase
+        {
+            Sorting = $"{nameof(InjectionJobDTO.Priority)} ASC",
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(InjectionJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(InjectionJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+        };
+
+        var count = await _injectionJobAppService.GetCountByFilterAsync(request).ConfigureAwait(false);
+
+        return Ok(count);
+    }
+
+    /// <summary>
+    /// 承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("take/{id}")]
+    public virtual async Task TakeAsync(Guid id)
+    {
+        await _injectionJobAppService.AcceptAsync(id).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 取消承接任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpPost("cancel-take/{id}")]
+    public virtual async Task CancelTakeAsync(Guid id)
+    {
+        await _injectionJobAppService.CancelAcceptAsync(id).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 执行任务
+    /// </summary>
+    /// <param name="id"></param>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpPost("finish/{id}")]
+    public virtual async Task FinishAsync(Guid id, [FromBody] InjectionJobDTO dto)
+    {
+        await _injectionJobAppService.CompleteAsync(id, dto).ConfigureAwait(false);
+    }
+}

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

@@ -0,0 +1,38 @@
+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>
+/// 注塑叫料记录
+/// </summary>
+[ApiController]
+[Route($"{PdaHostConst.ROOT_ROUTE}store/injection-note")]
+
+public class InjectionNoteController : AbpController
+{
+    private readonly IInjectionNoteAppService _injectionNoteAppService;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="injectionNoteAppService"></param>
+    public InjectionNoteController(IInjectionNoteAppService injectionNoteAppService)
+    {
+        _injectionNoteAppService = injectionNoteAppService;
+    }
+
+    /// <summary>
+    /// 创建注塑叫料记录
+    /// </summary>
+    /// <param name="input">CreateInput</param>
+    /// <returns></returns>
+    [HttpPost("")]
+    public virtual async Task CreateAsync(InjectionNoteEditInput input)
+    {
+        await _injectionNoteAppService.CreateAsync(input).ConfigureAwait(false);
+    }
+
+}

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

@@ -0,0 +1,51 @@
+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>
+/// 注塑叫料请求
+/// </summary>
+[ApiController]
+[Route($"{PdaHostConst.ROOT_ROUTE}store/injection-request")]
+
+public class InjectionRequestController : AbpController
+{
+    private readonly IInjectionRequestAppService _injectionRequestAppService;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="InjectionRequestAppService"></param>
+    public InjectionRequestController(IInjectionRequestAppService InjectionRequestAppService)
+    {
+        _injectionRequestAppService = InjectionRequestAppService;
+    }
+
+    /// <summary>
+    /// 注塑叫料申请
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("")]
+    public virtual async Task CreateAsync(InjectionRequestEditInput input)
+    {
+        _ = await _injectionRequestAppService.CreateAsync(input).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// 根据number获取注塑叫料申请详情
+    /// </summary>
+    /// <param name="number"></param>
+    /// <returns></returns>
+    [HttpGet("{number}")]
+
+    public virtual async Task<ActionResult<InjectionRequestDTO>> GetAsync(string number)
+    {
+        var result = await _injectionRequestAppService.GetByNumberAsync(number).ConfigureAwait(false);
+        return Ok(result);
+    }
+
+}

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

@@ -25,7 +25,7 @@ public class ThirdLocationNoteController : AbpController
     }
 
     /// <summary>
-    /// 创建器具转移记录
+    /// 创建三方库转移记录
     /// </summary>
     /// <param name="input">CreateInput</param>
     /// <returns></returns>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/InjectionRequests/InjectionRequestAppService.cs

@@ -15,6 +15,7 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.ObjectMapping;
+using Win_in.Sfs.Basedata.Application;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
@@ -39,7 +40,8 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase<Injectio
     private readonly ILocationAppService _locationAppService;
     private readonly IItemBasicAppService _itemBasicAppService;
     private readonly IProductionLineAppService _productionLineAppService;
-    private readonly IInjectionJobAppService _issueJobAppService;
+    private readonly IInjectionJobAppService _injectionJobAppService;
+    private readonly ITransactionTypeAppService _transactionTypeAppService;
 
     public InjectionRequestAppService(
         IInjectionRequestRepository repository,
@@ -50,7 +52,8 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase<Injectio
         ILocationAppService locationAppService,
         IItemBasicAppService itemBasicAppService,
         IProductionLineAppService productionLineAppService,
-        IInjectionJobAppService issueJobAppService)
+        ITransactionTypeAppService transactionTypeAppService,
+        IInjectionJobAppService injectionJobAppService)
         : base(repository, injectionRequestManager)
     {
         _injectionRequestManager = injectionRequestManager;
@@ -59,7 +62,8 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase<Injectio
         _locationAppService = locationAppService;
         _itemBasicAppService = itemBasicAppService;
         _productionLineAppService = productionLineAppService;
-        _issueJobAppService = issueJobAppService;
+        _injectionJobAppService = injectionJobAppService;
+        _transactionTypeAppService = transactionTypeAppService;
     }
 
 
@@ -101,12 +105,7 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase<Injectio
             detailInput.IssuedQty = 0;
         }
 
-        input.AutoSubmit = true;
-        input.AutoAgree = true;
-        input.AutoHandle = true;
-        input.AutoCompleteJob = false;
-        input.DirectCreateNote = false;
-
+        await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
         var entity = ObjectMapper.Map<InjectionRequestEditInput, InjectionRequest>(input);
 
         var result = await _injectionRequestManager.CreateByNumberAsync(entity).ConfigureAwait(false);
@@ -116,6 +115,22 @@ public class InjectionRequestAppService : SfsStoreRequestAppServiceBase<Injectio
         return dto;
     }
 
+    /// <summary>
+    /// 赋值Request业务属性
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task SetRequestAutoPropertiesAsync(InjectionRequestEditInput entity)
+    {
+        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
+        Check.NotNull(tranType, "事务类型", "事务类型不存在");
+        entity.AutoSubmit = tranType.AutoSubmitRequest;
+        entity.AutoAgree = tranType.AutoAgreeRequest;
+        entity.AutoHandle = tranType.AutoHandleRequest;
+        entity.AutoCompleteJob = tranType.AutoCompleteJob;
+        entity.DirectCreateNote = tranType.DirectCreateNote;
+    }
+
     [HttpPost("create-and-handle")]
     public async Task<InjectionRequestDTO> CreateAndHandleAsync(InjectionRequestEditInput input)
     {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/InjectionRequests/InjectionRequestDetail.cs

@@ -45,11 +45,7 @@ public class InjectionRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLoc
     public string ToWarehouseCode { get; set; }
 
     #endregion
-
-    // /// <summary>
-    // /// 在途库库位
-    // /// </summary>
-    // public string OnTheWayLocationCode { get; set; }
+       
 
     /// <summary>
     /// 生产线