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.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs | 40 +++++++++++++++++++++++----------------- 1 files changed, 23 insertions(+), 17 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> -- Gitblit v1.9.3