From debacf539d3623de19f8bb0a21ddae5e8c5d535b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Mon, 21 Oct 2024 11:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnplannedIssueJobAppService.cs            |  6 ++
 .../UnplannedIssueJobManager.cs               | 58 ++++++++++++++-----
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
index b04aa5cc0..8d83a2c29 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs
@@ -475,6 +475,12 @@ public class UnplannedIssueJobAppService
     public override async Task<UnplannedIssueJobDTO> CompleteAsync(Guid id, UnplannedIssueJobDTO dto)
     {
         var job = await _repository.GetAsync(id).ConfigureAwait(false);
+
+     
+       
+
+
+
         var handleDto = new UnplannedIssueJobDTO();
         //using (var uow = _unitOfWorkManager.Begin())
         //{
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs
index e9aa8610a..285e49c05 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Jobs/UnplannedIssueJobs/UnplannedIssueJobManager.cs
@@ -7,20 +7,27 @@ using System.Threading.Tasks;
 using DocumentFormat.OpenXml.Office.CustomUI;
 using DocumentFormat.OpenXml.Office2010.Excel;
 using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
 using Volo.Abp.Domain.Repositories;
 using Volo.Abp.Users;
 using Volo.Abp.Validation;
 using Win_in.Sfs.Shared.Domain.Shared;
+using Win_in.Sfs.Shared.Domain.Shared.Enums.Store;
+using Win_in.Sfs.Wms.Inventory.Domain;
 
 namespace Win_in.Sfs.Wms.Store.Domain;
 
 public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, UnplannedIssueJobDetail>, IUnplannedIssueJobManager
 {
-
+    private readonly IBalanceRepository _balanceRepository;
     public UnplannedIssueJobManager(
+        IBalanceRepository balanceRepository,
+
         IUnplannedIssueJobRepository repository
         ) : base(repository)
     {
+        _balanceRepository = balanceRepository;
+
     }
 
     /// <summary>
@@ -39,23 +46,44 @@ public class UnplannedIssueJobManager : SfsJobManagerBase<UnplannedIssueJob, Unp
         entity.DeptName = input.DeptName;
         entity.CompleteUserName = input.CompleteUserName;
         entity.CompleteUserId = input.CompleteUserId;
-       
-        var first= entity.FacDetails.FirstOrDefault();
 
-       
-        foreach (var detail in input.Details)
+
+
+
+        var first= entity.FacDetails.FirstOrDefault();
+        if (input.UnplannedIssueType == EnumUnplannedIssueType.Raw)
         {
-            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.Status = EnumInventoryStatus.OK;
-           
-            entity.AddDetail(detail);
-            //发料子任务 赋值实际转移  
+            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.Status = EnumInventoryStatus.OK;
+                entity.AddDetail(detail);
+                //发料子任务 赋值实际转移  
+            }
         }
+        else
+        {
+            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.Status = EnumInventoryStatus.OK;
+                detail.RecommendArriveDate = DateTime.Now;
+                detail.RecommendProduceDate = DateTime.Now;
+                detail.RecommendExpireDate = DateTime.MaxValue;
+                entity.AddDetail(detail);
+                //发料子任务 赋值实际转移  
+            }
+        }   
         return await base.CompleteAsync(entity, user).ConfigureAwait(false);
     }