From f26b99b11db7d779494a5f111b05dd8f5d55bf9c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 20 十一月 2024 13:12:52 +0800
Subject: [PATCH] 消息中心推送消息的逻辑修改
---
service/Warehouse/MesInvItemInCDetailsManager.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 38c9d9a..908645c 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -758,21 +758,19 @@
WarehouseQuery query)
{
var parsedGuid = Guid.Empty;
- if (string.IsNullOrEmpty(query.id))
+ if (!string.IsNullOrEmpty(query.id))
{
- return ([], 0);
+ bool isValid = Guid.TryParse(query.id, out parsedGuid);
+ if (!isValid)
+ throw new ApplicationException("GUID杞崲閿欒");
}
-
- bool isValid = Guid.TryParse(query.id, out parsedGuid);
- if (!isValid)
- throw new ApplicationException("GUID杞崲閿欒");
var totalCount = 0;
var result = Db.Queryable<MesInvItemIns, MesDepots, MesSupplier>(
(a, b, c) =>
new JoinQueryInfos(JoinType.Left,
- a.DepotsCode == b.DepotCode,
- JoinType.Left, a.SuppNo == c.SuppNo))
+ a.DepotsId == b.DepotId,
+ JoinType.Left, a.SuppId == c.Id.ToString()))
.WhereIF(UtilityHelper.CheckGuid(parsedGuid),
(a, b, c) => a.Guid == parsedGuid)
.Select((a, b, c) => new MesInvItemIns
@@ -845,7 +843,7 @@
(g, c, d) => new JoinQueryInfos(
JoinType.Left,
g.ItemId == c.Id, JoinType.Inner,
- d.Id == Convert.ToDecimal(c.ItemUnit)
+ d.Id.ToString() == c.Fpurchaseunitid
)
).WhereIF(UtilityHelper.CheckGuid(parsedGuid),
(g, c, d) => g.ItemInId == parsedGuid)
@@ -963,7 +961,7 @@
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
g.ItemId == c.Id , JoinType.Inner,
- d.Id == Convert.ToDecimal(c.ItemUnit),
+ d.Id.ToString() == c.Fpurchaseunitid,
JoinType.Inner, a.Ebeln == g.WorkNo && g.CbillNo == a.CbillNo
)
).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
@@ -989,9 +987,9 @@
FRealQty = d.FRealQty,
FStockId = d.FStockId,
FLot = d.FLot,
- FUnitID = d.FUnitID,
- FsrcEntryId = d.FsrcEntryId,
- FMesEntryid = d.FMesEntryid
+ FUintId = d.FUnitID,
+ FSRCENTRYID = d.FsrcEntryId,
+ F_MES_ENTRYID = d.FMesEntryid
}).ToList();
var fdate = DateTime.Now.ToString("yyyy-MM-dd");
--
Gitblit v1.9.3