导入

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

@@ -0,0 +1,17 @@
+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 EnumUnplannedIssueType
+{
+    [Display(Name = "无")]
+    None =0,
+    [Display(Name = "原料 非生产领料")]
+    Raw = 1,//原料 非生产领料
+    [Display(Name = "线边 非生产领料")]
+    Wip =2,//线边 非生产领料
+}

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

@@ -0,0 +1,17 @@
+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 EnumUnplannedReceiptType
+{
+    [Display(Name = "无")]
+    None =0,
+    [Display(Name = "原料 非生产退料")]
+    Raw = 1,//原料 非生产退料
+    [Display(Name = "线边 非生产退料")]
+    Wip =2,//线边 非生产退料
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.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;
 
@@ -28,4 +29,6 @@ public class UnplannedIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -34,4 +35,7 @@ public class UnplannedIssueJobDetailInput : SfsJobRecommendFromDetailInputBase,
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,6 +1,7 @@
 using DocumentFormat.OpenXml.Wordprocessing;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -35,4 +36,7 @@ public class UnplannedReceiptJobDetailDTO : SfsJobRecommendToDetailDTOBase
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set;}
 }

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

@@ -2,6 +2,7 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase, IHasExtraProperties
 {
@@ -34,4 +35,7 @@ public class UnplannedReceiptJobDetailInput : SfsJobRecommendToDetailInputBase,
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -35,4 +36,6 @@ public class UnplannedIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithLotPac
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
 
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
 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,7 @@ public class UnplannedIssueNoteDetailInput : SfsStoreRecommendFromDetailWithLotP
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.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;
 
@@ -9,5 +10,7 @@ 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/UnplannedReceiptNoteDetailDTO.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -34,4 +35,7 @@ public class UnplannedReceiptNoteDetailDTO : SfsStoreRecommendToDetailWithLotPac
     /// </summary>
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -34,4 +35,7 @@ public class UnplannedReceiptNoteDetailInput : SfsStoreRecommendToDetailWithLotP
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.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;
 
@@ -9,4 +10,7 @@ public class UnplannedReceiptNoteImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "计划外入库请求单号")]
     public string UnplannedReceiptRequestNumber { get; set; }
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -30,4 +31,7 @@ public class UnplannedIssueRequestDetailDTO
     /// </summary>
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -28,4 +29,7 @@ public class UnplannedIssueRequestDetailInput : SfsStoreDetailWithLotPackingQtyL
     /// </summary>
     [Display(Name = "次交易码")]
     public string OnceBusiCode { get; set; }
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -76,4 +77,7 @@ public class UnplannedIssueRequestImportInput : SfsStoreImportInputBase
     /// </summary>
     [Display(Name = "说明")]
     public string Remark { get; set; }
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -36,4 +37,7 @@ public class UnplannedReceiptRequestDetailDTO
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; }
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -28,4 +29,7 @@ public class UnplannedReceiptRequestDetailInput : SfsStoreDetailWithLotPackingQt
     /// </summary>
     [Display(Name = "扩展属性")]
     public ExtraPropertyDictionary ExtraProperties { set; get; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Application.Contracts;
 
@@ -77,4 +78,6 @@ public class UnplannedReceiptRequestImportInput : SfsStoreImportInputBase
     [Display(Name = "说明")]
     public string Remark { get; set; }
 
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -32,4 +33,7 @@ public class UnplannedIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHas
     /// 扩展属性
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -34,4 +35,6 @@ public class UnplannedReceiptJobDetail : SfsJobRecommendToDetailEntityBase, IHas
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -32,4 +33,7 @@ public class UnplannedIssueNoteDetail : SfsStoreRecommendFromDetailWithLotPackin
     /// 扩展属性
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -32,4 +33,7 @@ public class UnplannedReceiptNoteDetail : SfsStoreRecommendToDetailWithLotPackin
     /// 扩展属性
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
+
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -32,4 +33,7 @@ public class UnplannedIssueRequestDetail : SfsStoreDetailWithLotPackingQtyLocati
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
+    [Display(Name = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }

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

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Data;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
@@ -36,4 +37,7 @@ public class UnplannedReceiptRequestDetail : SfsStoreDetailWithLotPackingQtyLoca
     /// </summary>
     public ExtraPropertyDictionary ExtraProperties { get; set; } = new ExtraPropertyDictionary();
 
+    [Display(Name = "退料类别")]
+    public EnumUnplannedReceiptType UnplannedReceiptType { get; set; }
+
 }