From 646ac6f3e1e77d0481e46ea15a6eb6db4ecba065 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 23 六月 2025 13:17:23 +0800
Subject: [PATCH] 11

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

diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 5f0bfa6..95acca0 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -150,7 +150,6 @@
 
         {
             var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
-
             DateTime parsedDate;
             // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
             DateTime? ParseDateTime(string dateStr)
@@ -197,10 +196,21 @@
                     RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
                     SalesOrder   = erpDto.FXSHTH,//閿�鍞鍗曞彿
                     CustOrder    = erpDto.F_ZJXF_TEXT_QTR_LEE,//瀹㈡埛璁㈠崟鍙�
-                    SalesContractNo = erpDto.FXSHTBH//閿�鍞悎鍚岀紪鍙�
+                    SalesContractNo = erpDto.FXSHTBH,//閿�鍞悎鍚岀紪鍙�
+                    F_KHWLBM=erpDto.F_KHWLBM,
+                    F_KHWLMC=erpDto.F_KHWLMC,
 
                 };
 
+                if (erpDto.FRemainOutQty==0)
+                {
+                    salesOrderSub.IsFinish = 1;
+                }
+                else
+                {
+                    salesOrderSub.IsFinish = 0;
+                }
+
                 var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
                 if (single != null)
                 {

--
Gitblit v1.9.3