From b884e533c4d906d3e004ea51750591f04863f881 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 22 八月 2025 19:37:06 +0800
Subject: [PATCH] 基础资料的更新
---
MES.Service/service/BasicData/SysDepartmentManager.cs | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 4537867..25f3b0f 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -94,24 +94,41 @@
// 灏� ErpDepartment 瀵硅薄杞崲涓� SysDepartment 瀵硅薄鐨勬柟娉�
private SysDepartment GetSysDepartment(ErpDepartment department)
{
+ var unixTimeSeconds = string.IsNullOrEmpty(department.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(department.Id);
+
+ var fForbidStatus = department.FForbidStatus;
+ if (department.FForbidStatus == "0")
+ {
+ fForbidStatus = "A";
+ }
+ else if (department.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
+
return new SysDepartment
{
Departmentcode = department.FNumber,
Departmentname = department.FName,
- Departmentid = Convert.ToDecimal(department.Id),
- Id = Convert.ToDecimal(department.Id),
+ Departmentid = unixTimeSeconds,
+ Id = unixTimeSeconds,
Depextr1 = department.FDeptProperty,
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
- Depextr4 = department.FForbidStatus,
+ Depextr4 = fForbidStatus,
FParentID = department.FParentID,
- FSubsidiary = department.FUseOrgId,
- Fumbrella = department.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(department.FUseOrgId)
+ ? "1"
+ : department.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(department.FCreateOrgId)
+ ? "1"
+ : department.FCreateOrgId,
CreateDate = DateTime.Now,
LastupdateDate = DateTime.Now,
Company = "1000",
- Factory = "1000",
- FDocumentStatus = department.FDocumentStatus
+ Factory = "1000"
};
}
@@ -209,7 +226,7 @@
private bool InsertOrUpdateDepartmentBatch(SqlSugarScope db,
List<SysDepartment> departmentList)
{
- return departmentList.All(
- entity => InsertOrUpdateDepartment(db, entity));
+ return departmentList.All(entity =>
+ InsertOrUpdateDepartment(db, entity));
}
}
\ No newline at end of file
--
Gitblit v1.9.3