From bcb2293d3ecdd685de3da43b6959ec9046b82234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Wed, 23 Oct 2024 14:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=A4=E6=96=AD=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=B3=E8=AF=B7=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnplannedIssueJobAppService.cs            | 33 ++++++++-----------
 ...lannedIssueRequestForDongyangAppService.cs | 12 ++++---
 2 files changed, 22 insertions(+), 23 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 5c69339d5..f97013a88 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
@@ -89,11 +89,10 @@ public class UnplannedIssueJobAppService
     {
         List<BalanceDTO> useBalancesOut = new EditableList<BalanceDTO>();
         var jobs = await BuildUnplannedIssueJobAsync(requestDto, useBalancesOut).ConfigureAwait(false);
-        if (useBalancesOut.Count == 0)
-        {
-            throw new UserFriendlyException($"请求单号{requestDto.Number},无推荐库位请检查是否又库存!");
-        }
-
+        //if (useBalancesOut.Count == 0)
+        //{
+        //    throw new UserFriendlyException($"请求单号{requestDto.Number},无推荐库位请检查是否又库存!");
+        //}
         await _unplannedIssueJobManager.AddManyAsync(jobs).ConfigureAwait(false);
         //await _repository.InsertManyAsync(jobs.ToList()).ConfigureAwait(false);
         var first = jobs.FirstOrDefault();
@@ -141,30 +140,16 @@ public class UnplannedIssueJobAppService
                 dto.InjectFrom(item);
                 dto.Qty = availableToDeduct;
                 balanceDTOs.Add(dto);
-
-
-
-
-
-
-
-
-
                 if (enumLocationType == EnumLocationType.RAW)
                 {
-                   
                     undto.InjectFrom(item);
                     unbalanceDTOs.Add(dto); 
-
                 }
                 else
                 {
-                  
                     undto.InjectFrom(item);
                     undto.Qty = availableToDeduct;
                     unbalanceDTOs.Add(dto);
-
-
                 }
 
             }
@@ -628,6 +613,16 @@ public class UnplannedIssueJobAppService
     }
 
 
+
+
+
+
+
+
+
+
+
+
     [HttpPost("handle/{id}")]
 
     public override async Task<UnplannedIssueJobDTO> CompleteAsync(Guid id, UnplannedIssueJobDTO dto)
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
index 35a1c37b6..a643bcdb3 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/UnplannedIssueRequests/UnplannedIssueRequestForDongyangAppService.cs
@@ -260,8 +260,8 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
         request.SetId(GuidGenerator.Create());
         request.AutoCompleteJob = false;
         request.AutoSubmit = isAutoSubmit;
-        request.AutoAgree = false;
-        request.AutoHandle = false;
+        request.AutoAgree = true;
+        request.AutoHandle = true;
         request.DirectCreateNote = false;
         request.DeptCode = first.DeptCode;
         request.DeptName = first.DeptName;
@@ -435,11 +435,15 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
             //                                           $"或{EnumUnplannedReceiptType.Raw.GetDisplayName()}】");
             //}
 
+       
+
+
+
 
             unplannedReceiptRequest.AutoCompleteJob = false;
             unplannedReceiptRequest.AutoSubmit = true;
             unplannedReceiptRequest.AutoAgree = false;
-            unplannedReceiptRequest.AutoHandle = false;
+            unplannedReceiptRequest.AutoHandle = true;
             unplannedReceiptRequest.DirectCreateNote = false;
             unplannedReceiptRequest.BuildDate = DateTime.Now;
             await SetRequestAutoPropertiesAsync(unplannedReceiptRequest).ConfigureAwait(false);
@@ -579,7 +583,7 @@ public class UnplannedIssueRequestForDongyangAppService : UnplannedIssueRequestA
 
         entity.AutoCompleteJob = false;
         entity.AutoSubmit = true;
-        entity.AutoAgree = false;
+        entity.AutoAgree = true;
         entity.AutoHandle = false;
         entity.DirectCreateNote = false;