From 02edc26ffe2ade11b0f830c8c7e0ac77dec267c0 Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Thu, 4 Jul 2024 10:52:48 +0800
Subject: [PATCH] bug

---
 .../Tnb.WarehouseMgr/WmsCarryQueryService.cs       |  2 +-
 .../Tnb.WarehouseMgr/WmsMaterialTransferService.cs | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
index 742f8f72..97378bff 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCarryQueryService.cs
@@ -56,7 +56,7 @@ namespace Tnb.WarehouseMgr
             return data;
         }
         /// <summary>
-        /// 载具查询返回接口
+        /// 载具查询返回接口(没子载具不能使用此接口)
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
index 30ac5417..1430d565 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsMaterialTransferService.cs
@@ -1199,11 +1199,11 @@ namespace Tnb.WarehouseMgr
                 };
                 insertHList.Add(prdMaterialReceiptH);
 
-                CarryQueryOutput carryQueryOutput = await _wmsCarryQueryService.MESCarryQueryResult(new MESCarryQueryResultInput(){carry_code = carry.carry_code});
-                if (carryQueryOutput.wmsCarryCodes != null && carryQueryOutput.wmsCarryCodes.Count > 0)
+                List<WmsCarryCode> wmsCarryCodes = await _db.Queryable<WmsCarryCode>().Where(x=>x.carry_id==carry.id).ToListAsync();
+                if (wmsCarryCodes != null && wmsCarryCodes.Count > 0)
                 {
-                    JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(carryQueryOutput)}");
-                    foreach (var item in carryQueryOutput.wmsCarryCodes)
+                    JNPF.Logging.Log.Information($"签收载具信息{JsonConvert.SerializeObject(wmsCarryCodes)}");
+                    foreach (var item in wmsCarryCodes)
                     {
             
                         insertDList.Add(new PrdMaterialReceiptD
@@ -1216,12 +1216,12 @@ namespace Tnb.WarehouseMgr
                             carry_id = carry.id,
                             barcode = item.barcode,
                             is_all_feeding = 0,
-                            member_carry_id = item.member_carryid,
-                            member_carry_code = item.member_carrycode,
+                            // member_carry_id = item.member_carryid,
+                            // member_carry_code = item.member_carrycode,
                             feeding_num = 0,
                             supplier_id = item.supplier_id,
                             instock_time = item.instock_time,
-                            check_conclusion = item.check_conclusion,
+                            // check_conclusion = item.check_conclusion,
                         });
                     }
                 }