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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index c1c3e48..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("鎻掑叆鎴栨洿鏂板け璐�");
@@ -142,6 +148,7 @@
CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
+ BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
};
@@ -181,8 +188,8 @@
ErpHeadId = erpDto.EHID,//ERP澶碔D
SalesOrderId = erpDto.F_UNW_Text_xsddh,//閿�鍞鍗曞彿
MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
- MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
- MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
+ // MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
+ //MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
IsFree = erpDto.FIsFree,//鏄惁璧犲搧
@@ -195,7 +202,7 @@
OwnerId = erpDto.FOwnerIdHead,//璐т富
InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
- MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
+ //MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//璁″垝鍙戣揣鏃ユ湡
OutLmtUnit = erpDto.FOutLmtUnit,//瓒呭彂鎺у埗鍗曚綅
OutMaxQty = erpDto.FOutMaxQty,//鍑哄簱涓婇檺
@@ -207,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