From b957cfb89c9968f47cc5ce9795e6ffb05bc57fd8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 30 十月 2024 16:05:48 +0800
Subject: [PATCH] 11

---
 MES.Service/service/BasicData/MesUnitManager.cs |    2 +-
 MES.Service/Dto/webApi/ErpUnit.cs               |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MES.Service/Dto/webApi/ErpUnit.cs b/MES.Service/Dto/webApi/ErpUnit.cs
index 26511cd..a763e4f 100644
--- a/MES.Service/Dto/webApi/ErpUnit.cs
+++ b/MES.Service/Dto/webApi/ErpUnit.cs
@@ -7,7 +7,7 @@
     public string? FNumber { get; set; }
     public string? FName { get; set; }
     public string? FUnitGroupId { get; set; }
-    public double? FConvertDenominator { get; set; }
+    public string? FConvertDenominator { get; set; }
     public string? FCurrentUnitId { get; set; }
     public double? FConvertNumerator { get; set; }
     public string? FBaseUnit { get; set; }
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 145f80f..09a58eb 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -118,7 +118,7 @@
             Fnumber = unit.FNumber,
             Fname = unit.FName,
             Funitgroupid = unit.FUnitGroupId,
-            Fconvertdenominator = unit.FConvertDenominator,
+            Fconvertdenominator = Convert.ToDouble(unit.FConvertDenominator),
             Fcurrentunitid = unit.FCurrentUnitId,
             Fconvertnumerator = unit.FConvertNumerator,
             Fbaseunit = unit.FBaseUnit,

--
Gitblit v1.9.3