From 22bc9e47f6018b7c828bc156f00a01cd794b5483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Tue, 22 Oct 2024 18:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Jobs/UnplannedIssueJobController.cs         | 6 +++---
 .../Controllers/Jobs/UnplannedReceiptJobController.cs       | 6 +++---
 .../Inputs/UnplannedIssueNoteEditInput.cs                   | 3 +++
 .../Notes/UnplannedIssueNotes/UnplannedIssueNote.cs         | 2 +-
 .../Jobs/UnplannedIssueJobEventHandler.cs                   | 2 ++
 5 files changed, 12 insertions(+), 7 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 ea686329b..8e5f3fc25 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,15 +52,15 @@ 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, bool ishaspag)
+    public virtual async Task<PagedResultDto<UnplannedIssueJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
     {
         //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 ishaspage = new List<bool>() { ishaspag};
-        var ishaspagejson = JsonSerializer.Serialize(status);
+        var ishaspage = new List<int>() { ishaspag};
+        var ishaspagejson = JsonSerializer.Serialize(ishaspage);
         //var jsonIssueType = JsonSerializer.Serialize(issueType);
         var request = new SfsJobRequestInputBase
         {
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 b5322e185..fd12152fb 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,15 +51,15 @@ 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, bool ishaspag)
+    public virtual async Task<PagedResultDto<UnplannedReceiptJobDTO>> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, int ishaspag)
     {
         //var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
         //var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
 
         var status = new List<int>() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
 
-        var ishaspage = new List<bool>() { ishaspag };
-        var ishaspagejson = JsonSerializer.Serialize(status);
+        var ishaspage = new List<int>() { (int)ishaspag };
+        var ishaspagejson = JsonSerializer.Serialize(ishaspage);
 
 
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
index 3b100ea3a..b13734990 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/UnplannedIssueNotes/Inputs/UnplannedIssueNoteEditInput.cs
@@ -104,4 +104,7 @@ public class UnplannedIssueNoteEditInput : SfsStoreCreateOrUpdateInputBase
 
 
 
+
+
+
 }
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
index 068f1b505..1bfa5998c 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/UnplannedIssueNotes/UnplannedIssueNote.cs
@@ -92,7 +92,7 @@ public class UnplannedIssueNote : SfsStoreAggregateRootBase<UnplannedIssueNoteDe
     [Display(Name = "数量")]
     public decimal Qty { get; set; }
 
-    public bool IsHasPackingCode { get; set; }
+   
 
 
 
diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
index eb5aac397..18409e66d 100644
--- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
+++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/Jobs/UnplannedIssueJobEventHandler.cs
@@ -80,6 +80,8 @@ public class UnplannedIssueJobEventHandler :
     private UnplannedIssueNoteEditInput BuildUnplannedIssueNoteCreateInput(UnplannedIssueJob entity)
     {
         var createInput = ObjectMapper.Map<UnplannedIssueJob, UnplannedIssueNoteEditInput>(entity);
+
+    
         createInput.BuildDate=DateTime.Now;
         createInput.ActiveDate=DateTime.Now;
         createInput.Details.RemoveAll(p => p.Qty == 0);