From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MES.Service/Modes/BOM/MesBomDetail2.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/MES.Service/Modes/BOM/MesBomDetail2.cs b/MES.Service/Modes/BOM/MesBomDetail2.cs
index 5cfac8a..df53386 100644
--- a/MES.Service/Modes/BOM/MesBomDetail2.cs
+++ b/MES.Service/Modes/BOM/MesBomDetail2.cs
@@ -11,12 +11,23 @@
public class MesBomDetail2
{
/// <summary>
- ///
+ /// SEQ_BOM
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+ /// <summary>
+ /// mid
///</summary>
- [SugarColumn(ColumnName = "ERPID", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "MID")]
+ public decimal? Mid { get; set; }
+ /// <summary>
+ /// erpid
+ ///</summary>
+ [SugarColumn(ColumnName = "ERPID")]
public decimal? Erpid { get; set; }
/// <summary>
- ///
+ /// epihid
///</summary>
[SugarColumn(ColumnName="ERPHID" )]
public decimal? Erphid { get; set; }
@@ -34,7 +45,7 @@
/// 瀛愰」鍗曚綅
///</summary>
[SugarColumn(ColumnName="FUNITIDLOT" )]
- public string Funitidlot { get; set; }
+ public string? Funitidlot { get; set; }
/// <summary>
/// 鍥哄畾鎹熻��
///</summary>
@@ -44,7 +55,7 @@
/// 鍙樺姩鎹熻�楃巼
///</summary>
[SugarColumn(ColumnName="FSCRAPRATELOT" )]
- public decimal Fscrapratelot { get; set; }
+ public decimal? Fscrapratelot { get; set; }
/// <summary>
/// 鐢ㄩ噺锛氬垎瀛�
///</summary>
@@ -59,11 +70,11 @@
/// 瀛愰」鐗╂枡缂栫爜
///</summary>
[SugarColumn(ColumnName="FMATERIALIDLOTBASED" )]
- public string Fmaterialidlotbased { get; set; }
+ public string? Fmaterialidlotbased { get; set; }
/// <summary>
/// 搴忓彿
///</summary>
[SugarColumn(ColumnName="LINE_NUMBER" )]
- public decimal LineNumber { get; set; }
+ public decimal? LineNumber { get; set; }
}
}
--
Gitblit v1.9.3