From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 99f79d2..4579a29 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -70,8 +70,14 @@
                     .Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
 
             var orUpdate = base.Insert(mesSalesDelivery);
-            var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
-            if (orUpdate && baOrUpdate) return true;
+            //var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
+            foreach (var item in mesSalesDeliveryDatas)
+            {
+                _SalesDeliveryDetailManager.Insert(item);
+            }
+
+            //if (orUpdate && baOrUpdate) return true;
+            return orUpdate;
 
 
             throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
@@ -208,7 +214,9 @@
                     TerminationStatus = erpDto.FTerminationStatus,//缁堟鐘舵��
                     TerminationDate = ParseDateTime(erpDto.FTerminateDate),//涓氬姟缁堟鏃ユ湡
                     SumOutQty = erpDto.FSumOutQty,//绱鍑哄簱鏁伴噺
-                    RemainOutQty = erpDto.FRemainOutQty//鏈嚭搴撴暟閲�
+                    RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
+                    GDY = erpDto.F_UNW_Base_GDY,//璺熷崟鍛�
+                    NOTE = erpDto.FEntrynote//澶囨敞
 
                 };
 

--
Gitblit v1.9.3