From 406ac5eb58f06bde155443a34c76fbf187759808 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 18 三月 2025 16:00:05 +0800
Subject: [PATCH] 清点增加分页
---
Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs | 6 +-
Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs | 10 ++--
Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 40 +++++++++++--------
Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs | 6 +++
4 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index d0a07e3..f41ef28 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -11,6 +11,8 @@
using Tiger.IBusiness;
using Tiger.Model.MES.Yada;
using Tiger.Model.Entitys.MES.U9C;
+using System.Security.Policy;
+using Tiger.Model.Entitys.MES.Position;
namespace Tiger.Business.WMS.Transaction
{
@@ -445,28 +447,32 @@
}
/// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
/// </summary>
/// <returns></returns>
- public async Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList()
+ public async Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input)
{
- return await Task.FromResult(new PageAble<BIZ_U9_ASN_SN>()
- {
- data = ScanList,
- totals = ScanList.Count(),
- });
- }
+ var action = new ApiAction<PageAble<BIZ_U9_ASN_SN>>();
+ action.Data = new PageAble<BIZ_U9_ASN_SN>();
+ action.Data.pageSize = input.pageSize;
+ action.Data.pageIndex = input.pageIndex;
+ action.Data.totals = ScanList.Count;
+ action.Data.data = ScanList.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
+ //action.Data = query;
+ return action;
+ }
- /// <summary>
- /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
- /// </summary>
- /// <returns></returns>
- public async Task<List<BIZ_U9_ASN>> GetOrderList()
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ public async Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList()
{
- var Orders = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
- if (!Orders.IsNullOrEmpty())
+ var action = new ApiAction<List<BIZ_U9_ASN>>();
+ action.Data = await Biz.Db.Queryable<BIZ_U9_ASN>().Where(q => OrderList.Contains(q.ORDER_NO)).IncludesAllFirstLayer().ToListAsync();
+ if (!action.Data.IsNullOrEmpty())
{
- foreach (var order in Orders)
+ foreach (var order in action.Data)
{
foreach (var dtl in order.Details)
{
@@ -475,7 +481,7 @@
}
}
}
- return Orders;
+ return action;
}
/// <summary>
diff --git a/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs b/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
index 11da87d..130762b 100644
--- a/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
+++ b/Tiger.Controllers.WMS/Controllers/WMSController.Count_BIZ_U9_ASN.cs
@@ -192,7 +192,7 @@
/// <returns></returns>
[HttpPost]
[Route("api/[controller]/Count_U9ASN/DeleteScannedSn")]
- public async Task<IActionResult> Count_BIZ_U9_ASN_DeleteScannedSnAsync([FromBody] ApiAction<BaseInput> action)
+ public async Task<IActionResult> Count_BIZ_U9_ASN_DeleteScannedSnAsync([FromBody] ApiAction<BaseInputWithPage> action)
{
ApiAction response;
ICount_BIZ_U9_ASN trans = null;
@@ -231,14 +231,14 @@
}
/// <summary>
- /// GetScannedList(ApiAction)
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
+ /// GetScannedList(ApiAction(BasePageInput))
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
/// </summary>
/// <param name="action"></param>
/// <returns></returns>
[HttpPost]
[Route("api/[controller]/Count_U9ASN/GetScannedList")]
- public async Task<IActionResult> Count_BIZ_U9_ASN_GetScannedListAsync([FromBody] ApiAction action)
+ public async Task<IActionResult> Count_BIZ_U9_ASN_GetScannedListAsync([FromBody] ApiAction<BaseInputWithPage> action)
{
ApiAction response;
ICount_BIZ_U9_ASN trans = null;
@@ -249,7 +249,7 @@
trans = iBiz.WMS.Context.GetTransDic()[action.ID] as ICount_BIZ_U9_ASN;
if (!trans.IsFinished)
{
- response = action.GetResponse(await trans.GetScannedList());
+ response = action.GetResponse(await trans.GetScannedList(action.Data));
}
else
{
diff --git a/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs b/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
index 1e21693..37ae122 100644
--- a/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
+++ b/Tiger.IBusiness.WMS/Transaction/ICount_BIZ_U9_ASN.cs
@@ -37,16 +37,16 @@
public Task<ApiAction> DeleteScannedSn(BaseInput input);
/// <summary>
- /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃
+ /// 鑾峰彇鏈宸叉竻鐐圭殑鐗╂枡鍒楄〃锛堝甫鍒嗛〉锛�
/// </summary>
/// <returns></returns>
- public Task<PageAble<BIZ_U9_ASN_SN>> GetScannedList();
+ public Task<ApiAction<PageAble<BIZ_U9_ASN_SN>>> GetScannedList(BaseInputWithPage input);
/// <summary>
/// 鑾峰彇褰撳墠鎵�鏈夊崟鎹俊鎭�
/// </summary>
/// <returns></returns>
- public Task<List<BIZ_U9_ASN>> GetOrderList();
+ public Task<ApiAction<List<BIZ_U9_ASN>>> GetOrderList();
/// <summary>
/// 璁剧疆鏀惰揣鍗曟槑缁嗚禒鍝佹暟閲�
diff --git a/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs b/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
index ec05c5a..a21465b 100644
--- a/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
+++ b/Tiger.Model.Net/Entitys/WMS/Api/Input_Entitys.cs
@@ -39,6 +39,12 @@
/// </summary>
public string Data { get; set; }
}
+ public class BaseInputWithPage : BaseInput
+ {
+ public int pageIndex { get; set; }
+ public int pageSize { get; set; }
+ public int total { get; set; }
+ }
public class BasePageInput
{
--
Gitblit v1.9.3