From cdd325cf78ca5bac74f941a917d8c90f34fa63e6 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 25 八月 2025 10:03:41 +0800
Subject: [PATCH] 11
---
MES.Service/service/BasicData/MesPositionManager.cs | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index 03a25e3..8d6aa14 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,4 +1,5 @@
-锘縰sing MES.Service.DB;
+锘縰sing Masuit.Tools;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -80,16 +81,22 @@
// 灏� ErpPosition 瀵硅薄杞崲涓� MesPosition 瀵硅薄鐨勬柟娉�
private MesPosition GetMesPosition(ErpPosition position)
{
- return new MesPosition
+ var entity = new MesPosition
{
- Id = Convert.ToDecimal(position.Id),
+ Id = string.IsNullOrEmpty(position.Id)
+ ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+ : Convert.ToDecimal(position.Id),
PositionId = position.FNumber,
PositionName = position.FName,
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
- FUseOrgId = position.FUseOrgId,
- FCreateOrgId = position.FCreateOrgId,
+ FSubsidiary = string.IsNullOrEmpty(position.FUseOrgId)
+ ? "1"
+ : position.FUseOrgId,
+ Fumbrella = string.IsNullOrEmpty(position.FCreateOrgId)
+ ? "1"
+ : position.FCreateOrgId,
CreationDate = position.FCreateDate != null
? DateTime.ParseExact(position.FCreateDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -99,8 +106,18 @@
? DateTime.ParseExact(position.FForbidDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- FDocumentStatus = position.FDocumentStatus
};
+
+ var mesPosition = Db.Queryable<MesPosition>()
+ .Where(s => s.PositionId == entity.PositionId)
+ .First();
+
+ if (mesPosition != null)
+ {
+ entity.Id = mesPosition.Id;
+ }
+
+ return entity;
}
// SaveList 鏂规硶鐢ㄤ簬淇濆瓨澶氫釜宀椾綅璁板綍锛屾牴鎹被鍨嬫壒閲忔墽琛屼笉鍚岀殑鎿嶄綔
--
Gitblit v1.9.3