From 3701863186c3cc67b95f5c29a1737ae5be934cad Mon Sep 17 00:00:00 2001
From: majian <780924089@qq.com>
Date: Tue, 5 Nov 2024 11:40:57 +0800
Subject: [PATCH] 1

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs | 3 ++-
 WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs      | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
index 2d499131..02b17ba9 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPDAScanInStockService.cs
@@ -462,7 +462,8 @@ namespace Tnb.WarehouseMgr
                     purchase_code = billCode?.ToString() ?? string.Empty,
                     create_id = _userManager.UserId == null ? "" : _userManager.UserId,
                     create_time = DateTime.Now,
-                    source_id = source_main_id
+                    source_id = source_main_id,
+                    source_detail_id = source_id,
                 };
                 var instockDs = new List<WmsInstockD>();
                 var instockCodes = new List<WmsInstockCode>();
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
index 47fff03a..c11bd71e 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseDService.cs
@@ -141,7 +141,9 @@ namespace Tnb.WarehouseMgr
                 }
              
 
-                List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch).OrderBy(x=>x.id).ToListAsync();
+                List<WmsInstockD> allInstockDetails = await _db.Queryable<WmsInstockD>().Where(it => instock_mains.Select(r => r.id).Contains(it.bill_id) 
+                && it.material_id == wmsPurchaseD.material_id && it.code_batch == wmsPurchaseD.code_batch 
+                && (!string.IsNullOrEmpty(it.source_detail_id) && it.source_detail_id == wmsPurchaseD.id)).OrderBy(x=>x.id).ToListAsync();
 
                 List<Dictionary<string, object>> requestData = new List<Dictionary<string, object>>();
                 List<string> carryIds = instock_mains.Select(x => x.carry_id).ToList();