修改 发料表结构

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

@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
-public enum EnumIssueType
-{
-    None=0,
-
-    /// <summary>
-    /// 原材料
-    /// </summary>
-    [Display(Name = "原材料")]
-    RAW =1,
-
-    /// <summary>
-    /// 半成品
-    /// </summary>
-    [Display(Name = "半成品")]
-    SEMI= 2,
-
-    /// <summary>
-    /// 立体库
-    /// </summary>
-    [Display(Name = "立体库")]
-    DimensionalStorehouse = 2,
-}

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -10,11 +11,10 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class AssembleIssueJobDTO : SfsJobDTOBase<AssembleIssueJobDetailDTO>
 {
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 生产线

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 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;
 
@@ -25,11 +26,10 @@ public class AssembleIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCre
     public string AssembleRequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 任务类型

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
@@ -11,11 +12,10 @@ namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 public class CoatingIssueJobDTO : SfsJobDTOBase<CoatingIssueJobDetailDTO>
 {
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 生产线

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
@@ -26,11 +27,10 @@ public class CoatingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCrea
     public string MaterialRequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 任务类型

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

@@ -48,12 +48,6 @@ public class InjectionIssueJobDetailDTO : SfsDetailDTOBase
     /// </summary>
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

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

@@ -48,12 +48,6 @@ public class InjectionIssueJobDetailInput : SfsDetailInputBase
     /// </summary>
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -10,12 +11,10 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 public class KittingIssueJobDTO : SfsJobDTOBase<KittingIssueJobDetailDTO>
 {
     /// <summary>
-    ///     叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
-
     /// <summary>
     ///     生产线
     /// </summary>

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

@@ -26,11 +26,10 @@ public class KittingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCrea
     public string KittingRequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 任务类型

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/DTOs/AssembleIssueNoteDTO.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -20,11 +21,10 @@ public class AssembleIssueNoteDTO : SfsStoreDTOBase<AssembleIssueNoteDetailDTO>,
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteEditInput.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -41,11 +42,10 @@ public class AssembleIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/AssembleIssueNotes/Inputs/AssembleIssueNoteImportInput.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -19,10 +20,10 @@ public class AssembleIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumb
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    public string RequestType { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/DTOs/CoatingIssueNoteDTO.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
@@ -18,13 +19,11 @@ public class CoatingIssueNoteDTO : SfsStoreDTOBase<CoatingIssueNoteDetailDTO>, I
     /// </summary>
     [Display(Name = "请求代码")]
     public string RequestNumber { get; set; }
-
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteEditInput.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
@@ -42,11 +43,10 @@ public class CoatingIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/Inputs/CoatingIssueNoteImportInput.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
 namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
@@ -20,10 +21,10 @@ public class CoatingIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumbe
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    public string RequestType { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/DTOs/InjectionIssueNoteDetailDTO.cs

@@ -48,12 +48,6 @@ public class InjectionIssueNoteDetailDTO : SfsDetailDTOBase
     /// </summary>
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/InjectionIssueNotes/Inputs/InjectionIssueNoteDetailInput.cs

@@ -48,12 +48,6 @@ public class InjectionIssueNoteDetailInput : SfsDetailInputBase
     /// </summary>
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/DTOs/KittingIssueNoteDTO.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -20,11 +21,10 @@ public class KittingIssueNoteDTO : SfsStoreDTOBase<KittingIssueNoteDetailDTO>, I
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteEditInput.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -41,11 +42,10 @@ public class KittingIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string RequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/KittingIssueNotes/Inputs/KittingIssueNoteImportInput.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -19,10 +20,10 @@ public class KittingIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumbe
     public string RequestNumber { get; set; }
 
     /// <summary>
-    /// 叫料请求类型
+    ///     叫料类型
     /// </summary>
-    [Display(Name = "叫料请求类型")]
+    [Display(Name = "叫料类型")]
-    public string RequestType { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

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

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -8,8 +9,7 @@ public class KittingIssueRequestDTO : SfsStoreRequestDTOBase<KittingIssueRequest
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    public string Type { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
-
     /// <summary>
     ///     是否使用在途库
     /// </summary>

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

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -12,7 +13,7 @@ public class KittingIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInputBa
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    public string Type { get; set; }
+    public EnumIssueRequestType IssueRequestType { get; set; }
 
     /// <summary>
     /// 使用在途库

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -11,11 +12,7 @@ public class KittingIssueRequestImportInput : SfsStoreImportInputBase
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    [Required(ErrorMessage = "{0}是必填项")]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    [ImporterHeader(Name = "叫料类型")]
-    [ExporterHeader(DisplayName = "叫料类型")]
-    [ValueMapping("人工拉动", EnumMaterialRequestType.Issue_Manual)]
-    public string Type { get; set; }
 
     /// <summary>
     /// 物品代码

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

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
 using System.Threading.Tasks;
-using DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main;
-using IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
-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;
-using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -31,8 +16,10 @@ namespace Win_in.Sfs.Wms.Store.Application;
 /// </summary>
 [Authorize]
 [Route($"{StoreConsts.RootPath}assemble-request")]
-public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<AssembleIssueRequest, AssembleIssueRequestDTO,
+public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<AssembleIssueRequest,
-        SfsStoreRequestInputBase, AssembleIssueRequestEditInput, AssembleIssueRequestDetail, AssembleIssueRequestDetailDTO,
+        AssembleIssueRequestDTO,
+        SfsStoreRequestInputBase, AssembleIssueRequestEditInput, AssembleIssueRequestDetail,
+        AssembleIssueRequestDetailDTO,
         SfsStoreRequestInputBase, AssembleIssueRequestImportInput>,
     IAssembleIssueRequestAppService
 {
@@ -68,8 +55,6 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<Asse
     }
 
 
-    #region 东阳V2
-
     public override async Task<AssembleIssueRequestDTO> HandleAsync(Guid id)
     {
         await Task.CompletedTask.ConfigureAwait(false);
@@ -129,7 +114,8 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<Asse
     /// <returns></returns>
     private async Task SetRequestAutoPropertiesAsync(AssembleIssueRequestEditInput entity)
     {
-        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
+        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None)
+            .ConfigureAwait(false);
         Check.NotNull(tranType, "事务类型", "事务类型不存在");
         entity.AutoSubmit = tranType.AutoSubmitRequest;
         entity.AutoAgree = tranType.AutoAgreeRequest;
@@ -148,113 +134,9 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<Asse
         return assembleRequestDto;
     }
 
-    #endregion
-
-    #region 导入
-
-    /// <summary>
-    /// 用来重写 导入数据时可以加工数据
-    /// </summary>
-    /// <param name="dictionary"></param>
-    /// <returns></returns>
-    protected override async Task<Dictionary<AssembleIssueRequest, EntityState>> ImportProcessingEntityAsync(
-        Dictionary<AssembleIssueRequest, EntityState> dictionary)
-    {
-        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
-
-        foreach (var assembleRequest in addList)
-        {
-            assembleRequest.Worker = CurrentUser.GetUserName();
-            assembleRequest.CreatorId = CurrentUser.Id;
-            if (assembleRequest.Type == EnumTransSubType.Issue_Manual.GetDisplayName())
-            {
-                assembleRequest.Type = EnumTransSubType.Issue_Manual.ToString();
-            }
-
-            foreach (var detail in assembleRequest.Details)
-            {
-                var locationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
-                CheckLocation(locationDto, detail.ToLocationCode);
-
-                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
-                CheckItemBasic(itemBasicDto, detail.ItemCode);
-
-                detail.ToLocationArea = locationDto.AreaCode;
-                detail.ToLocationErpCode = locationDto.ErpLocationCode;
-                detail.ToLocationGroup = locationDto.LocationGroupCode;
-                detail.ToWarehouseCode = locationDto.WarehouseCode;
-                detail.ItemDesc1 = itemBasicDto.Desc1;
-                detail.ItemDesc2 = itemBasicDto.Desc2;
-                detail.ItemName = itemBasicDto.Name;
-                detail.Uom = itemBasicDto.BasicUom;
-                detail.StdPackQty = itemBasicDto.StdPackQty;
-            }
-        }
-
-        return dictionary;
-    }
-
-    /// <summary>
-    /// 导入验证
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="validationRresult"></param>
-    /// <returns></returns>
-    protected override async Task ValidateImportModelAsync(AssembleIssueRequestImportInput model,
-        List<ValidationResult> validationRresult)
-    {
-        _ = new Dictionary<string, string>();
-        _ = await CheckItemBasicAsync(model, validationRresult).ConfigureAwait(false);
-        _ = await CheckLocationAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckAreaAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckStoreRelationAsync(model, validationRresult).ConfigureAwait(false);
-    }
-
-    #endregion
 
     #region 校验
 
-    protected override async Task<bool> ValidateImportEntities(Dictionary<AssembleIssueRequest, EntityState> dict)
-    {
-        foreach (var entity in dict.Keys)
-        {
-            var tranType = await TransactionTypeAclService
-                .GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
-
-            Check.NotNull(tranType, "事务类型", "事务类型不存在");
-
-            entity.AutoCompleteJob = tranType.AutoCompleteJob;
-            entity.AutoSubmit = tranType.AutoSubmitRequest;
-            entity.AutoAgree = tranType.AutoAgreeRequest;
-            entity.AutoHandle = tranType.AutoHandleRequest;
-            entity.DirectCreateNote = tranType.DirectCreateNote;
-        }
-
-        return await base.ValidateImportEntities(dict).ConfigureAwait(false);
-    }
-
-    protected async Task CheckAreaAsync(AssembleIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
-        if (area == null)
-        {
-            validationRresult.Add(new ValidationResult($"调出库区{importInput.FromLocationArea}不存在", new[] { "调出库区" }));
-        }
-    }
-
-    protected async Task CheckStoreRelationAsync(AssembleIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var itemStoreRelation = await _itemStoreRelationApp
-            .GetFirstAsync(importInput.ItemCode, importInput.ToLocationCode).ConfigureAwait(false);
-        if (itemStoreRelation == null)
-        {
-            validationRresult.Add(new ValidationResult(
-                $"物品代码{importInput.ItemCode}与目标库位{importInput.ToLocationCode}不存在对应关", new[] { "物品库位对应关系" }));
-        }
-    }
-
     private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
     {
         if (itemBasicDto == null)
@@ -276,34 +158,5 @@ public class AssembleIssueRequestAppService : SfsStoreRequestAppServiceBase<Asse
         }
     }
 
-    protected async Task<ItemBasicDTO> CheckItemBasicAsync(AssembleIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
-        if (item == null)
-        {
-            validationRresult.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new[] { "物品代码" }));
-        }
-        else if (item.StdPackQty == 0)
-        {
-            validationRresult.Add(
-                new ValidationResult($"物品代码{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" }));
-        }
-
-        return item;
-    }
-
-    protected async Task<LocationDTO> CheckLocationAsync(AssembleIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);
-        if (location == null)
-        {
-            validationRresult.Add(new ValidationResult($"目标库位{importInput.ToLocationCode}不存在", new[] { "目标库位" }));
-        }
-
-        return location;
-    }
-
     #endregion
 }

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

@@ -25,7 +25,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
 
         CreateMap<AssembleIssueRequestImportInput, AssembleIssueRequest>()
             .IgnoreAuditedObjectProperties()
-            .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))
             .Ignore(x => x.UseOnTheWayLocation)
             .Ignore(x => x.Details)
             .Ignore(x => x.Remark)

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

@@ -67,9 +67,6 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
         _transactionTypeAppService = transactionTypeAppService;
     }
 
-
-    #region 东阳V2
-
     public override async Task<CoatingIssueRequestDTO> HandleAsync(Guid id)
     {
         await Task.CompletedTask.ConfigureAwait(false);
@@ -150,113 +147,8 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
         return coatingMaterialRequestDto;
     }
 
-    #endregion
-
-    #region 导入
-
-    /// <summary>
-    /// 用来重写 导入数据时可以加工数据
-    /// </summary>
-    /// <param name="dictionary"></param>
-    /// <returns></returns>
-    protected override async Task<Dictionary<CoatingIssueRequest, EntityState>> ImportProcessingEntityAsync(
-        Dictionary<CoatingIssueRequest, EntityState> dictionary)
-    {
-        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
-
-        foreach (var coatingMaterialRequest in addList)
-        {
-            coatingMaterialRequest.Worker = CurrentUser.GetUserName();
-            coatingMaterialRequest.CreatorId = CurrentUser.Id;
-            if (coatingMaterialRequest.Type == EnumTransSubType.Issue_Manual.GetDisplayName())
-            {
-                coatingMaterialRequest.Type = EnumTransSubType.Issue_Manual.ToString();
-            }
-
-            foreach (var detail in coatingMaterialRequest.Details)
-            {
-                var locationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
-                CheckLocation(locationDto, detail.ToLocationCode);
-
-                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
-                CheckItemBasic(itemBasicDto, detail.ItemCode);
-
-                detail.ToLocationArea = locationDto.AreaCode;
-                detail.ToLocationErpCode = locationDto.ErpLocationCode;
-                detail.ToLocationGroup = locationDto.LocationGroupCode;
-                detail.ToWarehouseCode = locationDto.WarehouseCode;
-                detail.ItemDesc1 = itemBasicDto.Desc1;
-                detail.ItemDesc2 = itemBasicDto.Desc2;
-                detail.ItemName = itemBasicDto.Name;
-                detail.Uom = itemBasicDto.BasicUom;
-                detail.StdPackQty = itemBasicDto.StdPackQty;
-            }
-        }
-
-        return dictionary;
-    }
-
-    /// <summary>
-    /// 导入验证
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="validationRresult"></param>
-    /// <returns></returns>
-    protected override async Task ValidateImportModelAsync(CoatingIssueRequestImportInput model,
-        List<ValidationResult> validationRresult)
-    {
-        _ = new Dictionary<string, string>();
-        _ = await CheckItemBasicAsync(model, validationRresult).ConfigureAwait(false);
-        _ = await CheckLocationAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckAreaAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckStoreRelationAsync(model, validationRresult).ConfigureAwait(false);
-    }
-
-    #endregion
-
     #region 校验
 
-    protected override async Task<bool> ValidateImportEntities(Dictionary<CoatingIssueRequest, EntityState> dict)
-    {
-        foreach (var entity in dict.Keys)
-        {
-            var tranType = await TransactionTypeAclService
-                .GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
-
-            Check.NotNull(tranType, "事务类型", "事务类型不存在");
-
-            entity.AutoCompleteJob = tranType.AutoCompleteJob;
-            entity.AutoSubmit = tranType.AutoSubmitRequest;
-            entity.AutoAgree = tranType.AutoAgreeRequest;
-            entity.AutoHandle = tranType.AutoHandleRequest;
-            entity.DirectCreateNote = tranType.DirectCreateNote;
-        }
-
-        return await base.ValidateImportEntities(dict).ConfigureAwait(false);
-    }
-
-    protected async Task CheckAreaAsync(CoatingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
-        if (area == null)
-        {
-            validationRresult.Add(new ValidationResult($"调出库区{importInput.FromLocationArea}不存在", new[] { "调出库区" }));
-        }
-    }
-
-    protected async Task CheckStoreRelationAsync(CoatingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var itemStoreRelation = await _itemStoreRelationApp
-            .GetFirstAsync(importInput.ItemCode, importInput.ToLocationCode).ConfigureAwait(false);
-        if (itemStoreRelation == null)
-        {
-            validationRresult.Add(new ValidationResult(
-                $"物品代码{importInput.ItemCode}与目标库位{importInput.ToLocationCode}不存在对应关", new[] { "物品库位对应关系" }));
-        }
-    }
-
     private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
     {
         if (itemBasicDto == null)
@@ -278,34 +170,5 @@ public class CoatingIssueRequestAppService : SfsStoreRequestAppServiceBase<Coati
         }
     }
 
-    protected async Task<ItemBasicDTO> CheckItemBasicAsync(CoatingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
-        if (item == null)
-        {
-            validationRresult.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new[] { "物品代码" }));
-        }
-        else if (item.StdPackQty == 0)
-        {
-            validationRresult.Add(
-                new ValidationResult($"物品代码{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" }));
-        }
-
-        return item;
-    }
-
-    protected async Task<LocationDTO> CheckLocationAsync(CoatingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);
-        if (location == null)
-        {
-            validationRresult.Add(new ValidationResult($"目标库位{importInput.ToLocationCode}不存在", new[] { "目标库位" }));
-        }
-
-        return location;
-    }
-
     #endregion
 }

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

@@ -26,7 +26,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
 
         CreateMap<CoatingIssueRequestImportInput, CoatingIssueRequest>()
             .IgnoreAuditedObjectProperties()
-            .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))
             .Ignore(x => x.UseOnTheWayLocation)
             .Ignore(x => x.Details)
             .Ignore(x => x.Remark)

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

@@ -1,25 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
 using System.Threading.Tasks;
-using DocumentFormat.OpenXml.Office.PowerPoint.Y2021.M06.Main;
-using IdentityModel;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Volo.Abp;
-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;
-using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
@@ -68,9 +53,6 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         _transactionTypeAppService = transactionTypeAppService;
     }
 
-
-    #region 东阳V2
-
     public override async Task<KittingIssueRequestDTO> HandleAsync(Guid id)
     {
         await Task.CompletedTask.ConfigureAwait(false);
@@ -98,7 +80,7 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
 
             detailInput.ToLocationArea = toLocationDto.AreaCode;
             detailInput.ToLocationGroup = toLocationDto.LocationGroupCode;
-            detailInput.ToWarehouseCode= toLocationDto.WarehouseCode;
+            detailInput.ToWarehouseCode = toLocationDto.WarehouseCode;
             detailInput.ProdLine = detailInput.ToLocationCode;
             detailInput.ToLocationErpCode = toLocationDto.ErpLocationCode;
 
@@ -130,7 +112,8 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
     /// <returns></returns>
     private async Task SetRequestAutoPropertiesAsync(KittingIssueRequestEditInput entity)
     {
-        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
+        var tranType = await _transactionTypeAppService.GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None)
+            .ConfigureAwait(false);
         Check.NotNull(tranType, "事务类型", "事务类型不存在");
         entity.AutoSubmit = tranType.AutoSubmitRequest;
         entity.AutoAgree = tranType.AutoAgreeRequest;
@@ -149,113 +132,8 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         return kittingIssueRequestDto;
     }
 
-    #endregion
-
-    #region 导入
-
-    /// <summary>
-    /// 用来重写 导入数据时可以加工数据
-    /// </summary>
-    /// <param name="dictionary"></param>
-    /// <returns></returns>
-    protected override async Task<Dictionary<KittingIssueRequest, EntityState>> ImportProcessingEntityAsync(
-        Dictionary<KittingIssueRequest, EntityState> dictionary)
-    {
-        var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
-
-        foreach (var kittingIssueRequest in addList)
-        {
-            kittingIssueRequest.Worker = CurrentUser.GetUserName();
-            kittingIssueRequest.CreatorId = CurrentUser.Id;
-            if (kittingIssueRequest.Type == EnumTransSubType.Issue_Manual.GetDisplayName())
-            {
-                kittingIssueRequest.Type = EnumTransSubType.Issue_Manual.ToString();
-            }
-
-            foreach (var detail in kittingIssueRequest.Details)
-            {
-                var locationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
-                CheckLocation(locationDto, detail.ToLocationCode);
-
-                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
-                CheckItemBasic(itemBasicDto, detail.ItemCode);
-
-                detail.ToLocationArea = locationDto.AreaCode;
-                detail.ToLocationErpCode = locationDto.ErpLocationCode;
-                detail.ToLocationGroup = locationDto.LocationGroupCode;
-                detail.ToWarehouseCode = locationDto.WarehouseCode;
-                detail.ItemDesc1 = itemBasicDto.Desc1;
-                detail.ItemDesc2 = itemBasicDto.Desc2;
-                detail.ItemName = itemBasicDto.Name;
-                detail.Uom = itemBasicDto.BasicUom;
-                detail.StdPackQty = itemBasicDto.StdPackQty;
-            }
-        }
-
-        return dictionary;
-    }
-
-    /// <summary>
-    /// 导入验证
-    /// </summary>
-    /// <param name="model"></param>
-    /// <param name="validationRresult"></param>
-    /// <returns></returns>
-    protected override async Task ValidateImportModelAsync(KittingIssueRequestImportInput model,
-        List<ValidationResult> validationRresult)
-    {
-        _ = new Dictionary<string, string>();
-        _ = await CheckItemBasicAsync(model, validationRresult).ConfigureAwait(false);
-        _ = await CheckLocationAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckAreaAsync(model, validationRresult).ConfigureAwait(false);
-        await CheckStoreRelationAsync(model, validationRresult).ConfigureAwait(false);
-    }
-
-    #endregion
-
     #region 校验
 
-    protected override async Task<bool> ValidateImportEntities(Dictionary<KittingIssueRequest, EntityState> dict)
-    {
-        foreach (var entity in dict.Keys)
-        {
-            var tranType = await TransactionTypeAclService
-                .GetByTransTypeAsync(EnumTransType.Issue, EnumTransSubType.None).ConfigureAwait(false);
-
-            Check.NotNull(tranType, "事务类型", "事务类型不存在");
-
-            entity.AutoCompleteJob = tranType.AutoCompleteJob;
-            entity.AutoSubmit = tranType.AutoSubmitRequest;
-            entity.AutoAgree = tranType.AutoAgreeRequest;
-            entity.AutoHandle = tranType.AutoHandleRequest;
-            entity.DirectCreateNote = tranType.DirectCreateNote;
-        }
-
-        return await base.ValidateImportEntities(dict).ConfigureAwait(false);
-    }
-
-    protected async Task CheckAreaAsync(KittingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var area = await _areaApp.GetByCodeAsync(importInput.FromLocationArea).ConfigureAwait(false);
-        if (area == null)
-        {
-            validationRresult.Add(new ValidationResult($"调出库区{importInput.FromLocationArea}不存在", new[] { "调出库区" }));
-        }
-    }
-
-    protected async Task CheckStoreRelationAsync(KittingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var itemStoreRelation = await _itemStoreRelationApp
-            .GetFirstAsync(importInput.ItemCode, importInput.ToLocationCode).ConfigureAwait(false);
-        if (itemStoreRelation == null)
-        {
-            validationRresult.Add(new ValidationResult(
-                $"物品代码{importInput.ItemCode}与目标库位{importInput.ToLocationCode}不存在对应关", new[] { "物品库位对应关系" }));
-        }
-    }
-
     private void CheckItemBasic(ItemBasicDTO itemBasicDto, string itemCode)
     {
         if (itemBasicDto == null)
@@ -277,34 +155,5 @@ public class KittingIssueRequestAppService : SfsStoreRequestAppServiceBase<Kitti
         }
     }
 
-    protected async Task<ItemBasicDTO> CheckItemBasicAsync(KittingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var item = await _itemBasicAppService.GetByCodeAsync(importInput.ItemCode).ConfigureAwait(false);
-        if (item == null)
-        {
-            validationRresult.Add(new ValidationResult($"物品代码{importInput.ItemCode}不存在", new[] { "物品代码" }));
-        }
-        else if (item.StdPackQty == 0)
-        {
-            validationRresult.Add(
-                new ValidationResult($"物品代码{importInput.ItemCode}的物品信息中标准包装等于0或不存在", new[] { "标准包装" }));
-        }
-
-        return item;
-    }
-
-    protected async Task<LocationDTO> CheckLocationAsync(KittingIssueRequestImportInput importInput,
-        List<ValidationResult> validationRresult)
-    {
-        var location = await _locationAppService.GetByCodeAsync(importInput.ToLocationCode).ConfigureAwait(false);
-        if (location == null)
-        {
-            validationRresult.Add(new ValidationResult($"目标库位{importInput.ToLocationCode}不存在", new[] { "目标库位" }));
-        }
-
-        return location;
-    }
-
     #endregion
 }

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

@@ -25,7 +25,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile
 
         CreateMap<KittingIssueRequestImportInput, KittingIssueRequest>()
             .IgnoreAuditedObjectProperties()
-            .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString()))           
             .Ignore(x => x.UseOnTheWayLocation)
             .Ignore(x => x.Details)
             .Ignore(x => x.Remark)

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

@@ -54,12 +54,6 @@ public class InjectionIssueJobDetail : SfsDetailEntityBase
     [Display(Name = "计量单位")]
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/InjectionIssueNotes/InjectionIssueNoteDetail.cs

@@ -48,12 +48,6 @@ public class InjectionIssueNoteDetail : SfsStoreDetailEntityBase
     /// </summary>
     public string Uom { get; set; }
 
-    /// <summary>
-    ///     发料方式
-    /// </summary>
-    [Display(Name = "发料方式")]
-    public EnumIssueType IssueType { get; set; }
-
     #endregion
 
     #region 请求信息

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequest.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -13,8 +14,7 @@ public class AssembleIssueRequest : SfsStoreRequestAggregateRootBase<AssembleIss
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    [IgnoreUpdate]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string Type { get; set; }        
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/CoatingIssuelRequests/CoatingIssueRequest.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Store.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
@@ -14,8 +15,7 @@ public class CoatingIssueRequest : SfsStoreRequestAggregateRootBase<CoatingIssue
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    [IgnoreUpdate]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string Type { get; set; }   
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequest.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -13,8 +14,7 @@ public class KittingIssueRequest : SfsStoreRequestAggregateRootBase<KittingIssue
     ///     叫料类型
     /// </summary>
     [Display(Name = "叫料类型")]
-    [IgnoreUpdate]
+    public EnumIssueRequestType IssueRequestType { get; set; }
-    public string Type { get; set; }
 
     /// <summary>
     /// 使用在途库

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestManager.cs

@@ -19,11 +19,6 @@ public class KittingIssueRequestManager
         _repository = repository;        
     }
 
-    #region 东阳V2
-
-    #endregion
-
-
     /// <summary>
     ///     创建 同时 直接赋值Number 为了返回Number
     /// </summary>
@@ -53,22 +48,8 @@ public class KittingIssueRequestManager
         }
     }
 
-
+    public Task ImportDataAsync(List<KittingIssueRequest> entities, List<KittingIssueRequest> deleteEntities = null)
-    #region 导入
-
-    /// <summary>
-    ///     执行导入
-    /// </summary>
-    public virtual async Task ImportDataAsync(List<KittingIssueRequest> mergeEntities,
-        List<KittingIssueRequest> deleteEntities = null)
-    {
-        if (deleteEntities != null && deleteEntities.Count > 0)
     {
-            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
+        throw new System.NotImplementedException();
     }
-
-        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
-    }
-
-    #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240426024936_Update_Issue.cs

@@ -0,0 +1,181 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Wms.Store.Migrations
+{
+    public partial class Update_Issue : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropIndex(
+                name: "IX_Store_KittingPackagingNoteDetail_KittingCode",
+                table: "Store_KittingPackagingNoteDetail");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Store_KittingPackagingNoteChassisDetail_KittingCode",
+                table: "Store_KittingPackagingNoteChassisDetail");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "Store_KittingIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "Store_InjectionIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Store_InjectionIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Store_CountPlan");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "Store_CoatingIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "Store_AssembleIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "RequestType",
+                table: "Job_InjectionIssueJob");
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_KittingIssueRequest",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_InjectionIssueRequest",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_InjectionIssueNote",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_CoatingIssueRequest",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Store_AssembleIssueRequest",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IssueRequestType",
+                table: "Job_InjectionIssueJob",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_KittingIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_InjectionIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_InjectionIssueNote");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_CoatingIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Store_AssembleIssueRequest");
+
+            migrationBuilder.DropColumn(
+                name: "IssueRequestType",
+                table: "Job_InjectionIssueJob");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "Store_KittingIssueRequest",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "Store_InjectionIssueRequest",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Store_InjectionIssueNote",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Store_CountPlan",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "Store_CoatingIssueRequest",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "Store_AssembleIssueRequest",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RequestType",
+                table: "Job_InjectionIssueJob",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_KittingPackagingNoteDetail_KittingCode",
+                table: "Store_KittingPackagingNoteDetail",
+                column: "KittingCode",
+                unique: true,
+                filter: "[KittingCode] IS NOT NULL");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Store_KittingPackagingNoteChassisDetail_KittingCode",
+                table: "Store_KittingPackagingNoteChassisDetail",
+                column: "KittingCode",
+                unique: true,
+                filter: "[KittingCode] IS NOT NULL");
+        }
+    }
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@@ -965,6 +965,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("LastModificationTime");
@@ -993,10 +996,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("Type")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("UseOnTheWayLocation")
                         .HasColumnType("bit");
 
@@ -5158,11 +5157,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("RequestType")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<string>("Stage")
                         .IsRequired()
                         .HasMaxLength(64)
@@ -7684,6 +7678,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit")
                         .HasDefaultValue(false);
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobDescription")
                         .HasMaxLength(1024)
                         .HasColumnType("nvarchar(1024)");
@@ -7730,10 +7727,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(3072)")
                         .HasColumnName("Remark");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -8131,6 +8124,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<string>("JobNumber")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)")
@@ -8159,10 +8155,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
-                    b.Property<string>("RequestType")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -8573,6 +8565,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("LastModificationTime");
@@ -8601,10 +8596,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("Type")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("UseOnTheWayLocation")
                         .HasColumnType("bit");
 
@@ -14258,6 +14249,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("LastModificationTime");
@@ -14286,10 +14280,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("Type")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("UseOnTheWayLocation")
                         .HasColumnType("bit");
 
@@ -14572,10 +14562,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("KittingCode")
-                        .IsUnique()
-                        .HasFilter("[KittingCode] IS NOT NULL");
-
                     b.HasIndex("MasterID");
 
                     b.ToTable("Store_KittingPackagingNoteChassisDetail", (string)null);
@@ -14647,10 +14633,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("KittingCode")
-                        .IsUnique()
-                        .HasFilter("[KittingCode] IS NOT NULL");
-
                     b.HasIndex("MasterID");
 
                     b.ToTable("Store_KittingPackagingNoteDetail", (string)null);
@@ -30506,6 +30488,9 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<int>("IssueRequestType")
+                        .HasColumnType("int");
+
                     b.Property<DateTime?>("LastModificationTime")
                         .HasColumnType("datetime2")
                         .HasColumnName("LastModificationTime");
@@ -30534,10 +30519,6 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
 
-                    b.Property<string>("Type")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
-
                     b.Property<bool>("UseOnTheWayLocation")
                         .HasColumnType("bit");
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/AssembleIssueRequests/AssembleIssueRequestDbContextModelCreatingExtensions.cs

@@ -19,7 +19,6 @@ public static class AssembleIssueRequestDbContextModelCreatingExtensions
             b.ConfigureSfsStoreBase();
 
             //Properties
-            b.Property(q => q.Type).HasMaxLength(SfsPropertyConst.CodeLength);                             
             b.Property(q => q.RequestStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
 
             //Relations

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/CoatingIssueRequests/CoatingIssueRequestDbContextModelCreatingExtensions.cs

@@ -19,7 +19,6 @@ public static class CoatingIssueRequestDbContextModelCreatingExtensions
             b.ConfigureSfsStoreBase();
 
             //Properties
-            b.Property(q => q.Type).HasMaxLength(SfsPropertyConst.CodeLength);            
             b.Property(q => q.RequestStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
 
             //Relations

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/IssueRequests/KittingIssueRequests/KittingIssueRequestDbContextModelCreatingExtensions.cs

@@ -19,7 +19,6 @@ public static class KittingIssueRequestDbContextModelCreatingExtensions
             b.ConfigureSfsStoreBase();
 
             //Properties
-            b.Property(q => q.Type).HasMaxLength(SfsPropertyConst.CodeLength);            
             b.Property(q => q.RequestStatus).HasMaxLength(SfsPropertyConst.NameLength).HasConversion<string>();
 
             //Relations

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

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

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

@@ -15,7 +15,6 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<CoatingIssueRequest, CoatingIssueJobEditInput>()
             .ForMember(x => x.MaterialRequestNumber, y => y.MapFrom(d => d.Number))
-            .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
             .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,7 +13,6 @@ public partial class StoreEventAutoMapperProfile : Profile
     {
         CreateMap<KittingIssueRequest, KittingIssueJobEditInput>()
             .ForMember(x => x.KittingRequestNumber, y => y.MapFrom(d => d.Number))
-            .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type))
             .Ignore(x => x.WarehouseCode)
             .Ignore(x => x.UpStreamJobNumber)
             .Ignore(x => x.JobType)