From ab01d75a3fbc8467d81a895cba5d6dde76fbe053 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 16 九月 2025 23:29:30 +0800
Subject: [PATCH] 1111
---
MES.Service/service/BasicData/MesPositionManager.cs | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index 03a25e3..7f3ee45 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,17 @@
// 灏� 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 = "1",
+ Fumbrella = "1",
CreationDate = position.FCreateDate != null
? DateTime.ParseExact(position.FCreateDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -99,8 +101,29 @@
? DateTime.ParseExact(position.FForbidDate,
"yyyy-MM-dd HH:mm:ss", null)
: null,
- FDocumentStatus = position.FDocumentStatus
};
+
+ if (position.FForbidStatus.IsNullOrEmpty())
+ {
+ entity.Fforbidstatus = "A";
+ }
+ else
+ {
+ //鎴戞湡鏈涚殑鍊兼槸A=鍚�,B=鏄�
+ //瀹為檯缁欐垜鐨勫�兼槸0鎴�1锛屾垜甯屾湜涓烘垜杞崲浠嶢鍜孊鐨勬柟寮�
+ entity.Fforbidstatus = position.FForbidStatus == "1" ? "B" : "A";
+ }
+
+ 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