非生产领料任务更新映射关系

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

@@ -54,7 +54,7 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase<UnplannedIssueJobDetailDTO>
     /// 实际明细
     /// </summary>
     [Display(Name = "实际明细")]
-    public List<UnplannedIssueJobFacDetailDTO> FacDetails;
+    public List<UnplannedIssueJobFacDetailDTO> FacDetails { set; get; }
 
 
 }

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs

@@ -111,6 +111,22 @@ public class UnplannedIssueJobAppService
 
 
 
+    //public override async Task<UnplannedIssueJobDTO> GetAsync(Guid id)
+    //{
+    //    var entity=await _repository.GetAsync(id).ConfigureAwait(false);
+    //    var entityDTO=ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueJobDTO>(entity);
+    //    var details=ObjectMapper.Map<List<UnplannedIssueJobDetail>, List<UnplannedIssueJobDetailDTO>>(entity.Details);
+    //    var facDetails=ObjectMapper.Map<List<UnplannedIssueJobFacDetail>, List<UnplannedIssueJobFacDetailDTO>>(entity.FacDetails);
+    //    entityDTO.Details = details;
+    //    entityDTO.FacDetails = facDetails;
+    //    return entityDTO;
+    //    // var inspectJob = await _repository.FindAsync(id).ConfigureAwait(false);
+    //}
+
+ 
+
+
+
 
 
 
@@ -195,6 +211,7 @@ public class UnplannedIssueJobAppService
                 job.Details = new List<UnplannedIssueJobDetail>();
                 job.FacDetails = new List<UnplannedIssueJobFacDetail>();
                 job.WarehouseCode = balanceDtoGroup.First().WarehouseCode;
+                job.BuildDate = DateTime.Now;
 
                 foreach (var balanceDto in balanceDtoGroup)
                 {

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAutoMapperProfile.cs

@@ -15,6 +15,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
         CreateMap<UnplannedIssueJobDetail, UnplannedIssueJobDetailDTO>()
             .ReverseMap();
 
+        CreateMap<UnplannedIssueJobFacDetail, UnplannedIssueJobFacDetailDTO>()
+          .ReverseMap();
+
         CreateMap<UnplannedIssueJobDetailInput, UnplannedIssueJobDetail>()
             .IgnoreAuditedObjectProperties()
             .Ignore(x => x.MasterID)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs

@@ -133,7 +133,7 @@ public class UnplannedReceiptJobAppService
     /// 给立体库发送
     /// </summary>
     /// <returns></returns>
-    public async Task SendDimensionalStorehouseAsync()
+    private async Task SendDimensionalStorehouseAsync()
     {
         throw new System.NotImplementedException();
     }

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

@@ -71,6 +71,8 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
         entity.AutoAgree = true;
         entity.AutoHandle = true;
         entity.DirectCreateNote = false;
+      
+
         await _unplannedIssueRequestManager.CreateAsync(entity).ConfigureAwait(false);
 
         var dto = ObjectMapper.Map<UnplannedIssueRequest, UnplannedIssueRequestDTO>(entity);
@@ -148,6 +150,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
         request.DirectCreateNote = false;
         request.DeptCode = first.DeptCode;
         request.DeptName = first.DeptName;
+        request.BuildDate= DateTime.Now;
      
 
 

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

@@ -35,7 +35,7 @@ public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, Unp
         entity.DeptName = input.DeptName;
         entity.CompleteUserName = input.CompleteUserName;
         entity.CompleteUserId = input.CompleteUserId;
-        foreach (var detail in input.FacDetails)
+        foreach (var detail in input.Details)
         {
             //发料子任务 赋值实际转移
             await entity.BuildDetail(detail.Id, detail.HandledFromLocationGroup, detail.HandledFromLocationArea,detail.HandledFromLocationCode, detail.HandledFromLocationErpCode, detail.HandledFromWarehouseCode, detail.HandledQty, detail.HandledSupplierBatch, detail.HandledArriveDate, detail.HandledProduceDate, detail.HandledExpireDate,

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

@@ -406,7 +406,8 @@ public class StoreEntityFrameworkCoreModule : AbpModule
             options.Entity<JisDeliverJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<UnplannedIssueJob>(orderOptions =>
-                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
+                orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details).Include(o=>o.FacDetails));
+        
             options.Entity<UnplannedReceiptJob>(orderOptions =>
                 orderOptions.DefaultWithDetailsFunc = query => query.Include(o => o.Details));
             options.Entity<ProductionReturnJob>(orderOptions =>