修改 业务库移

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

@@ -240,7 +240,7 @@ public class IssueJobController : AbpController
     [HttpGet("check-job-exist")]
     public virtual async Task<List<IssueJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode, string locationCode)
     {
-        return await _issueJobAppService.CheckJobExistByItemCodeAndLocationCode(itemCode, locationCode).ConfigureAwait(false);
+        return await _issueJobAppService.CheckJobExistByItemCodeAndLocationCodeAsync(itemCode, locationCode).ConfigureAwait(false);
     }
 
     /// <summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/ILocationAppService.cs

@@ -32,4 +32,5 @@ public interface ILocationAppService
     Task<List<LocationDTO>> GetListByTypesAndErpCodeAsync(List<EnumLocationType> types, string erpCode);
     Task<List<LocationDTO>> GetListByTypesAndErpCodeAsync(List<EnumLocationType> types, string erpCode,string locCode);
     Task<List<LocationDTO>> GetListByErpLocationCodes(List<string> ErpLocationCodes);
+    Task<LocationDTO> GetFirstRowOneAsync();
 }

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application/Locations/LocationAppService.cs

@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using System.Threading.Tasks;
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Caching;
 using Volo.Abp.Domain.Repositories;
+using Volo.Abp.ObjectMapping;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Basedata.Domain;
@@ -220,6 +222,14 @@ public class LocationAppService
         return ObjectMapper.Map<List<Domain.Location>, List<LocationDTO>>(list);
     }
 
+    [HttpGet("get-first-row-one")]
+    public virtual async Task<LocationDTO> GetFirstRowOneAsync()
+    {
+        var first = await _repository.GetListAsync(p => p.RowCode == 1).ConfigureAwait(false);
+
+        return ObjectMapper.Map<Location, LocationDTO>(first.FirstOrDefault());
+    }
+
     protected override async Task ValidateImportModelAsync(LocationImportInput importInput, List<ValidationResult> validationRresult)
     {
         await base.ValidateImportModelAsync(importInput, validationRresult).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/IssueJobs/IIssueJobAppService.cs

@@ -8,7 +8,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public interface IIssueJobAppService
     : ISfsJobAppServiceBase<IssueJobDTO, SfsJobRequestInputBase, IssueJobCheckInput, IssueJobEditInput>
 {
-    Task<List<IssueJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode, string locationCode);
+    Task<List<IssueJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode, string locationCode);
 
     Task CancelByMaterialRequestAsync(string materialNumber);
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/TransferLibJobs/ITransferLibJobAppService.cs

@@ -1,7 +1,11 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 public interface ITransferLibJobAppService
     : ISfsJobAppServiceBase<TransferLibJobDTO, SfsJobRequestInputBase, TransferLibJobCheckInput, TransferLibJobEditInput>
 {
-
+    Task<List<TransferLibJobDTO>> GetByRequestNumberAsync(string requestNumber);
+    Task CompleteByRequestAsync(string requestNumber);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/TransferLibRequests/ITransferLibRequestAppService.cs

@@ -17,4 +17,5 @@ public interface ITransferLibRequestAppService
     Task<PagedResultDto<TransferLibRequestDTO>> GetListForCustomAsync(SfsStoreRequestInputBase sfsRequestDTO, bool includeDetails = false,
          CancellationToken cancellationToken = default);
 
+    Task CompleteByJobAsync(string requestNumber);
 }

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

@@ -43,7 +43,7 @@ public class IssueJobAppService
     /// <exception cref="NotImplementedException"></exception>
     [Authorize]
     [HttpGet("check-job-exist")]
-    public virtual async Task<List<IssueJobDTO>> CheckJobExistByItemCodeAndLocationCode(string itemCode,
+    public virtual async Task<List<IssueJobDTO>> CheckJobExistByItemCodeAndLocationCodeAsync(string itemCode,
         string locationCode)
     {
         var entities = await _repository.GetListAsync(c =>

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

@@ -108,9 +108,10 @@ public class KittingIssueJobAppService
         if (kittingJob.JobStatus == EnumJobStatus.Open || kittingJob.JobStatus == EnumJobStatus.Partial ||
             kittingJob.JobStatus == EnumJobStatus.Wait)
         {
-            throw new UserFriendlyException($"任务状态不是{kittingJob.JobStatus == EnumJobStatus.Open}、" +
-                                            $"{kittingJob.JobStatus == EnumJobStatus.Partial}、" +
-                                            $"{kittingJob.JobStatus == EnumJobStatus.Wait}");
+            throw new UserFriendlyException($"任务状态不是" +
+                                            $"{EnumJobStatus.Open.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Partial.GetDisplayName()}、" +
+                                            $"{EnumJobStatus.Wait.GetDisplayName()}");
         }
 
         await _expectOutAppService.RemoveByNumberAsync(kittingJob.Number).ConfigureAwait(false);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAppService.cs

@@ -1,12 +1,13 @@
 using System;
-using System.Reflection;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Inventory.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -16,19 +17,26 @@ namespace Win_in.Sfs.Wms.Store.Application;
 
 [Authorize]
 [Route($"{StoreConsts.RootPath}transfer-lib-job")]
-
 public class TransferLibJobAppService
-    : SfsJobAppServiceBase<TransferLibJob, TransferLibJobDetail, TransferLibJobDTO, SfsJobRequestInputBase, TransferLibJobCheckInput, TransferLibJobEditInput>,
+    : SfsJobAppServiceBase<TransferLibJob, TransferLibJobDetail, TransferLibJobDTO, SfsJobRequestInputBase,
+            TransferLibJobCheckInput, TransferLibJobEditInput>,
         ITransferLibJobAppService
 {
     private readonly IServiceProvider _serviceProvider;
     private readonly ILocationAppService _locationAppService;
+    private readonly IExpectOutAppService _expectOutAppService;
+
+    protected ITransferLibRequestAppService TransferLibRequestAppService =>
+        LazyServiceProvider.LazyGetRequiredService<ITransferLibRequestAppService>();
 
     public TransferLibJobAppService(
-        ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager, IServiceProvider serviceProvider, ILocationAppService locationAppService) : base(repository, TransferLibJobManager)
+        ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager,
+        IServiceProvider serviceProvider, ILocationAppService locationAppService, IExpectOutAppService expectOutAppService) : base(repository,
+        TransferLibJobManager)
     {
         _serviceProvider = serviceProvider;
         _locationAppService = locationAppService;
+        _expectOutAppService = expectOutAppService;
     }
 
     /// <summary>
@@ -41,32 +49,36 @@ public class TransferLibJobAppService
     [UnitOfWork]
     public override async Task<TransferLibJobDTO> CompleteAsync(Guid id, TransferLibJobDTO dto)
     {
-        string methodPrefix = "TransferLibJobAppService.CompleteAsync - ";
+        var methodPrefix = "TransferLibJobAppService.CompleteAsync - ";
         if (dto.CallServerName.IsNullOrEmpty())
         {
             throw new UserFriendlyException($"{methodPrefix}CallServerName 不能为空");
         }
+
         if (dto.CallBusinessType.IsNullOrEmpty())
         {
             throw new UserFriendlyException($"{methodPrefix}CallBusinessType 不能为空");
         }
+
         if (dto.CallRequestNumber.IsNullOrEmpty())
         {
             throw new UserFriendlyException($"{methodPrefix}CallRequestNumber 不能为空");
         }
+
         if (dto.CallJobNumber.IsNullOrEmpty())
         {
             throw new UserFriendlyException($"{methodPrefix}CallJobNumber 不能为空");
         }
 
         #region 校验
+
         foreach (var detailObj in dto.Details)
         {
             if (detailObj.IsPackingCodeFrom)
             {
                 if (detailObj.RecommendFromPackingCode != detailObj.HandledFromPackingCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From箱码必须等于实际From箱码");
+                    throw new UserFriendlyException("触发校验：推荐From箱码必须等于实际From箱码");
                 }
             }
 
@@ -74,7 +86,7 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToPackingCode != detailObj.HandledToPackingCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To箱码必须等于实际To箱码");
+                    throw new UserFriendlyException("触发校验：推荐To箱码必须等于实际To箱码");
                 }
             }
 
@@ -82,7 +94,7 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendFromLot != detailObj.HandledFromLot)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From批次必须等于实际From批次");
+                    throw new UserFriendlyException("触发校验：推荐From批次必须等于实际From批次");
                 }
             }
 
@@ -90,9 +102,10 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToLot != detailObj.HandledToLot)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To批次必须等于实际To批次");
+                    throw new UserFriendlyException("触发校验：推荐To批次必须等于实际To批次");
                 }
             }
+
             //if (detailObj.IsItemCodeFrom)
             //if (detailObj.IsItemCodeTo)
             //if (detailObj.IsStatusFrom)
@@ -101,7 +114,7 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendFromLocationCode != detailObj.HandledFromLocationCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From库位必须等于实际From库位");
+                    throw new UserFriendlyException("触发校验：推荐From库位必须等于实际From库位");
                 }
             }
 
@@ -109,7 +122,7 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToLocationCode != detailObj.HandledToLocationCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To库位必须等于实际To库位");
+                    throw new UserFriendlyException("触发校验：推荐To库位必须等于实际To库位");
                 }
             }
 
@@ -117,7 +130,7 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendFromLocationGroup != detailObj.HandledFromLocationGroup)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From库位组必须等于实际From库位组");
+                    throw new UserFriendlyException("触发校验：推荐From库位组必须等于实际From库位组");
                 }
             }
 
@@ -125,14 +138,15 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToLocationGroup != detailObj.HandledToLocationGroup)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To库位组必须等于实际To库位组");
+                    throw new UserFriendlyException("触发校验：推荐To库位组必须等于实际To库位组");
                 }
             }
+
             if (detailObj.IsLocationAreaFrom)
             {
                 if (detailObj.RecommendFromLocationArea != detailObj.HandledFromLocationArea)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From库区必须等于实际From库区");
+                    throw new UserFriendlyException("触发校验：推荐From库区必须等于实际From库区");
                 }
             }
 
@@ -140,14 +154,15 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToLocationArea != detailObj.HandledToLocationArea)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To库区必须等于实际To库区");
+                    throw new UserFriendlyException("触发校验：推荐To库区必须等于实际To库区");
                 }
             }
+
             if (detailObj.IsLocationErpCodeFrom)
             {
                 if (detailObj.RecommendFromLocationErpCode != detailObj.HandledFromLocationErpCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From ERP库区必须等于实际From ERP库区");
+                    throw new UserFriendlyException("触发校验：推荐From ERP库区必须等于实际From ERP库区");
                 }
             }
 
@@ -155,24 +170,27 @@ public class TransferLibJobAppService
             {
                 if (detailObj.RecommendToLocationErpCode != detailObj.HandledToLocationErpCode)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To ERP库区必须等于实际To ERP库区");
+                    throw new UserFriendlyException("触发校验：推荐To ERP库区必须等于实际To ERP库区");
                 }
             }
+
             if (detailObj.IsQtyFrom)
             {
                 if (detailObj.RecommendFromQty != detailObj.HandledFromQty)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐From数量必须等于实际From数量");
+                    throw new UserFriendlyException("触发校验：推荐From数量必须等于实际From数量");
                 }
             }
+
             if (detailObj.IsQtyTo)
             {
                 if (detailObj.RecommendToQty != detailObj.HandledToQty)
                 {
-                    throw new UserFriendlyException($"触发校验：推荐To数量必须等于实际To数量");
+                    throw new UserFriendlyException("触发校验：推荐To数量必须等于实际To数量");
                 }
             }
         }
+
         #endregion
 
         foreach (var detail in dto.Details)
@@ -180,8 +198,10 @@ public class TransferLibJobAppService
             detail.HandledFromContainerCode = string.Empty;
             detail.HandledToContainerCode = string.Empty;
 
-            var fromLocationDto=await _locationAppService.GetByCodeAsync(detail.HandledFromLocationCode).ConfigureAwait(false);
-            var toLocationDto=await _locationAppService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
+            var fromLocationDto = await _locationAppService.GetByCodeAsync(detail.HandledFromLocationCode)
+                .ConfigureAwait(false);
+            var toLocationDto =
+                await _locationAppService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
 
             detail.HandledFromLocationArea = fromLocationDto.AreaCode;
             detail.HandledFromLocationCode = fromLocationDto.Code;
@@ -199,23 +219,68 @@ public class TransferLibJobAppService
         var ret = await base.CompleteAsync(id, dto).ConfigureAwait(false);
         if (ret != null)
         {
-            Type ty = Type.GetType(dto.CallServerName);
+            var ty = Type.GetType(dto.CallServerName);
             if (ty == null)
             {
                 throw new UserFriendlyException($"{methodPrefix}没有找到类型为{dto.CallServerName}的对象");
             }
+
             var instance = _serviceProvider.GetService(ty);
             if (instance == null)
             {
                 throw new UserFriendlyException($"{methodPrefix}类型为{dto.CallServerName}的对象创建失败");
             }
-            ITransferLibCallback transferLibCallback = (ITransferLibCallback)instance;
+
+            var transferLibCallback = (ITransferLibCallback)instance;
             if (transferLibCallback == null)
             {
                 throw new UserFriendlyException($"{methodPrefix}类型为{dto.CallServerName}的对象没有实现ITransferLibCallback接口");
             }
+
             await transferLibCallback.DoTransferLibCallbackAsync(dto).ConfigureAwait(false);
         }
+
+        await TransferLibRequestAppService.CompleteByJobAsync(dto.RequestNumber).ConfigureAwait(false);
+
         return ret;
     }
+
+    [HttpPost("get-by-request/{requestNumber}")]
+    [UnitOfWork]
+    public async Task<List<TransferLibJobDTO>> GetByRequestNumberAsync(string requestNumber)
+    {
+        var list = await _repository.GetListAsync(p => p.RequestNumber == requestNumber).ConfigureAwait(false);
+
+        return ObjectMapper.Map<List<TransferLibJob>, List<TransferLibJobDTO>>(list);
+    }
+
+    public override async Task CancelAcceptAsync(Guid id)
+    {
+        var job = await _repository.FindAsync(p => p.Id == id).ConfigureAwait(false);
+
+        if (job.JobStatus == EnumJobStatus.Open || job.JobStatus == EnumJobStatus.Partial ||
+            job.JobStatus == EnumJobStatus.Doing || job.JobStatus == EnumJobStatus.Wait)
+        {
+            await _repository.UpdateAsync(job).ConfigureAwait(false);
+        }
+
+        await _expectOutAppService.RemoveByNumberAsync(job.Number).ConfigureAwait(false);
+    }
+
+    [HttpPost("complete-by-request/{requestNumber}")]
+    [UnitOfWork]
+    public async Task CompleteByRequestAsync(string requestNumber)
+    {
+        var list = await _repository.GetListAsync(p => p.RequestNumber == requestNumber).ConfigureAwait(false);
+
+        foreach (var job in list)
+        {
+            if (job.JobStatus == EnumJobStatus.Open || job.JobStatus == EnumJobStatus.Partial ||
+                job.JobStatus == EnumJobStatus.Doing || job.JobStatus == EnumJobStatus.Wait)
+            {
+                await _repository.UpdateAsync(job).ConfigureAwait(false);
+                await _expectOutAppService.RemoveByNumberAsync(job.Number).ConfigureAwait(false);
+            }
+        }
+    }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs

@@ -4,11 +4,13 @@ using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
@@ -17,6 +19,8 @@ using Win_in.Sfs.Wms.Inventory.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
+using static ClosedXML.Excel.XLPredefinedFormat;
+using Filter = Win_in.Sfs.Shared.Domain.Filter;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
@@ -39,16 +43,18 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
     private readonly ITransferLibRequestManager _transferLibRequestManager;
     private readonly IBalanceAppService _balanceAppService;
     private readonly ILocationAppService _locationAppService;
+    private readonly ITransferLibJobAppService _transferLibJobAppService;
 
     public TransferLibRequestAppService(
         ITransferLibRequestRepository repository,
         ITransferLibRequestManager transferLibRequestManager,
         IBalanceAppService balanceAppService,
-        ILocationAppService locationAppService) : base(repository, transferLibRequestManager)
+        ILocationAppService locationAppService, ITransferLibJobAppService transferLibJobAppService) : base(repository, transferLibRequestManager)
     {
         _transferLibRequestManager = transferLibRequestManager;
         _balanceAppService = balanceAppService;
         _locationAppService = locationAppService;
+        _transferLibJobAppService = transferLibJobAppService;
     }
 
     #region 东阳使用
@@ -307,6 +313,75 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase
 
     #endregion
 
+    public override async Task<TransferLibRequestDTO> CancelAsync(Guid id)
+    {
+        var request = await _repository.GetAsync(id).ConfigureAwait(false);
+
+        var list = await _transferLibJobAppService.GetByRequestNumberAsync(request.Number).ConfigureAwait(false);
+        if (list.Any())
+        {
+            foreach (var kittingIssueJobDto in list)
+            {
+                if (kittingIssueJobDto.JobStatus == EnumJobStatus.Open ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Partial ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Doing ||
+                    kittingIssueJobDto.JobStatus == EnumJobStatus.Wait)
+                {
+                    await _transferLibJobAppService.CancelAsync(kittingIssueJobDto.Id).ConfigureAwait(false);
+                }
+            }
+        }
+
+        if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling ||
+            request.RequestStatus == EnumRequestStatus.New)
+        {
+            request.RequestStatus = EnumRequestStatus.Cancelled;
+            await _repository.UpdateAsync(request).ConfigureAwait(false);
+        }
+        else
+        {
+            throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
+        }
+
+        return ObjectMapper.Map<TransferLibRequest, TransferLibRequestDTO>(request);
+    }
+
+    public override async Task<TransferLibRequestDTO> CompleteAsync(Guid id)
+    {
+        var request = await _repository.FindAsync(p => p.Id == id).ConfigureAwait(false);
+
+        if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling ||
+            request.RequestStatus == EnumRequestStatus.New)
+        {
+            request.RequestStatus = EnumRequestStatus.Completed;
+            await _repository.UpdateAsync(request).ConfigureAwait(false);
+        }
+        else
+        {
+            throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
+        }
+
+        await _transferLibJobAppService.CompleteByRequestAsync(request.Number).ConfigureAwait(false);
+
+        return ObjectMapper.Map<TransferLibRequest, TransferLibRequestDTO>(request);
+    }
+
+    [HttpPost("Complete-By-Job")]
+    public async Task CompleteByJobAsync(string requestNumber)
+    {
+        var request = await _repository.FindAsync(p => p.Number == requestNumber).ConfigureAwait(false);
+
+        if (request.RequestStatus == EnumRequestStatus.Partial || request.RequestStatus == EnumRequestStatus.Handling ||
+            request.RequestStatus == EnumRequestStatus.New)
+        {
+            request.RequestStatus = EnumRequestStatus.Completed;
+            await _repository.UpdateAsync(request).ConfigureAwait(false);
+        }
+        else
+        {
+            throw new UserFriendlyException($"【{request.RequestStatus.GetDisplayName()}】状态不允许取消");
+        }
+    }
 
     /// <summary>
     ///     【创建】库移请求

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/KittingIssueJobEventHandler.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Castle.Components.DictionaryAdapter;
+using Volo.Abp;
 using Volo.Abp.EventBus;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Basedata.Application.Contracts;
@@ -128,6 +129,25 @@ public class KittingIssueJobEventHandler :
         {
             var locationDto = await _locationAppService.GetByCodeAsync(detail.RecommendFromLocationCode)
                 .ConfigureAwait(false);
+            var locationList = await _locationAppService.GetListByGroupsAsync(
+                new List<string>{ detail.RecommendFromLocationGroup }).ConfigureAwait(false);
+            var locationListSort=locationList.OrderBy(p => p.RowCode);
+
+            var locationDtoRowOne = new LocationDTO();
+            if (locationListSort.Any())
+            {
+                locationDtoRowOne = locationListSort.FirstOrDefault();
+            }
+            else
+            {
+                locationDtoRowOne = await _locationAppService.GetFirstRowOneAsync().ConfigureAwait(false);
+                if (locationDtoRowOne == null)
+                {
+                    throw new UserFriendlyException("没有找到1层的库位");
+                }
+            }
+
+
             if (locationDto.Type == EnumLocationType.RAW)
             {
                 if (!await IsMinRowAsync(kittingIssueJob).ConfigureAwait(false))
@@ -154,7 +174,7 @@ public class KittingIssueJobEventHandler :
 
                     detailInput.RecommendFromQty = detail.RecommendFromQty;
                     detailInput.RecommendFromLot = detail.RecommendFromLot;
-                    detailInput.RecommendFromPackingCode = detailInput.RecommendFromPackingCode;
+                    detailInput.RecommendFromPackingCode = detail.RecommendFromPackingCode;
                     detailInput.RecommendToLot = detail.RecommendToLot;
 
                     detailInput.RecommendFromArriveDate = detail.RecommendFromArriveDate;
@@ -178,11 +198,11 @@ public class KittingIssueJobEventHandler :
                     detailInput.RecommendToProduceDate = detail.RecommendToProduceDate;
                     detailInput.RecommendToSupplierBatch = detail.RecommendToSupplierBatch;
 
-                    detailInput.RecommendToLocationCode = detail.RecommendToLocationCode;
-                    detailInput.RecommendToLocationGroup = detail.RecommendToLocationGroup;
-                    detailInput.RecommendToLocationArea = detail.RecommendToLocationArea;
-                    detailInput.RecommendToLocationErpCode = detail.RecommendToLocationErpCode;
-                    detailInput.RecommendToWarehouseCode = detail.RecommendToWarehouseCode;
+                    detailInput.RecommendToLocationCode = locationDtoRowOne.Code;
+                    detailInput.RecommendToLocationGroup = locationDtoRowOne.LocationGroupCode;
+                    detailInput.RecommendToLocationArea = locationDtoRowOne.AreaCode;
+                    detailInput.RecommendToLocationErpCode = locationDtoRowOne.ErpLocationCode;
+                    detailInput.RecommendToWarehouseCode = locationDtoRowOne.WarehouseCode;
 
                     input.Details = new EditableList<TransferLibRequestDetailInput>() { detailInput };
 

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

@@ -688,7 +688,7 @@ public class KittingIssueRequestEventHandler
             resultBalance.LocationRow = locationDto.RowCode;
         }
 
-        resultBalances
+        resultBalances=resultBalances
             .OrderBy(p => p.Lot)
             .ThenBy(p=>p.LocationRow)
             .ThenBy(p => p.PutInTime)