diff --git a/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
new file mode 100644
index 000000000..c238ca481
--- /dev/null
+++ b/be/Hosts/Wms.Host/Win_in.Sfs.Wms.Store.HttpApi.Host/Properties/PublishProfiles/FolderProfile1.pubxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>D:\~all-publish\WMS2.0_东阳\Win_in.Sfs.Wms.Store.HttpApi.Host</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs
index 9dfce5374..cdd1ab6d1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDTO.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs
index 19f85514a..c5e5a72ba 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/DTOs/UnplannedIssueJobDetailDTO.cs
+++ b/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>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs
index c19b71d85..a226df48b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs
index 8d8ca332f..bedfcd59d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedIssueJobs/Inputs/UnplannedIssueJobEditInput.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs
index b66b1ea51..90dd1aa68 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDTO.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs
index 0e063d4ae..6aab85cab 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/DTOs/UnplannedReceiptJobDetailDTO.cs
+++ b/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; }
+
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs
index 100cd4ffc..5c43f7c65 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs
index 24cb570b5..84efb5a48 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/UnplannedReceiptJobs/Inputs/UnplannedReceiptJobEditInput.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs
index d2083567d..2282ed6b8 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDTO.cs
+++ b/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; }
+
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs
index 710f86a6c..b44e53cd7 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/DTOs/UnplannedIssueNoteDetailDTO.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs
index d5eaa7a20..f772f5752 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
index f2dd94b09..b07d84487 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs
index b602152e7..30f01680f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteImportInput.cs
+++ b/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;}
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs
index 2dce0d3e5..0bcd85dec 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDTO.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs
index 8ab8655aa..e57b07cb3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/DTOs/UnplannedReceiptNoteDetailDTO.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs
index d843a0e27..8702ade82 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs
index c55cac70d..f5d150cba 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteEditInput.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs
index 9e58e0306..9fd4491d8 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedReceiptNotes/Inputs/UnplannedReceiptNoteImportInput.cs
+++ b/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; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs
index 21595f3cc..093d7f25f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDTO.cs
+++ b/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 = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs
index d73836987..93371f9d2 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/DTOs/UnplannedIssueRequestDetailDTO.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs
index 4cc8014f1..f16937e51 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs
index eda5245f5..ece29f4db 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestEditInput.cs
+++ b/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 = "领料类别")]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
     #endregion
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs
index 4bab771e3..df1b9969c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedIssueRequests/Inputs/UnplannedIssueRequestImportInput.cs
+++ b/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; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs
index f438ac799..dff2acbb0 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDTO.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs
index d9478de1a..d75165a6d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/DTOs/UnplannedReceiptRequestDetailDTO.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs
index 355b86ba7..918144209 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestDetailInput.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs
index 2719cfaac..40d406bd4 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestEditInput.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs
index 8e30d0c69..626a82b11 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/UnplannedReceiptRequests/Inputs/UnplannedReceiptRequestImportInput.cs
+++ b/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; }
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index 8b439bf7d..15ca3ba7d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -14,6 +14,7 @@ using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
 using Win_in.Sfs.Wms.Inventory.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Domain.Acl.TransactionType;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
@@ -24,17 +25,21 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
     private readonly IBalanceAppService _balanceAppService;
     private readonly IDepartmentAppService _departmentAppService;
     private readonly ILocationAppService _locationAppService;
+    private readonly ITransactionTypeAclService _transactionTypeAclService;
 
 
     public UnplannedIssueRequestForDongyangAppService(IUnplannedIssueRequestRepository repository,
         IUnplannedIssueRequestManager unplannedIssueRequestManager,
-        IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, IDepartmentAppService departmentAppService, ILocationAppService locationAppService) : base(repository, unplannedIssueRequestManager)
+        IDepartmentAppService departmentApp, IBalanceAppService balanceAppService, IDepartmentAppService departmentAppService, ILocationAppService locationAppService,
+        ITransactionTypeAclService transactionTypeAclService
+        ) : base(repository, unplannedIssueRequestManager)
     {
         _unplannedIssueRequestManager = unplannedIssueRequestManager;
         _departmentApp = departmentApp;
         _balanceAppService = balanceAppService;
         _departmentAppService = departmentAppService;
         _locationAppService = locationAppService;
+        _transactionTypeAclService = transactionTypeAclService;
     }
 
     /// <summary>
@@ -56,7 +61,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 +79,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)
@@ -89,6 +94,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
                     //    ItemCode = detail.ItemCode,
 
                     //});
+                    unplannedIssueRequest.DirectCreateNote = true; //线边 直接生成记录
                 }
 
 
@@ -229,8 +235,9 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
     /// <returns></returns>
     private async Task SetRequestAutoPropertiesAsync(UnplannedIssueRequest entity)
     {
-        var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
-
+        //var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
+        var tranType = await _transactionTypeAclService.GetByTransTypeAsync(EnumTransType.UnplannedIssue, EnumTransSubType.None).ConfigureAwait(false);
+        
         Check.NotNull(tranType, "事务类型", "事务类型不存在");
 
         entity.AutoCompleteJob = tranType.AutoCompleteJob;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
index 04f60d71a..ee56153bf 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestForDongyangAppService.cs
@@ -49,17 +49,17 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
     {
         var addList = dictionary.Where(p => p.Value == EntityState.Added).Select(p => p.Key);
 
-        foreach (var unplannedIssueRequest in addList)
+        foreach (var unplannedReceiptRequest in addList)
         {
-            unplannedIssueRequest.Worker = CurrentUser.GetUserName();
-            unplannedIssueRequest.CreatorId = CurrentUser.Id;
+            unplannedReceiptRequest.Worker = CurrentUser.GetUserName();
+            unplannedReceiptRequest.CreatorId = CurrentUser.Id;
 
-            await SetRequestAutoPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false);
-            await SetEntityPropertiesAsync(unplannedIssueRequest).ConfigureAwait(false);
+            await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
+            await SetEntityPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
 
-            foreach (var detail in unplannedIssueRequest.Details)
+            foreach (var detail in unplannedReceiptRequest.Details)
             {
-                if (detail.UnplannedReceiptType == EnumUnplannedReceiptType.Raw)
+                if (unplannedReceiptRequest.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 (unplannedReceiptRequest.UnplannedReceiptType == EnumUnplannedReceiptType.Wip)
                 {
                     var locationDto = await _locationAppService.GetByCodeAsync(detail.LocationCode).ConfigureAwait(false);
                     if (locationDto.Type != EnumLocationType.WIP)
@@ -92,6 +92,7 @@ public class UnplannedReceiptRequestForDongyangAppService : UnplannedReceiptRequ
                     //    ItemCode = detail.ItemCode,
 
                     //});
+                    unplannedReceiptRequest.DirectCreateNote = true; //线边 直接生成记录
                 }
 
                 await SetDetailPropertiesAsync(detail).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs
index 0beb7db09..550dcb16c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJob.cs
+++ b/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>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs
index a44f36655..b582ac4af 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobDetail.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs
index a230a25bf..606d299aa 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJob.cs
+++ b/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>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs
index e056ad333..740fe376b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobDetail.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
index 2e236c912..2a1214fa3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs
index b467cb413..1f91489a0 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNoteDetail.cs
+++ b/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>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs
index 777373e50..ddabb31c6 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNote.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs
index 8d9b1564b..e3512a90c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedReceiptNotes/UnplannedReceiptNoteDetail.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
index 4843097c6..5eea5540b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequest.cs
+++ b/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>();
 
+    [IgnoreUpdate]
+    public EnumUnplannedIssueType UnplannedIssueType { get; set; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs
index 967c41d98..0f723262f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedIssueRequests/UnplannedIssueRequestDetail.cs
+++ b/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>
     /// 说明
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs
index e2b325376..276f54bd1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequest.cs
+++ b/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; }
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs
index 79f460529..b42d5d090 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/UnplannedReceiptRequests/UnplannedReceiptRequestDetail.cs
+++ b/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>
     /// 说明