From 88a9a4c535e504b3945cf8eeeba06ab53e47305b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 27 九月 2024 20:01:48 +0800
Subject: [PATCH] 11
---
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 95cc7b2..3a1b97c 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -14,13 +14,16 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemOutsManager.cs
- public List<MesInvItemOuts> GetProductionPickPage(WarehouseQuery query)
+ public (List<MesInvItemOuts> Items, int TotalCount) GetProductionPickPage(
+ WarehouseQuery query)
{
- return Db.Queryable<MesInvItemOuts, MesDepots>((a, o) =>
+ var totalCount = 0; // 鍒濆鍖� totalCount
+ // 纭繚杩欓噷浣跨敤 'out' 鏉ヨ幏鍙栨�昏鏁�
+ var result = Db.Queryable<MesInvItemOuts, MesDepots>((a, o) =>
new JoinQueryInfos(
JoinType.Left,
o.DepotCode == a.DepotCode && a.Company == o.Company &&
- a.Factory == o.Factory
+ a.Factory == a.Factory
))
.Where((a, o) => a.BillTypeId == 200 &&
a.TransactionNo == 201 &&
@@ -46,7 +49,10 @@
ItemOutNo = a.ItemOutNo,
DepotName = o.DepotName // 闇�瑕佸姩鎬佹坊鍔犵殑瀛楁
})
- .ToPageList(query.PageIndex, query.Limit);
+ .ToPageList(query.PageIndex, query.Limit,
+ ref totalCount); // 纭繚杩欓噷浣跨敤 'out'
+
+ return (result, totalCount);
}
public MaterialReceipt GetProductionPick(WarehouseQuery query)
@@ -55,9 +61,9 @@
if (query.id != null)
{
var mesInvItemOutsList = GetProductionPickPage(query);
- if (mesInvItemOutsList.Count <= 0) return form;
+ if (mesInvItemOutsList.TotalCount <= 0) return form;
- form.ItemOuts = mesInvItemOutsList[0];
+ form.ItemOuts = mesInvItemOutsList.Items[0];
form.ItemsList = getProductionItemsList(query);
form.InvItemoutCDetails = GetProductionDetails(query);
}
@@ -936,8 +942,8 @@
{
FMaterialId = item.ItemNo,
FUnitID = C_ITEM_UNIT,
- FAppQty = qty,
- FActualQty = qty,
+ FAppQty = qty,
+ FActualQty = qty,
FStockId = item.DepotCode,
FPPBomEntryId = erpid,
F_UNW_Text_xsddh = xsddh,
--
Gitblit v1.9.3