From fe4e1f97ca40fa3a88ab2e7e5e91eb191a3210b5 Mon Sep 17 00:00:00 2001
From: "boxu.zheng" <boxu.zheng@ccwin-in.com>
Date: Wed, 23 Oct 2024 11:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Jobs/JobController.cs         | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
index 1e427b46f..ca48b804d 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/JobController.cs
@@ -39,6 +39,8 @@ public class JobController : AbpController
     private readonly IAssembleIssueJobAppService _assembleIssueJobAppService;
     private readonly IKittingIssueJobAppService _kittingIssueJobAppService;
     private readonly ISparePartIssueJobAppService _sparePartIssueJobAppService;
+    private readonly IUnplannedIssueJobAppService _unplannedIssueJobAppService;
+    private readonly IUnplannedReceiptJobAppService _unplannedReceiptJobAppService;
 
     /// <summary>
     ///
@@ -70,7 +72,9 @@ public class JobController : AbpController
         ICoatingIssueJobAppService coatingIssueJobAppService,
         IAssembleIssueJobAppService assembleIssueJobAppService,
         IKittingIssueJobAppService kittingIssueJobAppService,
-        ISparePartIssueJobAppService sparePartIssueJobAppService)
+        ISparePartIssueJobAppService sparePartIssueJobAppService,
+        IUnplannedIssueJobAppService unplannedIssueJobAppService,
+        IUnplannedReceiptJobAppService unplannedReceiptJobAppService)
     {
         _userWorkGroupAppService = userWorkGroupAppService;
         _countJobAppService = countJobAppService;
@@ -90,6 +94,8 @@ public class JobController : AbpController
         _assembleIssueJobAppService = assembleIssueJobAppService;
         _kittingIssueJobAppService = kittingIssueJobAppService;
         _sparePartIssueJobAppService = sparePartIssueJobAppService;
+        _unplannedIssueJobAppService = unplannedIssueJobAppService;
+        _unplannedReceiptJobAppService = unplannedReceiptJobAppService;
     }
 
     /// <summary>
@@ -348,6 +354,36 @@ public class JobController : AbpController
             }
         }).ConfigureAwait(false);
         list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+
+        //非生产领料       
+        var unplannedIssueJobAppService = await _unplannedIssueJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+        {
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+
+        //非生产退料       
+        var unplannedreceiptJobAppService = await _unplannedReceiptJobAppService.GetCountByFilterAsync(new SfsJobRequestInputBase
+        {
+            Condition = new Condition
+            {
+                Filters = new List<Filter>
+                {
+                    new(nameof(ProductionReturnJobDTO.WorkGroupCode),jsonCodes,"In"),
+                    new(nameof(ProductionReturnJobDTO.JobStatus),jsonStatus,"In")
+                }
+            }
+        }).ConfigureAwait(false);
+        list.Add(new JobCountDto { JobType = EnumJobType.SparePartIssueJob, Count = sparePartIssueJob });
+
+
         return new ListResultDto<JobCountDto>(list);
     }
 }