From ae517af430acd43425e6d9c5924118a5e5c3c07b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Wed, 25 Dec 2024 13:51:02 +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

---
 .../IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs | 3 +--
 .../InjectionIssueJobs/InjectionIssueJobAppService.cs       | 6 +-----
 .../IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs | 6 +-----
 .../Jobs/UnplannedIssueJobs/UnplannedIssueJobAppService.cs  | 1 +
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
index c860c2d95..b2590c06e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/CoatingIssueJobs/CoatingIssueJobAppService.cs
@@ -182,8 +182,7 @@ public class CoatingIssueJobAppService
             coatingJob.JobStatus == EnumJobStatus.Partial ||
             coatingJob.JobStatus == EnumJobStatus.Wait ||
             coatingJob.JobStatus == EnumJobStatus.Doing||
-
-             coatingJob.JobStatus == EnumJobStatus.WaitAgv
+            coatingJob.JobStatus == EnumJobStatus.WaitAgv
             )
         {
             await _expectOutAppService.RemoveByNumberAsync(coatingJob.Number).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
index f50a6ca7e..607d5582e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/InjectionIssueJobs/InjectionIssueJobAppService.cs
@@ -813,13 +813,9 @@ public class InjectionIssueJobAppService
             //TODO AGV
             //来源永远是库位 目标永远是工位
             var ret = await CallAgvAsync(InjectionIssueJobDto, fromLocationCode, jobDetailInputdetail.Remark).ConfigureAwait(false);
-
 #if DEBUG
-
             return true;
-
 #endif
-
             if (ret.Code != 0)
             {
                 throw new UserFriendlyException($"调用AGV不成功！原因:{ret.Message}");
@@ -1074,6 +1070,7 @@ public class InjectionIssueJobAppService
                     detailInput.ToStatus = EnumInventoryStatus.OK;
                     detailInput.Remark = "AGV反库";
 
+
                     transfer.Details.Add(detailInput);
 
 
@@ -1205,7 +1202,6 @@ public class InjectionIssueJobAppService
     }
 
     #endregion
-
     #region 私有
 
     /// <summary>
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
index d5525a364..94bc5476e 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/IssueJobs/KittingIssueJobs/KittingIssueJobAppService.cs
@@ -197,11 +197,7 @@ public class KittingIssueJobAppService
                                             $"{EnumJobStatus.Partial.GetDisplayName()}、" +
                                             $"{EnumJobStatus.Doing.GetDisplayName()}、" +
                                             $"{EnumJobStatus.Wait.GetDisplayName()}"+
-                                            $"{EnumJobStatus.WaitAgv.GetDisplayName()}"
-
-
-
-                                            );
+                                            $"{EnumJobStatus.WaitAgv.GetDisplayName()}");
         }
     }
 
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 3b12d6686..6dc5ea586 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
@@ -832,6 +832,7 @@ public class UnplannedIssueJobAppService
             request.Batch = detail.HandledPackingCode;
             request.ErpLocationCode = job.FromErpLocationCode;
             request.PakingCode = detail.HandledPackingCode;
+            request.BeginPosition = detail.HandledFromLocationCode;
             request.EndPosition = detail.HandledFromLocationCode;
 
             request.OrderType = request.OrderType = job.UnplannedIssueType == EnumUnplannedIssueType.Raw ? EnumJobType.UnplannedIssueJobHasPacking.ToString() : EnumJobType.UnplannedIssueJobNoPacking.ToString(); ;