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 e0d88fdc3..ea686329b 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,16 @@ public class UnplannedIssueJobController : AbpController
///
///
[HttpGet("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedIssueType enumUnplannedIssueType)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag)
{
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
//var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
var jsonStatus = JsonSerializer.Serialize(status);
- var issueType = new List() { (int)enumUnplannedIssueType };
- var jsonIssueType = JsonSerializer.Serialize(issueType);
+ var ishaspage = new List() { ishaspag};
+ var ishaspagejson = JsonSerializer.Serialize(status);
+ //var jsonIssueType = JsonSerializer.Serialize(issueType);
var request = new SfsJobRequestInputBase
{
MaxResultCount = pageSize,
@@ -70,7 +71,7 @@ public class UnplannedIssueJobController : AbpController
{
Filters = new List
{
- new(nameof(UnplannedIssueJobDTO.UnplannedIssueType),jsonIssueType,"In"),
+ new(nameof(UnplannedIssueJobDTO.IsHasPackingCode),ishaspagejson,"In"),
new(nameof(UnplannedIssueJobDTO.JobStatus),jsonStatus,"In")
}
}
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 77bc5599e..1d4e4b7fc 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,21 @@ public class UnplannedReceiptJobController : AbpController
///
///
[HttpGet("list")]
- public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, EnumUnplannedReceiptType enumUnplannedReceiptType)
+ public virtual async Task> GetListAsync(int pageSize, int pageIndex, bool isCreationTimeSorting, bool isToday, bool ishaspag)
{
//var wlgCodes = await _userWorkGroupAppService.GetCodsOfCurrentUserAsync().ConfigureAwait(false);
//var jsonWlgCodes = JsonSerializer.Serialize(wlgCodes);
var status = new List() { (int)EnumJobStatus.Open, (int)EnumJobStatus.Doing };
- var receiptType = new List() { (int)enumUnplannedReceiptType };
+
+ var ishaspage = new List() { ishaspag };
+ var ishaspagejson = JsonSerializer.Serialize(status);
+
+
+
+ //var receiptType = new List() { (int)enumUnplannedReceiptType };
var jsonStatus = JsonSerializer.Serialize(status);
- var jsonreceiptType = JsonSerializer.Serialize(receiptType);
+ //var jsonreceiptType = JsonSerializer.Serialize(receiptType);
var request = new SfsJobRequestInputBase
{
MaxResultCount = pageSize,
@@ -69,7 +75,7 @@ public class UnplannedReceiptJobController : AbpController
{
Filters = new List
{
- new(nameof(UnplannedReceiptJobDTO.UnplannedReceiptType),jsonreceiptType,"In"),
+ new(nameof(UnplannedReceiptJobDTO.),ishaspagejson,"In"),
new(nameof(UnplannedReceiptJobDTO.JobStatus),jsonStatus,"In")
}
}