将 业务类型 放到 主表

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.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;
 
@@ -36,4 +37,8 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase<UnplannedIssueJobDetailDTO>
     /// </summary>
     [Display(Name = "建档日")]
     public DateTime BuildDate { get; set; }
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs

@@ -29,9 +29,6 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别", Order =0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
-
     /// <summary>
     /// 说明
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs

@@ -36,8 +36,6 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase,
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.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;
 
@@ -64,4 +65,8 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
     [Required(ErrorMessage = "{0}是必填项")]
     public List<UnplannedIssueJobDetailInput> Details { get; set; }
     #endregion
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.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;
 
@@ -15,4 +16,8 @@ public class UnplannedReceiptJobDTO : SfsJobDTOBase<UnplannedReceiptJobDetailDTO
     [Display(Name = "非生产领料申请单号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string UnplannedReceiptRequestNumber { get; set; }
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs

@@ -37,6 +37,11 @@ public class UnplannedReceiptJobDetailDTO : SfsJobRecommendToDetailDTOBase
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别")]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set;}
+    /// <summary>
+    /// 说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs

@@ -36,8 +36,6 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase,
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.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;
 
@@ -64,4 +65,8 @@ public class UnplannedReceiptJobEditInput : SfsJobCreateUpdateInputBase, ISfsJob
     [Required(ErrorMessage = "{0}是必填项")]
     public List<UnplannedReceiptJobDetailInput> Details { get; set; }
     #endregion
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs

@@ -1,6 +1,8 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -34,4 +36,8 @@ public class UnplannedIssueNoteDTO : SfsStoreDTOBase<UnplannedIssueNoteDetailDTO
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string UnplannedIssueRequestNumber { get; set; }
 
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs

@@ -36,8 +36,6 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs

@@ -38,8 +38,6 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs

@@ -2,6 +2,7 @@ using System;
 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;
 
@@ -56,4 +57,8 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
     [Display(Name = "明细列表")]
     public List<UnplannedIssueNoteDetailInput> Details { get; set; }
     #endregion
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs

@@ -10,7 +10,4 @@ public class UnplannedIssueNoteImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "计划外出库请求单号")]
     public string UnplannedIssueRequestNumber { get; set; }
-
-    [Display(Name = "领料类别")]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set;}
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.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;
 
@@ -33,4 +34,8 @@ public class UnplannedReceiptNoteDTO : SfsStoreDTOBase<UnplannedReceiptNoteDetai
     [Display(Name = "计划外入库请求单号")]
     [StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
     public string UnplannedReceiptRequestNumber { get; set; }
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs

@@ -36,8 +36,6 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs

@@ -36,8 +36,6 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs

@@ -2,6 +2,7 @@ using System;
 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;
 
@@ -56,4 +57,8 @@ public class UnplannedReceiptNoteEditInput : SfsStoreCreateOrUpdateInputBase
     [Display(Name = "明细列表")]
     public List<UnplannedReceiptNoteDetailInput> Details { get; set; }
     #endregion
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs

@@ -11,12 +11,4 @@ public class UnplannedReceiptNoteImportInput : SfsStoreImportInputBase
     [Display(Name = "计划外入库请求单号")]
     public string UnplannedReceiptRequestNumber { get; set; }
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
-
-    /// <summary>
-    /// 说明
-    /// </summary>
-    [Display(Name = "说明")]
-    public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -27,4 +28,8 @@ public class UnplannedIssueRequestDTO : SfsStoreRequestDTOBase<UnplannedIssueReq
     [Display(Name = "建档日")]
     [ExporterHeader(DisplayName = "建档日", Format = "yyyyMMdd")]
     public DateTime BuildDate { get; set; }
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs

@@ -32,8 +32,6 @@ public class UnplannedIssueRequestDetailDTO
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs

@@ -30,8 +30,6 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs

@@ -2,6 +2,7 @@ using System;
 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,5 +42,9 @@ public class UnplannedIssueRequestEditInput : SfsStoreRequestCreateOrUpdateInput
     /// </summary>
     [Display(Name = "明细列表")]
     public List<UnplannedIssueRequestDetailInput> Details { get; set; }
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
     #endregion
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs

@@ -10,6 +10,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
 , IHasQty
 {
     [Display(Name = "领料类别", Order = 0)]
+    [Required(ErrorMessage = "领料类别不能为空")]
     public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
@@ -85,5 +86,6 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// 说明
     /// </summary>
     [Display(Name = "说明")]
+    [Required(ErrorMessage = "说明不能为空")]
     public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -29,4 +30,8 @@ public class UnplannedReceiptRequestDTO : SfsStoreRequestDTOBase<UnplannedReceip
     [Display(Name = "建档日")]
     [ExporterHeader(DisplayName = "建档日", Format = "yyyyMMdd")]
     public DateTime BuildDate { get; set; }
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs

@@ -38,8 +38,6 @@ public class UnplannedReceiptRequestDetailDTO
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; }
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs

@@ -30,8 +30,6 @@ public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQt
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs

@@ -2,6 +2,7 @@ using System;
 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;
 
@@ -42,4 +43,8 @@ public class UnplannedReceiptRequestEditInput : SfsStoreRequestCreateOrUpdateInp
     [Display(Name = "明细列表")]
     public List<UnplannedReceiptRequestDetailInput> Details { get; set; }
     #endregion
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs

@@ -10,6 +10,7 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
 , IHasQty
 {
     [Display(Name = "退料类别", Order = 0)]
+    [Required(ErrorMessage = "退料类别不能为空")]
     public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
@@ -85,5 +86,6 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
     /// 说明
     /// </summary>
     [Display(Name = "说明")]
+    [Required(ErrorMessage = "说明不能为空")] 
     public string Explain { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs

@@ -56,7 +56,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
 
             foreach (var detail in unplannedIssueRequest.Details)
             {
-                if (detail.UnplannedIssueType == EnumUnplannedIssueType.Raw)
+                if (unplannedIssueRequest.UnplannedIssueType == EnumUnplannedIssueType.Raw)
                 {
                     var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
                     if (locationDto.Type != EnumLocationType.RAW || locationDto.Type != EnumLocationType.SEMI)
@@ -74,7 +74,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
                     //});
                 }
 
-                if (detail.UnplannedIssueType == EnumUnplannedIssueType.Wip)
+                if (unplannedIssueRequest.UnplannedIssueType == EnumUnplannedIssueType.Wip)
                 {
                     var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
                     if (locationDto.Type != EnumLocationType.WIP)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs

@@ -59,7 +59,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
 
             foreach (var detail in unplannedIssueRequest.Details)
             {
-                if (detail.UnplannedReceiptType == EnumUnplannedReceiptType.Raw)
+                if (unplannedIssueRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Raw)
                 {
                     var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
                     if (locationDto.Type != EnumLocationType.RAW || locationDto.Type != EnumLocationType.SEMI)
@@ -77,7 +77,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
                     //});
                 }
 
-                if (detail.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
+                if (unplannedIssueRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
                 {
                     var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
                     if (locationDto.Type != EnumLocationType.WIP)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -37,6 +38,10 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase<UnplannedIssueJobDetail
     [IgnoreUpdate]
     public DateTime BuildDate { get; set; }
 
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
+
     /// <summary>
     /// 任务明细
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs

@@ -34,8 +34,6 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Volo.Abp.Data;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -37,6 +38,10 @@ public class UnplannedReceiptJob : SfsJobAggregateRootBase<UnplannedReceiptJobDe
     [IgnoreUpdate]
     public DateTime BuildDate { get; set; }
 
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
+
     /// <summary>
     /// 任务明细
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs

@@ -35,8 +35,6 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order =0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+using System.ComponentModel.DataAnnotations;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -43,4 +45,8 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase<UnplannedIssueNoteDe
     /// 任务ID
     /// </summary>
     public string JobNumber { get; set; }
+
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs

@@ -34,9 +34,6 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别", Order = 0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
-
     /// <summary>
     /// 说明
     /// </summary>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs

@@ -1,6 +1,8 @@
 using System;
 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;
 
@@ -43,4 +45,8 @@ public class UnplannedReceiptNote : SfsStoreAggregateRootBase<UnplannedReceiptNo
     /// 任务ID
     /// </summary>
     public string JobNumber { get; set; }
+
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs

@@ -34,8 +34,6 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order = 0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs

@@ -1,6 +1,8 @@
 using System;
 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;
 
@@ -33,4 +35,7 @@ public class UnplannedIssueRequest : SfsStoreRequestAggregateRootBase<UnplannedI
     [IgnoreUpdate]
     public override List<UnplannedIssueRequestDetail> Details { get; set; } = new List<UnplannedIssueRequestDetail>();
 
+    [Display(Name = "领料类别", Order = 0)]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs

@@ -33,8 +33,6 @@ public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocati
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "领料类别", Order =0)]
-    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 
     /// <summary>
     /// 说明

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs

@@ -1,6 +1,8 @@
 using System;
 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;
 
@@ -33,4 +35,7 @@ public class UnplannedReceiptRequest : SfsStoreRequestAggregateRootBase<Unplanne
     [IgnoreUpdate]
     public override List<UnplannedReceiptRequestDetail> Details { get; set; } = new List<UnplannedReceiptRequestDetail>();
 
+    [Display(Name = "退料类别", Order = 0)]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs

@@ -37,8 +37,6 @@ public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLoca
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
-    [Display(Name = "退料类别", Order =0)]
-    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 
     /// <summary>
     /// 说明