From eea9482c529e05674f4a72e4482ca7d402bcd5d9 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Fri, 5 Jul 2024 09:28:02 +0800
Subject: [PATCH] bug

---
 .../Tnb.ProductionMgr/PrdFeedingService.cs          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
index 7a46b294..8da653a1 100644
--- a/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
+++ b/ProductionMgr/Tnb.ProductionMgr/PrdFeedingService.cs
@@ -417,8 +417,17 @@ namespace Tnb.ProductionMgr
                         //     throw new Exception("该物料不是生产bom投入物料，不能签收");
                         // }
 
-                        PrdMaterialReceiptD? detail = await db.Queryable<PrdMaterialReceiptD>()
-                            .Where(x => x.member_carry_code == input.carry_code && x.is_all_feeding == 0).FirstAsync();
+                        PrdMaterialReceiptD? detail = null;
+                        if (carry.carrystd_id == WmsWareHouseConst.CARRY_ZYXCSTD_ID || carry.carrystd_id == WmsWareHouseConst.CARRY_ZYLJSTD_ID)
+                        {
+                            detail = await db.Queryable<PrdMaterialReceiptD>().Where(x => x.carry_id == carry.id && x.is_all_feeding == 0).FirstAsync();
+                        }
+                        else
+                        {
+                            detail = await db.Queryable<PrdMaterialReceiptD>().Where(x => x.member_carry_code == input.carry_code && x.is_all_feeding == 0).FirstAsync();
+                        }
+                       
+                        
                         if (prdMaterialReceiptH == null)
                         {
                             prdMaterialReceiptH = await db.Queryable<PrdMaterialReceiptH>()