Merge branch 'dev_DY_CC' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_DY_CC

be/DataExchange/src/Win_in.Sfs.Wms.DataExchange.Agent/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}

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);

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);

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())
         {