From 61e8824b5d56f05e9706e649f371b988fdf76e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 29 Oct 2024 11:18:06 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Jobs/UnplannedIssueJobController.cs | 12 +++++++++++-
 .../Jobs/UnplannedReceiptJobController.cs           | 13 +++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs
index 8e5f3fc25..a2669e2b2 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedIssueJobController.cs
@@ -52,13 +52,18 @@ public class UnplannedIssueJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
+    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag,string OaNumber)
     {
         //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
         //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
         var jsonStatus = JsonSerializer.Serialize(status);
+        var oaNumber = new List<string>() {
+             OaNumber
+        };
+        var oaNumberjson = JsonSerializer.Serialize(oaNumber);
+
         var ishaspage = new List<int>() { ishaspag};
         var ishaspagejson = JsonSerializer.Serialize(ishaspage);
         //var jsonIssueType = JsonSerializer.Serialize(issueType);
@@ -71,6 +76,7 @@ public class UnplannedIssueJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
+                    //new(nameof(UnplannedIssueJobDTO.OANumber),oaNumberjson,"In"),
                     new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),ishaspagejson,"In"),
                     new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In")
                 }
@@ -80,6 +86,10 @@ public class UnplannedIssueJobController : AbpController
         {
             request.Condition.Filters.Add(new Filter(nameof(UnplannedIssueJobDTO.CreationTime), Clock.Now.ToString("yyyy-MM-dd"), ">=", "And"));
         }
+        if (!string.IsNullOrEmpty(OaNumber))
+        {
+            request.Condition.Filters.Add(new Filter("OANumber", OaNumber, EnumFilterAction.Like.ToString()));
+        }
         if (isCreationTimeSorting)//创建时间时间排序
         {
             request.Sorting = $"{nameof(UnplannedIssueJobDTO.CreationTime)} ASC";
diff --git a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs
index fd12152fb..d5bae609f 100644
--- a/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs
+++ b/be/Hosts/WmsPda.Host/Win_in.Sfs.Wms.Pda.Host/Controllers/Jobs/UnplannedReceiptJobController.cs
@@ -51,7 +51,7 @@ public class UnplannedReceiptJobController : AbpController
     /// <param name="isToday"></param>
     /// <returns></returns>
     [HttpGet("list")]
-    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
+    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag, string OaNumber)
     {
         //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
         //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
@@ -61,7 +61,10 @@ public class UnplannedReceiptJobController : AbpController
         var ishaspage = new List<int>() { (int)ishaspag };
         var ishaspagejson = JsonSerializer.Serialize(ishaspage);
 
-
+        //var oaNumber = new List<string>() {
+        //     OaNumber
+        //};
+        //var oaNumberjson = JsonSerializer.Serialize(oaNumber);
 
         //var receiptType = new List<int>() { (int)enumUnplannedReceiptType };
         var jsonStatus = JsonSerializer.Serialize(status);
@@ -75,6 +78,7 @@ public class UnplannedReceiptJobController : AbpController
             {
                 Filters = new List<Filter>
                 {
+                    //new(nameof(UnplannedIssueJobDTO.OANumber),oaNumberjson,"In"),
                     new(nameof(UnplannedReceiptJobDTO.IsHasPackingCode),ishaspagejson,"In"),
                     new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
                 }
@@ -88,6 +92,11 @@ public class UnplannedReceiptJobController : AbpController
         {
             request.Sorting = $"{nameof(UnplannedReceiptJobDTO.CreationTime)} ASC";
         }
+        if (!string.IsNullOrEmpty(OaNumber))
+        {
+
+            request.Condition.Filters.Add(new Filter("OANumber", OaNumber, EnumFilterAction.Like.ToString()));
+        }
 
         var list = await _unplannedReceiptJobAppService.GetPagedListByFilterAsync(request, true).ConfigureAwait(false);
         return list;