From b2be3b6939b4382f9165c78857a072f1aa7b01d0 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期六, 12 四月 2025 12:34:02 +0800
Subject: [PATCH] 更新平板功能，首检页面生成巡检单
---
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
index 48f5973..920f82e 100644
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -75,19 +75,23 @@
{
return new PurchaseInventory
{
- ItemIns = GetInvItemInsList(query)[0],
+ ItemIns = GetInvItemInsList(query).Items[0],
ItemInDetails = GetItemInDetails(query.id),
InvItemInCDetails = GetInvItemInCDetails(query.id)
};
}
- public List<MesInvItemIns> GetInvItemInsList(WarehouseQuery query)
+ public (List<MesInvItemIns> Items, int TotalCount) GetInvItemInsList(
+ WarehouseQuery query)
{
- return Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>((a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.DepotsCode == b.DepotCode
- && b.Factory == a.Factory
- && b.Company == a.Company,
- JoinType.Left, a.SuppNo == c.SuppNo))
+ var totalCount = 0;
+ var result = Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>(
+ (a, b, c) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.DepotsCode == b.DepotCode
+ && b.Factory == a.Factory
+ && b.Company == a.Company,
+ JoinType.Left, a.SuppNo == c.SuppNo))
.WhereIF(query.id > 0, (a, b, c) => a.Id == query.id)
.Select((a, b, c) => new MesInvItemIns
{
@@ -104,7 +108,8 @@
CreateBy = a.CreateBy,
DepotName = b.DepotName,
SuppName = c.SuppName
- }).ToPageList(query.PageIndex, query.Limit);
+ }).ToPageList(query.PageIndex, query.Limit, ref totalCount);
+ return (result, totalCount);
}
public List<MesInvItemInCItems> GetItemInDetails(decimal? pid)
--
Gitblit v1.9.3