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 | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 4157420..e966f28 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -112,27 +112,49 @@
private MesUnit GetMesUnit(ErpUnit unit)
{
- return new MesUnit
+ var fForbidStatus = unit.FForbidStatus;
+ if (unit.FForbidStatus == "0")
{
- Id = Convert.ToDecimal(unit.Id),
+ fForbidStatus = "A";
+ }
+ else if (unit.FForbidStatus == "1")
+ {
+ fForbidStatus = "B";
+ }
+
+ var entity = new MesUnit
+ {
+ 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
};
+
+ 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