From 424dd289f88708befc12fa47107e200b86f3d63d Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 08 十一月 2024 15:04:46 +0800
Subject: [PATCH] 111
---
MES.Service/Modes/Womcab.cs | 8 ++++----
MES.Service/Modes/Womcaa.cs | 2 +-
MES.Service/service/WomcaaManager.cs | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 8cd3042..697634d 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -66,7 +66,7 @@
/// 宸ュ崟鏁伴噺
/// </summary>
[SugarColumn(ColumnName = "CAA012")]
- public int? Caa012 { get; set; }
+ public decimal? Caa012 { get; set; }
/// <summary>
/// BOM鐗堟
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index cf9139a..efd50ee 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -30,7 +30,7 @@
/// 搴忓彿
/// </summary>
[SugarColumn(ColumnName = "CAB002")]
- public string? Cab002 { get; set; }
+ public int? Cab002 { get; set; }
/// <summary>
/// 鏉愭枡缂栫爜
@@ -42,7 +42,7 @@
/// 闇�棰嗙敤閲�
/// </summary>
[SugarColumn(ColumnName = "CAB006")]
- public int? Cab006 { get; set; }
+ public decimal? Cab006 { get; set; }
/// <summary>
/// 宸查鐢ㄩ噺
@@ -66,7 +66,7 @@
/// 缁勬垚鐢ㄩ噺
/// </summary>
[SugarColumn(ColumnName = "CAB012")]
- public int? Cab012 { get; set; }
+ public decimal? Cab012 { get; set; }
/// <summary>
/// 鏄惁鏇挎枡
@@ -210,7 +210,7 @@
/// 椤规鍙�
/// </summary>
[SugarColumn(ColumnName = "FREPLACEGROUP")]
- public string? Freplacegroup { get; set; }
+ public int? Freplacegroup { get; set; }
/// <summary>
/// 閿�鍞鍗曞彿
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index d7df90b..68d69f2 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -99,7 +99,7 @@
Caa006 = dto.FMaterialId, /// 浜у搧缂栫爜
Caa009 = dto.FUnitId, /// 鍗曚綅
Caa012 = !string.IsNullOrEmpty(dto.FQty)
- ? Convert.ToInt32(dto.FQty)
+ ? Convert.ToDecimal(dto.FQty)
: null, /// 鏁伴噺
WorkGroupId = dto.FWorkGroupId, /// 璁″垝缁�
PlanId = dto.FPlannerID, /// 璁″垝鍛�
@@ -161,10 +161,10 @@
{
Erpid = Convert.ToInt32(dto.FENTRYID), /// ERPID
Cab001 = dto.FBillNo, /// 宸ュ崟鍗曞彿
- Cab002 = dto.FSeq, /// 搴忓彿
+ Cab002 = Convert.ToInt32(dto.FSeq), /// 搴忓彿
Cab003 = dto.FMaterialID, /// 鏉愭枡缂栫爜
Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
- ? Convert.ToInt32(dto.FNeedQty)
+ ? Convert.ToDecimal(dto.FNeedQty)
: null, /// 闇�棰嗙敤閲�
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
? Convert.ToInt32(dto.FPickedQty)
@@ -181,7 +181,7 @@
Cab009 = dto.FUnitID, /// 鍗曚綅
SupplyType = dto.FSupplyType, /// 渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
- ? Convert.ToInt32(dto.FStdQty)
+ ? Convert.ToDecimal(dto.FStdQty)
: null, /// 缁勬垚鐢ㄩ噺
Cab014 = dto.FIsKeyItem, /// 鏄惁鏇挎枡
Numerator = dto.FNumerator, /// 鍒嗗瓙
@@ -191,7 +191,7 @@
Scrapqty = dto.FFixScrapQty, /// 鍥哄畾鎹熻��
Scraprate = dto.FScrapRate, /// 鍙樺姩鎹熻�楃巼
- Freplacegroup = dto.FReplaceGroup,
+ Freplacegroup = Convert.ToInt32(dto.FReplaceGroup),
UseRate = Convert.ToDecimal(dto.FUseRate),
MaterialType = dto.FMaterialType,
MustQty = Convert.ToDecimal(dto.FMustQty)
--
Gitblit v1.9.3