From 54cefea3fe69bf1d42c6114b68c9a2024c411c6f Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期二, 20 八月 2024 17:13:31 +0800
Subject: [PATCH] 生产订单新增字段ScrapRate 变动损耗率

---
 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index c827092..f4a9f24 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -59,18 +59,20 @@
         // 鏌ヨ
         var result = Db
             .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
-                MesItems, MesUnit>(
-                (a, d, b, c, t) => new object[]
+                MesItems, MesUnit, MesQaItemsDetectDetail5>(
+                (a, d, b, c, t, z) => new object[]
                 {
                     JoinType.Inner, d.BillNo == a.LotNo,
                     JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
                     JoinType.Inner,
                     a.ItemNo == c.ItemNo && a.Company == c.Company &&
                     a.Factory == c.Factory,
-                    JoinType.Inner, c.Fpurchaseunitid == t.Id
+                    JoinType.Inner, c.Fpurchaseunitid == t.Id,
+                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo
                 })
-            .Where((a, d, b, c, t) => a.FngHandle == "閫�璐�" &&
-                                      query.ItemArnDetailIds.Contains(b.Id))
+            .Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
+                                         z.FcheckResu == "涓嶅悎鏍�" &&
+                                         query.ItemArnDetailIds.Contains(b.Id))
             .Select((a, d, b, c, t) => new Material
             {
                 FmrMode = a.Fmrmode,

--
Gitblit v1.9.3