代码合并

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs

@@ -16,7 +16,6 @@ public class KittingImportInput : SfsBaseDataImportInputBase
     [Display(Name = "Kitting名称")]
     public string Name { get; set; }
 
-
     /// <summary>
     ///     Kitting编码
     /// </summary>
@@ -45,11 +44,6 @@ public class KittingImportInput : SfsBaseDataImportInputBase
     [Display(Name = "配置")]
     public string Configuration { get; set; }
 
-
-
-
-
-
     /// <summary>
     ///     数量
     /// </summary>

be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Store/EnumIssueRequestType.cs

@@ -33,4 +33,10 @@ public enum EnumIssueRequestType
     /// </summary>
     [Display(Name = "位置码")]
     PositionCode =4,
+
+    /// <summary>
+    /// EXCEL导入
+    /// </summary>
+    [Display(Name = "EXCEL导入")]
+    ExcelImport=5,
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/ChassisOperationSequence/DTOs/ChassisOperationSequenceSearchDTO.cs

@@ -9,7 +9,7 @@ using Win_in.Sfs.Basedata.Domain;
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class ChassisOperationSequenceSearchDTO
 {
-    public List<string> ChassisNumberList { get; set; }
+    public List<string> ChassisNumberList { get; set; }=new List<string>();
 
     /// <summary>
     /// Kitting组包Bom的物品号

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/AssembleIssueRequests/IAssembleIssueRequestAppService.cs

@@ -12,4 +12,5 @@ public interface IAssembleIssueRequestAppService
     Task<AssembleIssueRequestDTO> CreateAndHandleAsync(AssembleIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
+    Task CreateImportExcelAsync(List<AssembleIssueRequestEditInput> inputs);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/CoatingIssueRequests/ICoatingIssueRequestAppService.cs

@@ -13,4 +13,5 @@ public interface ICoatingIssueRequestAppService
     Task<CoatingIssueRequestDTO> CreateAndHandleAsync(CoatingIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
+    Task CreateImportExcelAsync(List<CoatingIssueRequestEditInput> inputs);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/InjectionIssueRequests/IInjectionIssueRequestAppService.cs

@@ -13,6 +13,7 @@ public interface IInjectionIssueRequestAppService
     Task<InjectionIssueRequestDTO> CreateAndHandleAsync(InjectionIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
+    Task CreateImportExcelAsync(List<InjectionIssueRequestEditInput> inputs);
     Task<List<UnCompletedRequestDto>> GetListForSJ(List<UnCompletedRequestDto> p_list);
     Task<List<UnCompletedRequestDto>> Getlist(List<UnCompletedRequestDto> pList);
 }

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

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

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

@@ -1,50 +1,40 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
-[Display(Name = "叫料申请")]
+[Display(Name = "Kitting叫料申请")]
 public class KittingIssueRequestImportInput : SfsStoreImportInputBase
 {
-    /// <summary>
-    ///     叫料类型
-    /// </summary>
-    [Display(Name = "叫料类型")]
-    public EnumIssueRequestType IssueRequestType { get; set; }
+    [Display(Name = "序号")]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    [Key]
+    public string Number { get; set; }
 
-    /// <summary>
-    /// 物品代码
-    /// </summary>
-    [Display(Name = "物品代码")]
-    [Required]
-    public string ItemCode { get; set; }
+    #region 目标库位信息
 
     /// <summary>
     /// 目标库位
     /// </summary>
     [Display(Name = "目标库位")]
-    [Required]
+    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string ToLocationCode { get; set; }
 
     /// <summary>
-    /// 来源库区
+    /// 需求数量
     /// </summary>
-    [Display(Name = "调出库区")]
-    [Required]
-    public string FromLocationArea { get; set; }
-
-    /// <summary>
-    /// 数量
-    /// </summary>
-    [Display(Name = "数量")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    [Display(Name = "需求数量")]
     public decimal Qty { get; set; }
 
     /// <summary>
-    /// 备注
+    /// 物品代码
     /// </summary>
-    [Display(Name = "备注")]
-    public string Remark { get; set; }
+    [Display(Name = "物品代码")]
+    public string ItemCode { get; set; }
+
+    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/IssueRequest/SparePartIssueRequests/ISparePartIssueRequestAppService.cs

@@ -13,4 +13,5 @@ public interface ISparePartIssueRequestAppService
     Task<SparePartIssueRequestDTO> CreateAndHandleAsync(SparePartIssueRequestEditInput input);
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber,List<string> jobNumber);
+    Task CreateImportExcelAsync(List<SparePartIssueRequestEditInput> inputs);
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/ChassisOperationSequence/ChassisOperationSequenceAppService.cs

@@ -147,6 +147,8 @@ public class ChassisOperationSequenceAppService
                     listChassisOperationSequenceSearchDto.ChassisNumberList.Add(dict.Key);
                 }
             }
+
+            listChassisOperationSequenceSearchList.Add(listChassisOperationSequenceSearchDto);
         }
 
         return listChassisOperationSequenceSearchList;

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

@@ -27,6 +27,7 @@ public class TransferLibJobAppService
     private readonly ILocationAppService _locationAppService;
     private readonly IExpectOutAppService _expectOutAppService;
     private readonly IBalanceAppService _balanceAppService;
+    private readonly IItemBasicAppService _itemBasicAppService;
 
     protected ITransferLibRequestAppService TransferLibRequestAppService =>
         LazyServiceProvider.LazyGetRequiredService<ITransferLibRequestAppService>();
@@ -34,13 +35,15 @@ public class TransferLibJobAppService
     public TransferLibJobAppService(
         ITransferLibJobRepository repository, ITransferLibJobManager TransferLibJobManager,
         IServiceProvider serviceProvider, ILocationAppService locationAppService,
-        IExpectOutAppService expectOutAppService, IBalanceAppService balanceAppService) : base(repository,
-        TransferLibJobManager)
+        IExpectOutAppService expectOutAppService, IBalanceAppService balanceAppService,
+        IItemBasicAppService itemBasicAppService) :
+            base(repository, TransferLibJobManager)
     {
         _serviceProvider = serviceProvider;
         _locationAppService = locationAppService;
         _expectOutAppService = expectOutAppService;
         _balanceAppService = balanceAppService;
+        _itemBasicAppService = itemBasicAppService;
     }
 
     /// <summary>
@@ -202,6 +205,13 @@ public class TransferLibJobAppService
 
         #endregion
 
+        List<ItemBasicDTO> itemLst = new List<ItemBasicDTO>();
+        if (dto.Details.Any(itm => itm.StdPackQty == 0))
+        {
+            var codeLst = dto.Details.Where(itm => itm.StdPackQty == 0).Select(itm => itm.ItemCode).ToList();
+            itemLst = await _itemBasicAppService.GetByCodesAsync(codeLst).ConfigureAwait(false);
+        }
+
         foreach (var detail in dto.Details)
         {
             detail.HandledFromContainerCode = string.Empty;
@@ -213,6 +223,15 @@ public class TransferLibJobAppService
                 .ConfigureAwait(false);
             var toLocationDto =
                 await _locationAppService.GetByCodeAsync(detail.HandledToLocationCode).ConfigureAwait(false);
+            //标包为空时赋值
+            if (detail.StdPackQty == 0)
+            {
+                var itemObj = itemLst.FirstOrDefault(itm => itm.Code == detail.ItemCode);
+                if (itemObj != null)
+                {
+                    detail.StdPackQty = itemObj.StdPackQty;
+                }
+            }
 
             detail.HandledFromLocationArea = fromLocationDto.AreaCode;
             detail.HandledFromLocationCode = fromLocationDto.Code;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ContainerRequests/ContainerRequestAppService.cs

@@ -10,6 +10,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
 using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Basedata.Application;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
@@ -32,12 +33,14 @@ public class ContainerRequestAppService :
     private readonly IAreaAppService _areaApp;
     private readonly ICustomerAppService _customerApp;
     private readonly ICustomerAddressAppService _customerAddressApp;
+    private readonly ITransactionTypeAppService _transactionTypeAppService;
 
     public ContainerRequestAppService(
         IContainerRequestRepository repository
         , IContainerRequestManager containerRequestManager
         , IAreaAppService areaApp
         , ICustomerAppService customerApp
+        , ITransactionTypeAppService transactionTypeAppService
         , ICustomerAddressAppService customerAddressApp)
         : base(repository, containerRequestManager)
     {
@@ -45,6 +48,7 @@ public class ContainerRequestAppService :
         _areaApp = areaApp;
         _customerApp = customerApp;
         _customerAddressApp = customerAddressApp;
+        _transactionTypeAppService= transactionTypeAppService;
     }
       
 
@@ -57,11 +61,7 @@ public class ContainerRequestAppService :
     public override async Task<ContainerRequestDTO> CreateAsync(ContainerRequestEditInput input)
     {
                
-        input.AutoAgree = true;
-        input.AutoHandle = true;
-        input.AutoSubmit = true;
-        input.AutoCompleteJob = false;
-        input.DirectCreateNote = false;
+        await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
 
         var entity = ObjectMapper.Map<ContainerRequestEditInput, ContainerRequest>(input);
 
@@ -71,5 +71,22 @@ public class ContainerRequestAppService :
         return dto;
     }
 
+    /// <summary>
+    /// 赋值Request业务属性
+    /// </summary>
+    /// <param name="entity"></param>
+    /// <returns></returns>
+    private async Task SetRequestAutoPropertiesAsync(ContainerRequestEditInput 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;
+    }
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/AssembleIssueRequests/AssembleIssueRequestAppService.cs

@@ -230,6 +230,29 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<Asse
         return "无任务生成，请检查库存";
     }
 
+    [HttpPost("CreateImportExcel")]
+    public async Task CreateImportExcelAsync(List<AssembleIssueRequestEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            input.UseOnTheWayLocation = false;
+            input.ActiveDate = DateTime.Now; ;
+            input.IssueRequestType = EnumIssueRequestType.ExcelImport;
+            input.DirectCreateNote = false;
+            input.AutoSubmit = true;
+            input.AutoHandle = false;
+            input.AutoCompleteJob = false;
+            foreach (var detail in input.Details)
+            {
+                detail.BoxQty = detail.Qty;
+                detail.RecommendType = EnumRecommendType.None;
+                detail.Status = EnumStatus.Open;
+            }
+
+            await CreateAsync(input).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/CoatingIssueRequests/CoatingIssueRequestAppService.cs

@@ -230,6 +230,29 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
         return "无任务生成，请检查库存";
     }
 
+    [HttpPost("CreateImportExcel")]
+    public async Task CreateImportExcelAsync(List<CoatingIssueRequestEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            input.UseOnTheWayLocation = false;
+            input.ActiveDate = DateTime.Now; ;
+            input.IssueRequestType = EnumIssueRequestType.ExcelImport;
+            input.DirectCreateNote = false;
+            input.AutoSubmit = true;
+            input.AutoHandle = false;
+            input.AutoCompleteJob = false;
+            foreach (var detail in input.Details)
+            {
+                detail.BoxQty = detail.Qty;
+                detail.RecommendType = EnumRecommendType.None;
+                detail.Status = EnumStatus.Open;
+            }
+
+            await CreateAsync(input).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
     /// <summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/InjectionIssueRequests/InjectionIssueRequestAppService.cs

@@ -151,7 +151,7 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
 
             //因为是刚创建的 所以发料数一定是0
             detailInput.IssuedQty = 0;
-            detailInput.RecommendType = EnumRecommendType.KITTING;
+            detailInput.RecommendType = EnumRecommendType.None;
         }
 
         await SetRequestAutoPropertiesAsync(input).ConfigureAwait(false);
@@ -230,6 +230,29 @@ public class InjectionIssueRequestAppService : SfsStoreRequestAppServiceBase<Inj
         return "无任务生成，请检查库存";
     }
 
+    [HttpPost("CreateImportExcel")]
+    public async Task CreateImportExcelAsync(List<InjectionIssueRequestEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            input.UseOnTheWayLocation = false;
+            input.ActiveDate = DateTime.Now; ;
+            input.IssueRequestType = EnumIssueRequestType.ExcelImport;
+            input.DirectCreateNote = false;
+            input.AutoSubmit = true;
+            input.AutoHandle = false;
+            input.AutoCompleteJob = false;
+            foreach (var detail in input.Details)
+            {
+                detail.BoxQty = detail.Qty;
+                detail.RecommendType = EnumRecommendType.None;
+                detail.Status = EnumStatus.Open;
+            }
+
+            await CreateAsync(input).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
     /// <summary>

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

@@ -4,11 +4,16 @@ using System.Linq;
 using System.Threading.Tasks;
 using Castle.Components.DictionaryAdapter;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
+using Win_in.Sfs.Basedata.Domain;
+using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -228,6 +233,29 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         return "无任务生成，请检查库存";
     }
 
+    [HttpPost("CreateImportExcel")]
+    public async Task CreateImportExcelAsync(List<KittingIssueRequestEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            input.UseOnTheWayLocation = false;
+            input.ActiveDate = DateTime.Now;;
+            input.IssueRequestType = EnumIssueRequestType.ExcelImport;
+            input.DirectCreateNote = false;
+            input.AutoSubmit = true;
+            input.AutoHandle = false;
+            input.AutoCompleteJob = false;
+            foreach (var detail in input.Details)
+            {
+                detail.BoxQty = detail.Qty;
+                detail.RecommendType = EnumRecommendType.KITTING;
+                detail.Status = EnumStatus.Open;
+            }
+
+            await CreateAsync(input).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
     /// <summary>

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

@@ -43,7 +43,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
             .Ignore(x => x.ToWarehouseCode)
             .Ignore(x => x.ToLocationArea)
             .Ignore(x => x.ToLocationGroup)
-            .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2)
+            .Ignore(x => x.ItemName)
+            .Ignore(x => x.ItemDesc1)
+            .Ignore(x => x.ItemDesc2)
             .Ignore(x => x.ProdLine)
             .Ignore(x => x.IssuedQty)
             .Ignore(x => x.ReceivedQty)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/IssuelRequests/SparePartIssueRequests/SparePartIssueRequestAppService.cs

@@ -9,6 +9,7 @@ using NUglify.Helpers;
 using Volo.Abp;
 using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -225,6 +226,29 @@ public class SparePartIssueRequestAppService : SfsStoreRequestAppServiceBase<Spa
         return "无任务生成，请检查库存";
     }
 
+    [HttpPost("CreateImportExcel")]
+    public async Task CreateImportExcelAsync(List<SparePartIssueRequestEditInput> inputs)
+    {
+        foreach (var input in inputs)
+        {
+            input.UseOnTheWayLocation = false;
+            input.ActiveDate = DateTime.Now; ;
+            input.IssueRequestType = EnumIssueRequestType.ExcelImport;
+            input.DirectCreateNote = false;
+            input.AutoSubmit = true;
+            input.AutoHandle = false;
+            input.AutoCompleteJob = false;
+            foreach (var detail in input.Details)
+            {
+                detail.BoxQty = detail.Qty;
+                detail.RecommendType = EnumRecommendType.None;
+                detail.Status = EnumStatus.Open;
+            }
+
+            await CreateAsync(input).ConfigureAwait(false);
+        }
+    }
+
     #region 私有
 
     /// <summary>

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

@@ -28,7 +28,7 @@ public class ContainerRequestEventHandler
     private readonly IContainerNoteAppService _containerNoteApp;
     private readonly IContainerJobAppService _containerJobApp;
     private readonly IEquipmentLocAppService _equipmentLocApp;
-    
+    private readonly ILocationAppService _locationAppService;
 
     private readonly IContainerRequestManager _containerRequestManager;
 
@@ -36,12 +36,15 @@ public class ContainerRequestEventHandler
         IContainerNoteAppService containerNoteApp,
         IContainerJobAppService containerJobApp,
         IEquipmentLocAppService equipmentLocApp,
+        ILocationAppService locationAppService,
         IContainerRequestManager containerRequestManager)
     {
         _containerNoteApp = containerNoteApp;
         _containerJobApp = containerJobApp;
         _equipmentLocApp= equipmentLocApp;
         _containerRequestManager = containerRequestManager;
+        _locationAppService = locationAppService;
+
     }
 
 
@@ -127,58 +130,24 @@ public class ContainerRequestEventHandler
         var createInput = ObjectMapper.Map<ContainerRequest, ContainerNoteEditInput>(request);
         ContainerNoteDetailInput detail=new ContainerNoteDetailInput();
 
-        //createInput.Details = new List<ContainerNoteDetailInput>();
-        //detail.ToLocationCode = request.RequestLocationCode;
-
-        //detail.FromLocationCode = "123";
-        //detail.FromPackingCode = "123";
-        //detail.ToPackingCode = "123";
-        //detail.FromLot = "123";
-        //detail.ToLot = "123";
-        //detail.FromLocationErpCode = "123";
-        //detail.FromWarehouseCode = "123";
-        //detail.ToLocationErpCode = "123";
-        //detail.ToWarehouseCode = "123";
-        //detail.Uom = "123";
-        //detail.ItemCode = "123";
-        //detail.ItemName = "123";
-
-        ////var container = await _equipmentLocApp.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
-
-        ////if (container != null)
-        ////{
-        ////    detail.ItemCode = container.Code;
-        ////}
-
-        //createInput.Details.Add(detail);
      
         return createInput;
     }
 
-
-
     private async Task<ContainerJobEditInput> BuildContainerJobsAsync(ContainerRequest request)
     {
         
         var createInput = ObjectMapper.Map<ContainerRequest, ContainerJobEditInput>(request);
+        var toLocationDto = await _locationAppService.GetByCodeAsync(createInput.RequestLocationCode).ConfigureAwait(false);
+        if(toLocationDto!=null)
+        {
+            createInput.WarehouseCode = toLocationDto.WarehouseCode;
+        }
+        else
+        {
+            createInput.WarehouseCode = "";
+        }
           
-        createInput.WarehouseCode = "T8";        
-
-        //ContainerJobDetailInput detail=new ContainerJobDetailInput();
-
-        //detail.FromLocationCode = "123";
-        //detail.ToLocationCode = "123";
-
-        //detail.ItemCode = "123";
-        //detail.ItemName = "123";
-        //detail.RecommendPackingCode = "123";
-        //detail.RecommendLot = "123";
-        //detail.RecommendFromLocationCode = "123";
-        //detail.RecommendFromLocationErpCode = "123";
-        //detail.Uom = "123";
-
-
-        //createInput.Details.Add(detail);      
                
         return  createInput ;
     }