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/Modes/SysOrganization.cs | 6 ++++++
MES.Service/service/BasicData/OrganizeManager.cs | 3 ++-
MES.Service/Modes/SalesOrder.cs | 5 +++++
MES.Service/service/BasicData/SalesOrderManager.cs | 12 ++++++++++--
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
index 2ce2dd9..d6c2e24 100644
--- a/MES.Service/Modes/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder.cs
@@ -133,5 +133,10 @@
[SugarColumn(ColumnName = "ENTRY_NOTE")]
public string? EntryNote { get; set; } // 澶囨敞
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
+ public DateTime? SynchronousDate { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysOrganization.cs b/MES.Service/Modes/SysOrganization.cs
index c1978d0..9fd996b 100644
--- a/MES.Service/Modes/SysOrganization.cs
+++ b/MES.Service/Modes/SysOrganization.cs
@@ -83,5 +83,11 @@
[SugarColumn(ColumnName = "FParentlD")]
public string? FParentlD { get; set; }
+ /// <summary>
+ /// 鍚屾鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "SYNCHRONOUS_DATE")]
+ public DateTime? SynchronousDate { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index ce20911..0472154 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -119,7 +119,8 @@
FNumber = organize.FNumber,
FParentlD = organize.FParentID,
IsStatus = organize.FForbidStatus.Equals("A"),
- Fid = organize.Id
+ Fid = organize.Id,
+ SynchronousDate = DateTime.Now
};
}
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