提交版本

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

@@ -98,6 +98,30 @@ public class UnplannedIssueJobDTO : SfsJobDTOBase<UnplannedIssueJobDetailDTO>
 
 
 
+    /// <summary>
+    /// 专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
 
 
 

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

@@ -119,6 +119,35 @@ public class UnplannedIssueJobEditInput : SfsJobCreateUpdateInputBase, ISfsJobCr
 
 
 
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
+
+
+
+
+
 
 
 

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

@@ -6,6 +6,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Castle.Components.DictionaryAdapter;
 using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml.Wordprocessing;
 using Irony;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -415,6 +416,12 @@ public class UnplannedIssueJobAppService
                     job.FacDetails = new List<UnplannedIssueJobFacDetail>();
                     job.WarehouseCode = balanceDtoGroup.First().WarehouseCode;
                     job.BuildDate = DateTime.Now;
+                    job.Explain = requestDtoDetail.Explain;
+                   
+                    job.CaseCode = requestDtoDetail.CaseCode;
+                    job.ProjCapacityCode = requestDtoDetail.ProjCapacityCode;
+                    job.OnceBusiCode = requestDtoDetail.OnceBusiCode;
+                    job.Explain = requestDtoDetail.Explain;
 
                     foreach (var balanceDto in balanceDtoGroup)
                     {
@@ -516,7 +523,6 @@ public class UnplannedIssueJobAppService
                         job.UnplannedIssueType = EnumUnplannedIssueType.Raw;
                         job.IsHasPackingCode = 0;
                         break;
-
                     case EnumLocationType.KittingWip:
                         job.IsHasPackingCode = 0;
                         job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
@@ -526,9 +532,6 @@ public class UnplannedIssueJobAppService
                         job.UnplannedIssueType = EnumUnplannedIssueType.Wip;
                         break;
                 }
-
-
-
                 job.ItemCode = requestDtoDetail.ItemCode;
                 job.ItemName = requestDtoDetail.ItemName;
                 job.ItemDesc1 = requestDtoDetail.ItemDesc1;

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

@@ -63,6 +63,31 @@ public class UnplannedIssueJob : SfsJobAggregateRootBase<UnplannedIssueJobDetail
 
 
 
+
+    /// <summary>
+    ///     专案
+    /// </summary>
+    [Display(Name = "专案")]
+    public string CaseCode { get; set; }
+
+    /// <summary>
+    ///     项目分类
+    /// </summary>
+    [Display(Name = "项目分类")]
+    public string ProjCapacityCode { get; set; }
+
+    /// <summary>
+    ///     次交易码
+    /// </summary>
+    [Display(Name = "次交易码")]
+    public string OnceBusiCode { get; set; }
+
+    /// <summary>
+    ///     说明
+    /// </summary>
+    [Display(Name = "说明")]
+    public string Explain { get; set; }
+
     /// <summary>
     ///     ERP料号
     /// </summary>

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

@@ -20,13 +20,15 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, UnplannedIssueJobDetail>, IUnplannedIssueJobManager
 {
     private readonly IBalanceRepository _balanceRepository;
+    private readonly IUnplannedIssueRequestRepository _requestRepository;
     public UnplannedIssueJobManager(
         IBalanceRepository balanceRepository,
-
-        IUnplannedIssueJobRepository repository
+        IUnplannedIssueJobRepository repository,
+        IUnplannedIssueRequestRepository requestRepository
         ) : base(repository)
     {
         _balanceRepository = balanceRepository;
+        _requestRepository = requestRepository;
 
     }
 
@@ -46,21 +48,23 @@ public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, Unp
         entity.DeptName = input.DeptName;
         entity.CompleteUserName = input.CompleteUserName;
         entity.CompleteUserId = input.CompleteUserId;
+  
+    
+        var query = await _requestRepository.GetQueryableAsync().ConfigureAwait(false);
+        //var request = query.FirstOrDefault(p => p.Number == input.UnplannedIssueRequestNumber).w;
+        //request
 
-
-
-
-        var first= entity.FacDetails.FirstOrDefault();
+        //var first= entity.FacDetails.FirstOrDefault();
         if (input.UnplannedIssueType == EnumUnplannedIssueType.Raw)
         {
             foreach (var detail in input.Details)
             {
                 detail.SetIdAndNumber(GuidGenerator, input.Id, input.Number);
-                detail.ReasonCode = first.ReasonCode;
-                detail.CaseCode = first.CaseCode;
-                detail.ProjCapacityCode = first.ProjCapacityCode;
-                detail.OnceBusiCode = first.OnceBusiCode;
-                detail.Explain = first.Explain;
+               
+                detail.CaseCode = input.CaseCode;
+                detail.ProjCapacityCode = input.ProjCapacityCode;
+                detail.OnceBusiCode = input.OnceBusiCode;
+                detail.Explain = input.Explain;
                 detail.Status = EnumInventoryStatus.OK;
                 entity.AddDetail(detail);
                 //发料子任务 赋值实际转移  
@@ -71,11 +75,11 @@ public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, Unp
             foreach (var detail in input.Details)
             {            
                 detail.SetIdAndNumber(GuidGenerator, input.Id, input.Number);
-                detail.ReasonCode = first.ReasonCode;
-                detail.CaseCode = first.CaseCode;
-                detail.ProjCapacityCode = first.ProjCapacityCode;
-                detail.OnceBusiCode = first.OnceBusiCode;
-                detail.Explain = first.Explain;
+             
+                detail.CaseCode = input.CaseCode;
+                detail.ProjCapacityCode = input.ProjCapacityCode;
+                detail.OnceBusiCode = input.OnceBusiCode;
+                detail.Explain = input.Explain;
                 detail.Status = EnumInventoryStatus.OK;
                 detail.RecommendArriveDate = DateTime.Now;
                 detail.RecommendProduceDate = DateTime.Now;

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/UnplannedIssueRequestAutoMapperProfile.cs

@@ -37,15 +37,19 @@ public partial class StoreEventAutoMapperProfile : Profile
 
 
 
-.Ignore(x => x.ItemCode               )
-.Ignore(x => x.ItemName               )
-.Ignore(x => x.ItemDesc1              )
-.Ignore(x => x.ItemDesc2              )
-.Ignore(x => x.FromErpLocationCode    )
-.Ignore(x => x.Qty                    )
-.Ignore(x => x.IsHasPackingCode       )
-
+            .Ignore(x => x.ItemCode)
+            .Ignore(x => x.ItemName)
+            .Ignore(x => x.ItemDesc1)
+            .Ignore(x => x.ItemDesc2)
+            .Ignore(x => x.FromErpLocationCode)
+            .Ignore(x => x.Qty)
+            .Ignore(x => x.IsHasPackingCode)
 
+            .Ignore(x => x.CaseCode)
+            .Ignore(x => x.ProjCapacityCode)
+            .Ignore(x => x.CaseCode)
+            .Ignore(x => x.OnceBusiCode)
+            .Ignore(x => x.Explain)
 
 
 
@@ -85,10 +89,10 @@ public partial class StoreEventAutoMapperProfile : Profile
         CreateMap<UnplannedIssueRequest, UnplannedIssueNoteEditInput>()
             .ForMember(x => x.UnplannedIssueRequestNumber, y => y.MapFrom(d => d.Number)).Ignore(x => x.JobNumber)
             .Ignore(x => x.ItemCode)
-            .Ignore(x=>x.ItemDesc1)
-            .Ignore(x=>x.ItemDesc2).Ignore(x=>x.Qty)
-            .Ignore(x=>x.FromErpLocationCode)
-            .Ignore(x=>x.ReasonCode)
+            .Ignore(x => x.ItemDesc1)
+            .Ignore(x => x.ItemDesc2).Ignore(x => x.Qty)
+            .Ignore(x => x.FromErpLocationCode)
+            .Ignore(x => x.ReasonCode)
             .Ignore(x => x.CaseCode)
             .Ignore(x => x.ProjCapacityCode)
             .Ignore(x => x.OnceBusiCode)

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Requests/UnplannedIssueRequestEventHandler.cs

@@ -188,7 +188,7 @@ public class UnplannedIssueRequestEventHandler
         var createInput = ObjectMapper.Map<UnplannedIssueRequest, UnplannedIssueJobEditInput>(entity);
         
         
-
+       
 
         createInput.UnplannedIssueRequestNumber = entity.Number;
         createInput.JobType = EnumJobType.UnplannedIssueJob;