From 392a7fad4f8405fc347f53a05d821c1502e3ff91 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 10 一月 2025 13:01:35 +0800
Subject: [PATCH] 111
---
service/Warehouse/MesItemBlManager.cs | 3 ++-
service/Wom/WwGdManager.cs | 10 +++++-----
service/Warehouse/MesInvItemInCDetailsManager.cs | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 97dc403..cf0c551 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -74,8 +74,8 @@
mesDepost = Db.Queryable<MesDepots>()
.Where(s => s.DepotId.ToString() == depotCode2).First();
- if (depotCode != mesDepost.Guid)
- throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
+ // if (depotCode != mesDepost.Guid)
+ // throw new Exception("鎵弿搴撲綅涓庨噰璐叆搴撳簱浣嶄笉涓�鑷达紒");
}
else
{
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index ff3728d..a5480b9 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -68,6 +68,7 @@
}
/// <summary>
+ /// 鐢熶骇宸ュ崟閫�鏂欐壂鐮�
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -114,7 +115,7 @@
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo)
.First();
if (mesItemBl == null)
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 103187c..5803cf3 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -149,12 +149,12 @@
.Where((a, i) => a.Daa001 == query.daa001)
.Select((a, i) => new
{
- a.Daa001, a.Eid
+ a.Daa001, a.RwdGuid
}).First();
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var womdabs = Db.Queryable<WwGd, WwGdDetail, MesItems, Womcab>(
+ var womdabs = Db.Queryable<WwGd, WwGdDetail, MesItems, ProductionOrderSub>(
(a, b, c, d) =>
new JoinQueryInfos(
JoinType.Left,
@@ -162,10 +162,10 @@
JoinType.Inner,
c.Id ==
b.Dab003,
- JoinType.Inner, b.Erpid == d.Erpid
+ JoinType.Inner, b.Erpid.ToString() == d.ErpId
))
.Where((a, b, c, d) =>
- a.Daa001 == query.daa001 && d.IssueType == "1")
+ a.Daa001 == query.daa001 && d.IssuingMethod == "1")
.Select((a, b, c, d) => new WwGdDetail
{
Pid = b.Pid,
@@ -201,7 +201,7 @@
.ToList();
var womcaa = Db.Queryable<ProductionOrder>()
- .Where(s => s.ErpId == womdaa.Eid.ToString())
+ .Where(s => s.Guid == womdaa.RwdGuid)
.First();
var dto = new ProductionPickDto
--
Gitblit v1.9.3