更新版本喷涂要料

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobCheckInput.cs

@@ -0,0 +1,8 @@
+using Win_in.Sfs.Wms.Store.Application.Contracts;
+
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+
+public class CoatingIssueJobCheckInput : SfsJobCheckInputBase
+{
+
+}

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

@@ -1,7 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 /// <summary>
 /// 发料任务

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

@@ -2,8 +2,9 @@ using System;
 using System.ComponentModel.DataAnnotations;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public class CoatingIssueJobDetailDTO : SfsJobRecommendFromDetailDTOBase, IHasToLocation
 {

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

@@ -2,8 +2,9 @@ using System;
 using System.ComponentModel.DataAnnotations;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public class CoatingIssueJobDetailInput : SfsJobRecommendFromDetailInputBase, IHasToLocation
 {

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

@@ -3,8 +3,9 @@ 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.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public class CoatingIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCreateInput<CoatingIssueJobDetailInput>
 {

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

@@ -1,7 +1,8 @@
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public static class CoatingIssueJobPermissions
 {

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

@@ -2,8 +2,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public interface ICoatingIssueJobAppService
     : ISfsJobAppServiceBase<CoatingIssueJobDTO, SfsJobRequestInputBase, CoatingIssueJobCheckInput, CoatingIssueJobEditInput>

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

@@ -1,6 +0,0 @@
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
-
-public class CoatingIssueJobCheckInput : SfsJobCheckInputBase
-{
-
-}

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

@@ -1,8 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public class CoatingIssueNoteDTO : SfsStoreDTOBase<CoatingIssueNoteDetailDTO>, IHasJobNumber, IHasRequestNumber
 {

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

@@ -1,8 +1,9 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public class CoatingIssueNoteDetailDTO : SfsStoreRecommendFromDetailWithFromToDTOBase
 {

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

@@ -2,8 +2,9 @@ using System;
 using System.ComponentModel.DataAnnotations;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public class CoatingIssueNoteDetailInput : SfsStoreRecommendFromDetailWithFromToInputBase
 {

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

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public class CoatingIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
 {

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

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public class CoatingIssueNoteImportInput : SfsStoreImportInputBase, IHasJobNumber, IHasRequestNumber
 {

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

@@ -1,7 +1,8 @@
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public static class CoatingIssueNotePermissions
 {

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

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 public interface ICoatingIssueNoteAppService : ISfsStoreMasterReadOnlyAppServiceBase<CoatingIssueNoteDTO, SfsStoreRequestInputBase, CoatingIssueNoteDetailDTO, SfsStoreRequestInputBase>
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/CoatingMaterialRequestDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDTO.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public class CoatingMaterialRequestDTO : SfsStoreRequestDTOBase<CoatingMaterialRequestDetailDTO>, IHasNumber
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/DTOs/CoatingMaterialRequestDetailDTO.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailDTO.cs

@@ -3,8 +3,9 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public class CoatingMaterialRequestDetailDTO : SfsStoreDetailWithQtyDTOBase
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/CoatingMaterialRequestDetailInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetailInput.cs

@@ -2,8 +2,9 @@ using System;
 using System.ComponentModel.DataAnnotations;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public class CoatingMaterialRequestDetailInput : SfsStoreDetailWithQtyInputBase
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/CoatingMaterialRequestEditInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestEditInput.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public class CoatingMaterialRequestEditInput : SfsStoreRequestCreateOrUpdateInputBase
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/Inputs/CoatingMaterialRequestImportInput.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestImportInput.cs

@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 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.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 [Display(Name = "叫料申请")]
 public class CoatingMaterialRequestImportInput : SfsStoreImportInputBase

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequestPermissions.cs → 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.Domain;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public static class CoatingMaterialRequestPermissions
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/ICoatingMaterialRequestAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs

@@ -2,8 +2,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp.Application.Dtos;
+using Win_in.Sfs.Wms.Store.Application.Contracts;
 
-namespace Win_in.Sfs.Wms.Store.Application.Contracts;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public interface ICoatingMaterialRequestAppService
     : ISfsStoreRequestMasterAppServiceBase<CoatingMaterialRequestDTO, SfsStoreRequestInputBase, CoatingMaterialRequestEditInput, CoatingMaterialRequestDetailDTO, SfsStoreRequestInputBase>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs

@@ -12,11 +12,11 @@ using Volo.Abp.ObjectMapping;
 using Win_in.Sfs.Basedata.Domain.Shared;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Application;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
-using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
 
-namespace Win_in.Sfs.Wms.Store.Application;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 [Authorize]
 [Route($"{StoreConsts.RootPath}coatingissue-job")]
@@ -48,8 +48,8 @@ public class CoatingIssueJobAppService
     {
         var entities = await _repository.GetListAsync(c =>
             c.Details.Any(p =>
-                (p.ItemCode == itemCode && p.RecommendFromLocationCode == locationCode) ||
-                (p.ItemCode == itemCode && p.ToLocationCode == locationCode))
+                p.ItemCode == itemCode && p.RecommendFromLocationCode == locationCode ||
+                p.ItemCode == itemCode && p.ToLocationCode == locationCode)
             && (c.JobStatus == EnumJobStatus.Open || c.JobStatus == EnumJobStatus.Doing), true).ConfigureAwait(false);
         var dtos = ObjectMapper.Map<List<CoatingIssueJob>, List<CoatingIssueJobDTO>>(entities);
         return dtos;
@@ -168,7 +168,7 @@ public class CoatingIssueJobAppService
     public virtual async Task<CoatingIssueJobDTO> SaveDetail_SplitPackingAsync(SplitPacking_UpdateJobDetailInput input)
     {
         var job = await _repository.FindAsync(p => p.Number == input.Number).ConfigureAwait(false);
-        CoatingIssueJobDetail detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode ); /*&& p.HandledQty == input.FromQty*/
+        var detail = job.Details.FirstOrDefault(p => p.RecommendPackingCode == input.FromPackingCode); /*&& p.HandledQty == input.FromQty*/
         if (detail == null)
         {
             //throw new UserFriendlyException($"根据HandledPackingCode={input.FromPackingCode}取CoatingIssueJobDetail表为空！");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAutoMapperProfile.cs

@@ -1,7 +1,6 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNoteAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAppService.cs

@@ -11,11 +11,12 @@ using Volo.Abp.Application.Dtos;
 using Volo.Abp.Domain.Entities;
 using Win_in.Sfs.Shared.Domain;
 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;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
-namespace Win_in.Sfs.Wms.Store.Application;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 [Authorize]
 [Route($"{StoreConsts.RootPath}coatingissue-note")]
@@ -54,9 +55,9 @@ public class CoatingIssueNoteAppService :
     [HttpPost("confirm/{id}")]
     public virtual async Task<CoatingIssueNoteDTO> ConfirmAsync(Guid id)
     {
-        var issueNote= await _repository.GetAsync(id).ConfigureAwait(false);
+        var issueNote = await _repository.GetAsync(id).ConfigureAwait(false);
         issueNote.Confirmed = true;
-        issueNote=await _repository.UpdateAsync(issueNote).ConfigureAwait(false);
+        issueNote = await _repository.UpdateAsync(issueNote).ConfigureAwait(false);
         await LocalEventBus.PublishAsync(new SfsConfirmedEntityEventData<CoatingIssueNote>(issueNote), false).ConfigureAwait(false);
         return ObjectMapper.Map<CoatingIssueNote, CoatingIssueNoteDTO>(issueNote);
     }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNoteAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/IssueNotes/CoatingIssueNotes/CoatingIssueNoteAutoMapperProfile.cs

@@ -1,7 +1,7 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNotes;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequestAppService.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAppService.cs

@@ -19,11 +19,12 @@ using Win_in.Sfs.Basedata.Application.Contracts;
 using Win_in.Sfs.Shared.Domain;
 using Win_in.Sfs.Shared.Domain.Shared;
 using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Application;
 using Win_in.Sfs.Wms.Store.Application.Contracts;
 using Win_in.Sfs.Wms.Store.Domain;
 using Win_in.Sfs.Wms.Store.Domain.Shared;
 
-namespace Win_in.Sfs.Wms.Store.Application;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 
 
@@ -93,19 +94,19 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
 
             foreach (var detail in materialRequest.Details)
             {
-                var locationDto= await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
-                CheckLocation(locationDto,detail.ToLocationCode);
+                var locationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
+                CheckLocation(locationDto, detail.ToLocationCode);
 
-                var itemBasicDto=await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
-                CheckItemBasic(itemBasicDto,detail.ItemCode);
+                var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detail.ItemCode).ConfigureAwait(false);
+                CheckItemBasic(itemBasicDto, detail.ItemCode);
 
                 detail.ToLocationArea = locationDto.AreaCode;
                 detail.ToLocationErpCode = locationDto.ErpLocationCode;
                 detail.ToLocationGroup = locationDto.LocationGroupCode;
                 detail.ToWarehouseCode = locationDto.WarehouseCode;
                 detail.ItemDesc1 = itemBasicDto.Desc1;
-                detail.ItemDesc2= itemBasicDto.Desc2;
-                detail.ItemName= itemBasicDto.Name;
+                detail.ItemDesc2 = itemBasicDto.Desc2;
+                detail.ItemName = itemBasicDto.Name;
                 detail.Uom = itemBasicDto.BasicUom;
             }
         }
@@ -115,7 +116,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
 
     public override async Task<CoatingMaterialRequestDTO> HandleAsync(Guid id)
     {
-        var entity=await _repository.GetAsync(id).ConfigureAwait(false);
+        var entity = await _repository.GetAsync(id).ConfigureAwait(false);
         await LocalEventBus.PublishAsync(new SfsHandledEntityEventData<CoatingMaterialRequest>(entity), false).ConfigureAwait(false);
         return ObjectMapper.Map<CoatingMaterialRequest, CoatingMaterialRequestDTO>(entity);
     }
@@ -202,7 +203,7 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
                 throw new UserFriendlyException($"{item.ItemCode} 物料的需求量必须大于 0");
             }
         }
-       
+
 
         input.AutoSubmit = true;
         input.AutoAgree = true;
@@ -212,20 +213,20 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
 
         foreach (var detailInput in input.Details)
         {
-            var toLocationDto= await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
+            var toLocationDto = await _locationAppService.GetByCodeAsync(detailInput.ToLocationCode).ConfigureAwait(false);
             CheckLocation(toLocationDto, detailInput.ToLocationCode);
             var itemBasicDto = await _itemBasicAppService.GetByCodeAsync(detailInput.ItemCode).ConfigureAwait(false);
             CheckItemBasic(itemBasicDto, detailInput.ItemCode);
             detailInput.ItemDesc1 = itemBasicDto.Desc1;
-            if(detailInput.PositionCode.Contains('W'))
+            if (detailInput.PositionCode.Contains('W'))
             {
                 detailInput.RecommendType = EnumRecommendType.W;
             }
-            else if(detailInput.PositionCode.Contains('Q'))
+            else if (detailInput.PositionCode.Contains('Q'))
             {
                 detailInput.RecommendType = EnumRecommendType.Q;
             }
-            else if(detailInput.PositionCode.Contains('K'))
+            else if (detailInput.PositionCode.Contains('K'))
             {
                 detailInput.RecommendType = EnumRecommendType.K;
             }
@@ -249,10 +250,10 @@ public class CoatingMaterialRequestAppService : SfsStoreRequestAppServiceBase<Co
             var toLocationDto = await _locationAppService.GetByCodeAsync(detail.ToLocationCode).ConfigureAwait(false);
             var productionLineDto = await _productionLineAppService.GetByLocationGroupCodeAsync(toLocationDto.LocationGroupCode).ConfigureAwait(false);
 
-            detail.ToLocationArea= toLocationDto.AreaCode;
+            detail.ToLocationArea = toLocationDto.AreaCode;
             detail.ToLocationErpCode = toLocationDto.ErpLocationCode;
             detail.ToLocationGroup = toLocationDto.LocationGroupCode;
-            detail.ToWarehouseCode= toLocationDto.WarehouseCode;
+            detail.ToWarehouseCode = toLocationDto.WarehouseCode;
         }
 
         entity.UseOnTheWayLocation = false;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs

@@ -1,8 +1,7 @@
 using AutoMapper;
 using Volo.Abp.AutoMapper;
 using Win_in.Sfs.Shared.Domain.Shared;
-using Win_in.Sfs.Wms.Store.Application.Contracts;
-using Win_in.Sfs.Wms.Store.Domain;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.Application;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJob.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJob.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 /// <summary>
 /// 发料任务

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobDetail.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobDetail.cs

@@ -1,8 +1,9 @@
 using System;
 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.Domain;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public class CoatingIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHasToLocation
 {
@@ -103,6 +104,6 @@ public class CoatingIssueJobDetail : SfsJobRecommendFromDetailEntityBase, IHasTo
 
     public void SetId(Guid id)
     {
-        this.Id = id;
+        Id = id;
     }
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobManager.cs

@@ -7,8 +7,9 @@ using System.Threading.Tasks;
 using Volo.Abp.Users;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public class CoatingIssueJobManager : SfsJobManagerBase<CoatingIssueJob, CoatingIssueJobDetail>, ICoatingIssueJobManager
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/ICoatingIssueJobManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobManager.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public interface ICoatingIssueJobManager : IJobManager<CoatingIssueJob>
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingIssueJobRepository.cs

@@ -0,0 +1,8 @@
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
+
+public interface ICoatingIssueJobRepository : ISfsJobRepositoryBase<CoatingIssueJob>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/ICoatingssueExtension.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/IssueJobs/CoatingIssueJobs/ICoatingssueExtension.cs

@@ -1,7 +1,8 @@
 using Volo.Abp.Timing;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 public static class CoatingIssueExtension
 {

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

@@ -1,6 +0,0 @@
-namespace Win_in.Sfs.Wms.Store.Domain;
-
-public interface ICoatingIssueJobRepository : ISfsJobRepositoryBase<CoatingIssueJob>
-{
-
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote/CoatingIssueNote.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 /// <summary>
 /// 发料记录

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNoteDetail.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote/CoatingIssueNoteDetail.cs

@@ -1,7 +1,8 @@
 using System;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 public class CoatingIssueNoteDetail : SfsStoreRecommendFromDetailWithFromToEntityBase
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNoteManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote/CoatingIssueNoteManager.cs

@@ -4,8 +4,9 @@ using Microsoft.Extensions.Logging;
 using Volo.Abp;
 using Volo.Abp.Uow;
 using Win_in.Sfs.Shared.Event;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 public class CoatingIssueNoteManager : SfsStoreManagerBase<CoatingIssueNote, CoatingIssueNoteDetail>, ICoatingIssueNoteManager
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote/CoatingIssueNoteRepository.cs

@@ -0,0 +1,8 @@
+using Win_in.Sfs.Wms.Store.Domain;
+
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
+
+public interface ICoatingIssueNoteRepository : ISfsStoreRepositoryBase<CoatingIssueNote>
+{
+
+}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/ICoatingIssueNoteManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/IssueNotes/CoatingIssueNote/ICoatingIssueNoteManager.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Threading.Tasks;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 public interface ICoatingIssueNoteManager : ISfsStoreManager<CoatingIssueNote, CoatingIssueNoteDetail>
 {

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

@@ -1,6 +0,0 @@
-namespace Win_in.Sfs.Wms.Store.Domain;
-
-public interface ICoatingIssueNoteRepository : ISfsStoreRepositoryBase<CoatingIssueNote>
-{
-
-}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequestManager.cs

@@ -5,6 +5,7 @@ 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;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequest.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequest.cs

@@ -1,11 +1,12 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Win_in.Sfs.Shared.Domain.Entities;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 /// <summary>
-/// 要料申请
+/// 喷涂要料申请
 /// </summary>
 public class CoatingMaterialRequest : SfsStoreRequestAggregateRootBase<CoatingMaterialRequestDetail>
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequestDetail.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestDetail.cs

@@ -2,8 +2,9 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 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.Domain;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public class CoatingMaterialRequestDetail : SfsStoreDetailWithQtyEntityBase, IHasToLocation
 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestManager.cs

@@ -0,0 +1,308 @@
+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.Domain;
+using static Win_in.Sfs.Wms.Store.Domain.Shared.StoreSettings;
+
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
+
+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;
+//}

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/ICoatingMaterialRequestManager.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestManager.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 using Win_in.Sfs.Shared.Domain;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/ICoatingMaterialRequestRepository.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestRepository.cs

@@ -1,6 +1,7 @@
 using Win_in.Sfs.Shared.Domain;
+using Win_in.Sfs.Wms.Store.Domain;
 
-namespace Win_in.Sfs.Wms.Store.Domain;
+namespace Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 public interface ICoatingMaterialRequestRepository : ISfsStoreRepositoryBase<CoatingMaterialRequest>,
                                               ISfsBulkRepositoryBase<CoatingMaterialRequest>

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Jobs/IssueJobs/CoatingIssueJobDbContextModelCreatingExtensions.cs

@@ -3,6 +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;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

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.Domain;
+using Win_in.Sfs.Wms.Store.Jobs.IssueJobs.CoatingIssueJobs;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

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.Domain;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

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.Domain;
+using Win_in.Sfs.Wms.Store.Notes.IssueNotes.CoatingIssueNote;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

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.Domain;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

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.Domain;
+using Win_in.Sfs.Wms.Store.Requests.MaterialRequests.CoatingMaterialRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/StoreEntityFrameworkCoreModule.cs

@@ -5,6 +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.UnplannedIssueRequests;
 
 namespace Win_in.Sfs.Wms.Store.EntityFrameworkCore;