所有叫料 增加导入

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

@@ -14,4 +14,5 @@ public interface IInjectionIssueRequestAppService
     Task UpdateStatusCompletedAsync(string number);
     Task<string> IsHasNewJobAsync(string requestNumber, List<string> jobNumber);
     Task<List<UnCompletedRequestDto>> GetUnCompletedRequestAsync(List<UnCompletedRequestDto> p_list);
+    Task CreateImportExcelAsync(List<InjectionIssueRequestEditInput> inputs);
 }

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/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>