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/MesUnitManager.cs |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 74f8467..e966f28 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -112,7 +112,6 @@
 
     private MesUnit GetMesUnit(ErpUnit unit)
     {
-        
         var fForbidStatus = unit.FForbidStatus;
         if (unit.FForbidStatus == "0")
         {
@@ -122,8 +121,8 @@
         {
             fForbidStatus = "B";
         }
-        
-        return new MesUnit
+
+        var entity = new MesUnit
         {
             Id = string.IsNullOrEmpty(unit.Id)
                 ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
@@ -145,6 +144,17 @@
             Factory = "1000",
             Type = unit.Type
         };
+
+        var mesUnit = Db.Queryable<MesUnit>()
+            .Where(s => s.Fnumber == entity.Fnumber)
+            .First();
+
+        if (mesUnit != null)
+        {
+            entity.Id = mesUnit.Id;
+        }
+
+        return entity;
     }
 
     private bool UpdateUnitStatusBatch(SqlSugarScope db, List<MesUnit> unitList,

--
Gitblit v1.9.3