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/MesUnitManager.cs |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 4157420..74f8467 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -112,26 +112,38 @@
 
     private MesUnit GetMesUnit(ErpUnit unit)
     {
+        
+        var fForbidStatus = unit.FForbidStatus;
+        if (unit.FForbidStatus == "0")
+        {
+            fForbidStatus = "A";
+        }
+        else if (unit.FForbidStatus == "1")
+        {
+            fForbidStatus = "B";
+        }
+        
         return new MesUnit
         {
-            Id = Convert.ToDecimal(unit.Id),
+            Id = string.IsNullOrEmpty(unit.Id)
+                ? DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+                : Convert.ToDecimal(unit.Id),
             Fnumber = unit.FNumber,
             Fname = unit.FName,
             Funitgroupid = unit.FUnitGroupId,
-            Fconvertdenominator = Convert.ToDouble(unit.FConvertDenominator),
+            Fconvertdenominator = Convert.ToDecimal(unit.FConvertDenominator),
             Fcurrentunitid = unit.FCurrentUnitId,
-            Fconvertnumerator = unit.FConvertNumerator,
+            Fconvertnumerator = Convert.ToDecimal(unit.FConvertNumerator),
             Fbaseunit = unit.FBaseUnit,
             Froundtype = unit.FRoundType,
             Fprecision = unit.FPrecision,
             Fdescription = unit.FDescription,
-            Fforbidstatus = unit.FForbidStatus,
+            Fforbidstatus = fForbidStatus,
             CreateDate = DateTime.Now,
             LastupdateDate = DateTime.Now,
             Company = "1000",
             Factory = "1000",
-            Type = unit.Type,
-            FDocumentStatus  = unit.FDocumentStatus
+            Type = unit.Type
         };
     }
 

--
Gitblit v1.9.3