diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobCheckInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobCheckInput.cs
index 79cddca5a..2c5c3dd6d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobCheckInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobCheckInput.cs
@@ -1,6 +1,6 @@
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobCheckInput : SfsJobCheckInputBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDTO.cs
index c749f4378..60b9b5dc9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDTO.cs
@@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 /// <summary>
 /// 发料任务
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailDTO.cs
index 115f95726..b8baa0cb7 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailDTO.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasToLocation
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailInput.cs
index 1e7377766..5d0339639 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetailInput.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLocation
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobEditInput.cs
index 87a63a4b5..d1975b46e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobEditInput.cs
@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<CoatingIssueJobDetailInput>
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobPermissions.cs
index 8675aa160..7ab1d8458 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobPermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobPermissions.cs
@@ -2,7 +2,7 @@ using Volo.Abp.Authorization.Permissions;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public static class CoatingIssueJobPermissions
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobAppService.cs
index 6f38c7f72..d989cb12e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobAppService.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public interface ICoatingIssueJobAppService
     : ISfsJobAppServiceBase<CoatingIssueJobDTO, SfsJobRequestInputBase, CoatingIssueJobCheckInput, CoatingIssueJobEditInput>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDTO.cs
index cd637fda3..096f03254 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDTO.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public class CoatingIssueNoteDTO : SfsStoreDTOBase<CoatingIssueNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailDTO.cs
index b087f877a..afbcf4f81 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailDTO.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public class CoatingIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithFromToDTOBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailInput.cs
index eb87d81f2..41b375822 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteDetailInput.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public class CoatingIssueNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEditInput.cs
index 6d0473868..d1b7307c3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteEditInput.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public class CoatingIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteImportInput.cs
index aea921245..5d180cb21 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteImportInput.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public class CoatingIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNotePermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNotePermissions.cs
index dce4f8356..9f497fc34 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNotePermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNotePermissions.cs
@@ -2,7 +2,7 @@ using Volo.Abp.Authorization.Permissions;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public static class CoatingIssueNotePermissions
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteAppService.cs
index b0f63503f..79fbe99cc 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/IssueNotes/CoatingIssueNotes/ICoatingIssueNoteAppService.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 public interface ICoatingIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<CoatingIssueNoteDTO, SfsStoreRequestInputBase, CoatingIssueNoteDetailDTO, SfsStoreRequestInputBase>
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs
index f2214c278..8417f1a70 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestDTO : SfsStoreRequestDTOBase<CoatingMaterialRequestDetailDTO>, IHasNumber
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs
index d290f8e01..578944333 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs
@@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs
index 96b95c704..ffdffd63b 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs
index 77cd8597d..cd9a306fe 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs
index d92b522d6..53b7a3da1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs
@@ -3,7 +3,7 @@ using Win_in.Sfs.Shared.Application.Contracts;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 [Display(Name = "叫料申请")]
 public class CoatingMaterialRequestImportInput : SfsStoreImportInputBase
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs
index 9a576f5cc..6c4b538a1 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestPermissions.cs
@@ -1,7 +1,7 @@
 using Volo.Abp.Authorization.Permissions;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public static class CoatingMaterialRequestPermissions
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs
index 888a9f5c0..5caa7b60c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs
@@ -4,7 +4,7 @@ using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public interface ICoatingMaterialRequestAppService
     : ISfsStoreRequestMasterAppServiceBase<CoatingMaterialRequestDTO, SfsStoreRequestInputBase, CoatingMaterialRequestEditInput, CoatingMaterialRequestDetailDTO, SfsStoreRequestInputBase>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAutoMapperProfile.cs
index bfa1a8f53..6de2d02e7 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAutoMapperProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAppService.cs
index 376a8d3c6..8afa04e00 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAppService.cs
@@ -14,7 +14,7 @@ using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Application;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAutoMapperProfile.cs
index e27722990..44f632c29 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAutoMapperProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
-using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 namespace Win_in.Sfs.Wms.Store.Application;
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs
index 07e0dabfd..360416b97 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs
index ac2d91f68..38ff594ed 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 /// <summary>
 /// 发料任务
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetail.cs
index 930801aca..4b2c9c832 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetail.cs
@@ -3,7 +3,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocation
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs
index be759405e..2e3f2e681 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs
@@ -9,7 +9,7 @@ using Volo.Abp.Validation;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public class CoatingIssueJobManager : SfsJobManagerBase<CoatingIssueJob, CoatingIssueJobDetail>, ICoatingIssueJobManager
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobManager.cs
index 0f88d53b9..7142a5482 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobManager.cs
@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public interface ICoatingIssueJobManager : IJobManager<CoatingIssueJob>
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobRepository.cs
index 5811cbadd..fb7c9e112 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobRepository.cs
@@ -1,6 +1,6 @@
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public interface ICoatingIssueJobRepository : ISfsJobRepositoryBase<CoatingIssueJob>
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingssueExtension.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingssueExtension.cs
index 76e3aeaca..f31192512 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingssueExtension.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingssueExtension.cs
@@ -2,7 +2,7 @@ using Volo.Abp.Timing;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 public static class CoatingIssueExtension
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequestManager.cs
deleted file mode 100644
index f2913de59..000000000
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequestManager.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using DocumentFormat.OpenXml.Math;
-using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Shared.Event;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
-using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
-
-namespace Win_in.Sfs.Wms.Store.Domain;
-
-public class CoatingMaterialRequestManager
-    : SfsStoreRequestManagerBase<CoatingMaterialRequest, CoatingMaterialRequestDetail>
-        , ICoatingMaterialRequestManager
-{
-    private readonly ICoatingMaterialRequestRepository _repository;
-    private readonly ICoatingIssueJobRepository _issueJobRepository;
-
-    public CoatingMaterialRequestManager(
-        ICoatingMaterialRequestRepository repository
-        , ICoatingIssueJobRepository issueJobRepository
-        ) : base(repository)
-    {
-        _repository = repository;
-        _issueJobRepository = issueJobRepository;
-    }
-
-    /// <summary>
-    /// 创建
-    /// </summary>
-    /// <param name="entity"></param>
-    /// <returns></returns>
-    public virtual async Task<CoatingMaterialRequest> CreateBynNumberAsync(CoatingMaterialRequest entity)
-    {
-        var number = string.IsNullOrEmpty(entity.Number) ? await GenerateNumberAsync(nameof(CoatingMaterialRequest), entity.ActiveDate).ConfigureAwait(false) : entity.Number;
-        entity.SetIdAndNumberWithDetails(GuidGenerator, number);
-        entity.Submit();
-        entity.Agree();
-        entity.RequestStatus = EnumRequestStatus.Partial;
-        await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<CoatingMaterialRequest>(entity), false)
-            .ConfigureAwait(false);
-        await _repository.InsertAsync(entity).ConfigureAwait(false);
-        return entity;
-    }
-
-    public virtual async Task UpdateDetailsAsync(CoatingMaterialRequest newEntity)
-    {
-        var oldEntity = await Repository.FindAsync(newEntity.Id, true).ConfigureAwait(false);
-        if(oldEntity!=null)
-        {
-            foreach (var newDetail in newEntity.Details)
-            {
-                oldEntity.ReplaceDetail(newDetail.Id, newDetail);
-            }
-
-            foreach (var detail in oldEntity.Details)
-            {
-                SetMaterialRequestDetailStatus(detail);
-            }
-
-            await SetMaterialRequestStatus(oldEntity).ConfigureAwait(false);
-
-            await Repository.UpdateAsync(oldEntity).ConfigureAwait(false);
-        }
-       
-    }
-
-    private void SetMaterialRequestDetailStatus(CoatingMaterialRequestDetail detail)
-    {
-        if (detail.ReceivedQty >= detail.Qty)//执行的时候  实际收料 多余 要料数
-        {
-            detail.Status = EnumStatus.Close;
-        }
-        else
-        {
-            detail.Status = EnumStatus.Open;
-        }
-    }
-
-    private async Task SetMaterialRequestStatus(CoatingMaterialRequest materialRequest)
-    {
-        if (materialRequest.Details.All(p => p.Status == EnumStatus.Close))
-        {
-            materialRequest.RequestStatus = EnumRequestStatus.Completed;
-        }
-        else
-        {
-            var issueJobs = await _issueJobRepository.GetListAsync(t => t.MaterialRequestNumber == materialRequest.Number).ConfigureAwait(false);
-            if (issueJobs.Count > 0)
-            {
-                if (issueJobs.All(t => t.JobStatus is EnumJobStatus.Done or EnumJobStatus.Closed or EnumJobStatus.Cancelled))
-                {
-                    if (materialRequest.Details.All(p => p.ReceivedQty >= p.Qty))
-                    {
-                        materialRequest.RequestStatus = EnumRequestStatus.Completed;
-                    }
-                    else
-                    {
-                        materialRequest.RequestStatus = EnumRequestStatus.Partial;
-                    }
-                }
-                else
-                {
-                    materialRequest.RequestStatus = EnumRequestStatus.Partial;
-                }
-            }
-            else
-            {
-                materialRequest.RequestStatus = EnumRequestStatus.Partial;
-            }
-        }
-    }
-
-    public virtual async Task CompleteAsync(string number)
-    {
-        var entity = await GetByNumberAsync(number).ConfigureAwait(false);
-        if (entity != null && !entity.Details.Any(p => p.ToBeIssuedQty > 0))
-        {
-            await CompleteAsync(entity).ConfigureAwait(false);
-        }
-    }
-
-    #region 公有
-
-    /*
-    // /// <summary>
-    // /// 处理
-    // /// </summary>
-    // /// <returns></returns>
-    // public virtual async Task<bool> Handle(Guid id)
-    // {
-    //     var entity =await Repository.GetAsync(id);
-    //     if (entity == null)
-    //     {
-    //         return false;
-    //     }
-    //     entity.Handle();
-    //     await Repository.UpdateAsync(entity);
-    //
-    //     await HandledPublishAsync(entity);
-    //     return true;
-    // }
-    //
-    // private async Task HandledPublishAsync(MaterialRequest entity)
-    // {
-    //     //发布，以生成发料任务
-    //     var eto = BuildMaterialRequestHandledETO(entity);
-    //     await DistributedEventBus.PublishAsync(eto);
-    // }
-    //
-    // /// <summary>
-    // /// 关闭
-    // /// </summary>
-    // /// <returns></returns>
-    // public virtual async Task<bool> Close(Guid id)
-    // {
-    //     var entity = await Repository.GetAsync(id);
-    //     if (entity == null)
-    //     {
-    //         return false;
-    //     }
-    //     entity.Close();
-    //     await Repository.UpdateAsync(entity);
-    //
-    //     //发布，以关闭发料任务
-    //     var eto = BuildMaterialRequestClosedETO(entity);
-    //     await DistributedEventBus.PublishAsync(eto);
-    //     return true;
-    // }
-    //
-    // /// <summary>
-    // /// 打开
-    // /// </summary>
-    // /// <returns></returns>
-    // public virtual async Task<bool> Open(Guid id)
-    // {
-    //     var entity = await Repository.GetAsync(id);
-    //     if (entity == null)
-    //     {
-    //         return false;
-    //     }
-    //     entity.Open();
-    //
-    //     await Repository.UpdateAsync(entity);
-    //
-    //     //发布，以打开发料任务
-    //     var eto = BuildMaterialRequestOpenedETO(entity);
-    //     await DistributedEventBus.PublishAsync(eto);
-    //     return true;
-    // }
-
-    public virtual async Task<MaterialRequest> CreateAndHandleAsync(MaterialRequest entity)
-    {
-
-        await base.CreateAsync(entity);
-
-        await base.HandleAsync(entity.Id);
-
-        return entity;
-    }
-    */
-
-
-    #endregion
-
-    #region Import
-
-    /// <summary>
-    /// 执行导入
-    /// </summary>
-    public virtual async Task ImportDataAsync(List<CoatingMaterialRequest> mergeEntities, List<CoatingMaterialRequest> deleteEntities = null)
-    {
-        if (deleteEntities != null && deleteEntities.Count > 0)
-        {
-            await _repository.BulkDeleteAsync(deleteEntities).ConfigureAwait(false);
-        }
-
-        await CreateManyAsync(mergeEntities).ConfigureAwait(false);
-    }
-
-    #endregion
-
-    /*
-    #region 私有
-
-    private MaterialRequestOpenedETO BuildMaterialRequestOpenedETO(MaterialRequest materialRequest)
-    {
-        var materialRequestETO = new MaterialRequestOpenedETO()
-        {
-            Number = materialRequest.Number,
-            Workshop = materialRequest.Workshop,
-            Status = materialRequest.Status,
-            Details = BuildMaterialRequestDetailETO(materialRequest.Details)
-        };
-        return materialRequestETO;
-    }
-
-    private MaterialRequestClosedETO BuildMaterialRequestClosedETO(MaterialRequest materialRequest)
-    {
-        var materialRequestETO = new MaterialRequestClosedETO()
-        {
-            Company = materialRequest.Company,
-            Number = materialRequest.Number
-        };
-        return materialRequestETO;
-    }
-
-    private MaterialRequestHandledETO BuildMaterialRequestHandledETO(MaterialRequest materialRequest)
-    {
-        var materialRequestETO = new MaterialRequestHandledETO()
-        {
-            Company = materialRequest.Company,
-            Number = materialRequest.Number,
-            Workshop = materialRequest.Workshop,
-            Status = materialRequest.Status,
-            Details = BuildMaterialRequestDetailETO(materialRequest.Details)
-        };
-        return materialRequestETO;
-    }
-
-    private List<MaterialRequestDetailETO> BuildMaterialRequestDetailETO(List<MaterialRequestDetail> materialRequestDetail)
-    {
-        var list = new List<MaterialRequestDetailETO>();
-        foreach (var detail in materialRequestDetail)
-        {
-            var materialRequestDetailETO = new MaterialRequestDetailETO()
-            {
-                Number = detail.Number,
-                Item = detail.Item,
-                ItemCode = detail.ItemCode,
-                Qty = detail.Qty,
-                ToLocationCode = detail.ToLocationCode,
-                ProdLine = detail.ProdLine,
-                WorkStation = detail.WorkStation,
-                ExpiredTime = detail.ExpiredTime,
-                Status = detail.Status
-            };
-            list.Add(materialRequestDetailETO);
-        }
-        return list;
-    }
-
-    #endregion
-    */
-}
-
-///// <summary>
-///// 为了解决补料时 无法拿到订阅错误信息
-///// </summary>
-///// <param name="entity"></param>
-///// <param name="flag"></param>
-///// <returns></returns>
-//public virtual async Task<MaterialRequest> CreateAndHandleAsync(MaterialRequest entity, bool flag)
-//{
-//    await entity.Handle();
-//    foreach (var detail in entity.Details)
-//    {
-//        detail.Status = EnumStoreStatus.Handle;
-//    }
-//    await base.CreateAsync(entity);
-
-//    //发布，以打开发料任务??
-//    //var eto = BuildMaterialRequestHandledETO(entity);
-//    //await DistributedEventBus.PublishAsync(eto);
-
-//    return entity;
-//}
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs
index 82c9941f7..4b78a9ab3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs
@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 /// <summary>
 /// 喷涂要料申请
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs
index 463992059..2b197b158 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs
@@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
 {
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs
index cc126a8d8..894d94c18 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs
@@ -6,9 +6,10 @@ using DocumentFormat.OpenXml.Math;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Event;
 using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public class CoatingMaterialRequestManager
     : SfsStoreRequestManagerBase<CoatingMaterialRequest, CoatingMaterialRequestDetail>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs
index 8eb54b5e2..5a0606363 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 using Win_in.Sfs.Shared.Domain;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs
index 70bcaf081..b9f449b9a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs
@@ -1,7 +1,7 @@
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 public interface ICoatingMaterialRequestRepository : ISfsStoreRepositoryBase<CoatingMaterialRequest>,
                                               ISfsBulkRepositoryBase<CoatingMaterialRequest>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobDbContextModelCreatingExtensions.cs
index 95b7123d6..492703d20 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobDbContextModelCreatingExtensions.cs
@@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.EntityFrameworkCore;
 using Win_in.Sfs.Wms.Store.Domain;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobEfCoreRepository.cs
index 6b7c6877b..c8239166a 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobEfCoreRepository.cs
@@ -1,5 +1,5 @@
 using Volo.Abp.EntityFrameworkCore;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs
index a2e45c5e2..11dcd02be 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteDbContextModelCreatingExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs
index 4c8f05205..52079ada4 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Notes/IssueNotes/CoatingIssueNoteEfCoreRepository.cs
@@ -1,5 +1,5 @@
 using Volo.Abp.EntityFrameworkCore;
-using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs
index 3a6d25116..ac89a7de5 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestDbContextModelCreatingExtensions.cs
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs
index d8bb72b14..14ee5826f 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Requests/MaterialRequests/CoatingMaterialRequestEfCoreRepository.cs
@@ -1,5 +1,5 @@
 using Volo.Abp.EntityFrameworkCore;
-using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
index d37002d40..b27cd4fc9 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs
@@ -5,9 +5,9 @@ using Volo.Abp.EntityFrameworkCore.DependencyInjection;
 using Volo.Abp.Modularity;
 using Win_in.Sfs.Wms.Store.CountAdjustRequests;
 using Win_in.Sfs.Wms.Store.Domain;
-using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
-using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
-using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests;
 using Win_in.Sfs.Wms.Store.UnplannedIssueRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;