From 9086b238cd9fbb9fbeae7cab11d59576cd9d2853 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 24 十一月 2025 10:27:01 +0800
Subject: [PATCH] 合并
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
index 60b96be..ee38920 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -116,7 +116,7 @@
}
//鑾峰彇鎵�鏈夐噰璐俊鎭�
List<Dt_PurchaseOrder> purchaseOrdersOld = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x=>x.Details).ToList();
-
+ List<Dt_PurchaseOrderDetail> purchaseOrderDetailsOld = purchaseOrdersOld.SelectMany(x => x.Details).ToList();
if (eRPPurchaseOrderDTO.OperateType == 1)
{
//鍒ゆ柇閲嶅鎻掑叆
@@ -130,6 +130,10 @@
purchaseOrderDetails.ForEach(x =>
{
Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ if (materielInfo != null)
+ {
+
+ }
x.MaterielName = materielInfo?.MaterielName;
x.Unit = materielInfo?.MaterielUnit;
x.MaterielSpec= materielInfo?.MaterielSpec;
--
Gitblit v1.9.3