From 9bda2a9c4dcd6512b32a31cde6af4d5d8e80c668 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 23 五月 2025 09:59:26 +0800
Subject: [PATCH] 1.销售订单优化 2.组织新增同步时间
---
MES.Service/service/BasicData/SalesOrderManager.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index 1992058..ff6b3f2 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -40,6 +40,7 @@
return UpdateData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
case "2":
case "4":
+ case "5":
return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type)
? 1
: 0;
@@ -164,17 +165,24 @@
///ChargeId = erpDto.FChargeId, // 浠樻鏂�
///LinkPhone = erpDto.FLinkPhone, // 鑱旂郴鐢佃瘽
CreatorId = erpDto.FCreatorId, // 鍒涘缓浜�
- CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ //CreateDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃ユ湡
+ CreateDate = DateTime.TryParse(erpDto.FCreateDate, out var conveyDate)
+ ? (conveyDate <= new DateTime(1900, 1, 1) ? null : conveyDate)
+ : null, // 鍒涘缓鏃ユ湡
ModifierId = erpDto.FModifierId, // 鏈�鍚庝慨鏀逛汉
ModifyDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 鏈�鍚庝慨鏀规棩鏈�
ApproveDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
CloserId = erpDto.FCloserId, // 鍏抽棴浜�
//CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
- ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ //ChangeDate = ParseDateTime(erpDto.FChangeDate) ?? null, // 鍙樻洿鏃ユ湡
+ ChangeDate = DateTime.TryParse(erpDto.FChangeDate, out var ChangeDate)
+ ? (ChangeDate <= new DateTime(1900, 1, 1) ? null : ChangeDate)
+ : null, // 鍙樻洿鏃ユ湡
CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
CancellerId = erpDto.FCancellerId, // 浣滃簾浜�
VersionNo = Convert.ToDouble(erpDto.FVersionNo), // 鐗堟湰鍙�
ChangerId = erpDto.FChangerId, // 鍙樻洿浜�
+ SynchronousDate = DateTime.Now
//EntryNote = erpDto.FEntryNote // 澶囨敞
//ParseDateTime() ?? null
//long.Parse()
--
Gitblit v1.9.3