From c3a050007846b015c11ec53db980831d23e7c3f8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 12 九月 2024 14:08:54 +0800
Subject: [PATCH] 基础资料接口部分实体与erp的对照增加Type字段的赋值，防止根据type分组时报错
---
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 6b1d2ec..8b255c9 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -14,13 +14,15 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 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) =>
+ int 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 +48,9 @@
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 +59,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);
}
@@ -831,7 +835,7 @@
throw new Exception("鑾峰彇鏁版嵁澶辫触");
}
- private MessageCenter ProductionMesToErpParam(WarehouseQuery query)
+ public MessageCenter ProductionMesToErpParam(WarehouseQuery query)
{
var erpParameters = "";
var title = "";
--
Gitblit v1.9.3