From 48614e9071756aef3b8f2819037f692a4a65383b Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 14 Mar 2024 16:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Services/InStockTaskService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/InStockTaskService.cs b/src/WMS.Web.Domain/Services/InStockTaskService.cs
index 8e075666..ab104294 100644
--- a/src/WMS.Web.Domain/Services/InStockTaskService.cs
+++ b/src/WMS.Web.Domain/Services/InStockTaskService.cs
@@ -529,7 +529,7 @@ namespace WMS.Web.Domain.Services
                         var erp_data = erp_list.FirstOrDefault(a => a.ErpDetailId == det.ErpDetailId && a.BillNo == order.SourceBillNo);
                         if (erp_data != null)
                         {
-                            if (erp_data.MaterialId == det.MaterialId)
+                            if (erp_data.MaterialId == det.MaterialId && erp_data.StockCode==det.StockCode)
                             {
                                 _logger.LogInformation("拉取金蝶数据：SysnDataNew2->" + JsonConvert.SerializeObject(erp_data));
                                 //物料相同的，就改变数值
@@ -537,7 +537,7 @@ namespace WMS.Web.Domain.Services
                                 det.AccruedQty = erp_data.Qty;
                                 det.FactoryPrice = erp_data.FactoryPrice;
                                 det.DeliveredQty = erp_data.DeliveredQty;
-                            }
+                            }                           
                             else
                             {
                                 _logger.LogInformation("拉取金蝶数据：SysnDataNew3->" + JsonConvert.SerializeObject(erp_data));
@@ -556,7 +556,7 @@ namespace WMS.Web.Domain.Services
                 foreach (var erp_data in erp_list)
                 {
                     // if (det.MaterialId != erp_data.MaterialId || (det.MaterialId == erp_data.MaterialId && det.StockCode != erp_data.StockCode))
-                    var IsHaveNewMaterial = data_list.SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId).Any();
+                    var IsHaveNewMaterial = data_list.SelectMany(s => s.Details).Where(x => x.ErpDetailId == erp_data.ErpDetailId && erp_data.MaterialId == x.MaterialId && erp_data.StockCode==x.StockCode).Any();
                     if (!IsHaveNewMaterial)
                         //当物料相同，仓库不同或者物料不同，就新增一条明细
                         erp_addDetailsList.Add(erp_data);