From b9568762957c6a4a64be42b1745831f5c5e7cf7e Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Tue, 28 May 2024 09:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Properties/launchSettings.json                        | 8 ++++++++
 .../UnplannedIssueJobs/UnplannedIssueJobAppService.cs     | 2 +-
 .../UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs | 2 +-
 .../Plans/CountPlans/CountPlanManager.cs                  | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json

diff --git a/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json
new file mode 100644
index 000000000..33504c948
--- /dev/null
+++ b/be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}
\ No newline at end of file
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 0ee5844d2..fdb297d77 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
@@ -28,7 +28,7 @@ public class UnplannedIssueJobAppService
     /// </summary>
     /// <param name="number"></param>
     /// <returns></returns>
-    [HttpPost("cancel-by-number}")]
+    [HttpPost("cancel-by-number")]
     public virtual async Task CancelByRequestNumberAsync(string number)
     {
         var entities = await _repository.GetListAsync(p => p.UnplannedIssueRequestNumber == number).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
index ec8b4ae43..7ef38657d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/UnplannedReceiptJobs/UnplannedReceiptJobAppService.cs
@@ -29,7 +29,7 @@ public class UnplannedReceiptJobAppService
     /// </summary>
     /// <param name="number"></param>
     /// <returns></returns>
-    [HttpPost("cancel-by-number}")]
+    [HttpPost("cancel-by-number")]
     public virtual async Task CancelByRequestNumberAsync(string number)
     {
         var entities = await _repository.GetListAsync(p => p.UnplannedReceiptRequestNumber == number).ConfigureAwait(false);
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
index f0d16e6bd..ec86709af 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Plans/CountPlans/CountPlanManager.cs
@@ -284,7 +284,7 @@ public class CountPlanManager : SfsStoreRequestManagerBase<CountPlan, CountPlanD
         
         var entity = await Repository.GetAsync(id).ConfigureAwait(false);
         var jobs = await _jobRepository.GetListAsync(p=>p.JobStatus == EnumJobStatus.Doing && p.CountPlanNumber == entity.Number && p.InventoryStage == entity.InventoryStage, true).ConfigureAwait(false);
-        var josbdeatils = jobs.SelectMany(r => r.DepDetails);
+        var josbdeatils = jobs.Where(r=>r.InventoryStage==entity.InventoryStage).SelectMany(r => r.DepDetails);
         var groups = josbdeatils.GroupBy(r => r.PackingCode).Where(g => g.Count() > 1&&!string.IsNullOrEmpty(g.Key)).Select(g => g.Key);     
         if (groups.Any())
         {