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/MesBomMaster.cs |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/MES.Service/Modes/BOM/MesBomMaster.cs b/MES.Service/Modes/BOM/MesBomMaster.cs
index 0746e75..f6715ee 100644
--- a/MES.Service/Modes/BOM/MesBomMaster.cs
+++ b/MES.Service/Modes/BOM/MesBomMaster.cs
@@ -11,40 +11,47 @@
     public class MesBomMaster
     {
         /// <summary>
+        ///     SEQ_BOM
+        /// </summary>
+        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BOM",
+            IsPrimaryKey = true)]
+        public decimal Id { get; set; }
+
+        /// <summary>
         ///  
         ///</summary>
-         [SugarColumn(ColumnName="ERPID", IsPrimaryKey = true)]
+        [SugarColumn(ColumnName="ERPID")]
          public decimal? Erpid { get; set; }
         /// <summary>
         /// 鍗曟嵁绫诲瀷 
         ///</summary>
          [SugarColumn(ColumnName="FBILLTYPE"    )]
-         public string Fbilltype { get; set; }
+         public string? Fbilltype { get; set; }
         /// <summary>
         /// BOM鍒嗙被 
         ///</summary>
          [SugarColumn(ColumnName="FBOMCATEGORY"    )]
-         public string Fbomcategory { get; set; }
+         public string? Fbomcategory { get; set; }
         /// <summary>
         /// BOM鐢ㄩ�� 
         ///</summary>
          [SugarColumn(ColumnName="FBOMUSE"    )]
-         public string Fbomuse { get; set; }
+         public string? Fbomuse { get; set; }
         /// <summary>
         /// BOM鍒嗙粍 
         ///</summary>
          [SugarColumn(ColumnName="FGROUP"    )]
-         public string Fgroup { get; set; }
+         public string? Fgroup { get; set; }
         /// <summary>
         /// BOM缂栫爜 
         ///</summary>
          [SugarColumn(ColumnName="FNUMBER"    )]
-         public string Fnumber { get; set; }
+         public string? Fnumber { get; set; }
         /// <summary>
         /// BOM鐗堟湰鍙� 
         ///</summary>
          [SugarColumn(ColumnName="F_UNW_BOM_BB"    )]
-         public string FUnwBomBb { get; set; }
+         public string? FUnwBomBb { get; set; }
         /// <summary>
         /// 鐢熸晥鏃ユ湡 
         ///</summary>
@@ -59,22 +66,22 @@
         /// 鐖堕」鐗╂枡缂栫爜 
         ///</summary>
          [SugarColumn(ColumnName="FMATERIALID"    )]
-         public string Fmaterialid { get; set; }
+         public string? Fmaterialid { get; set; }
         /// <summary>
         /// 鐖堕」鐗╂枡鍚嶇О 
         ///</summary>
          [SugarColumn(ColumnName="FITEMNAME"    )]
-         public string Fitemname { get; set; }
+         public string? Fitemname { get; set; }
         /// <summary>
         /// 璁￠噺鍗曚綅 
         ///</summary>
          [SugarColumn(ColumnName="FBASEUNITID"    )]
-         public string Fbaseunitid { get; set; }
+         public string? Fbaseunitid { get; set; }
         /// <summary>
         /// 鍒涘缓浜� 
         ///</summary>
          [SugarColumn(ColumnName="FCREATORID"    )]
-         public string Fcreatorid { get; set; }
+         public string? Fcreatorid { get; set; }
         /// <summary>
         /// 鍒涘缓鏃堕棿 
         ///</summary>
@@ -84,17 +91,17 @@
         /// 鐗╂枡灞炴�� 
         ///</summary>
          [SugarColumn(ColumnName="FITEMPPROPERTY"    )]
-         public string Fitempproperty { get; set; }
+         public string? Fitempproperty { get; set; }
         /// <summary>
         /// 鎻忚堪 
         ///</summary>
          [SugarColumn(ColumnName="FDESCRIPTION"    )]
-         public string Fdescription { get; set; }
+         public string? Fdescription { get; set; }
         /// <summary>
         /// 淇敼浜� 
         ///</summary>
          [SugarColumn(ColumnName="FMODIFIERID"    )]
-         public string Fmodifierid { get; set; }
+         public string? Fmodifierid { get; set; }
         /// <summary>
         /// 淇敼鏃堕棿 
         ///</summary>
@@ -104,7 +111,7 @@
         /// 瀹℃牳浜� 
         ///</summary>
          [SugarColumn(ColumnName="FAPPROVERID"    )]
-         public string Fapproverid { get; set; }
+         public string? Fapproverid { get; set; }
         /// <summary>
         /// 瀹℃牳鏃堕棿 
         ///</summary>
@@ -114,17 +121,17 @@
         /// 绂佺敤鍘熷洜 
         ///</summary>
          [SugarColumn(ColumnName="FFORBIDRESON"    )]
-         public string Fforbidreson { get; set; }
+         public string? Fforbidreson { get; set; }
         /// <summary>
         /// 绂佺敤鐘舵�� 
         ///</summary>
          [SugarColumn(ColumnName="FFORBIDSTATUS"    )]
-         public string Fforbidstatus { get; set; }
+         public string? Fforbidstatus { get; set; }
         /// <summary>
         /// 绂佺敤浜� 
         ///</summary>
          [SugarColumn(ColumnName="FFORBIDDERID"    )]
-         public string Fforbidderid { get; set; }
+         public string? Fforbidderid { get; set; }
         /// <summary>
         /// 绂佺敤鏃ユ湡 
         ///</summary>
@@ -134,26 +141,26 @@
         /// 鍒涘缓缁勭粐 
         ///</summary>
          [SugarColumn(ColumnName="CREATE_ORGANIZATION"    )]
-         public string CreateOrganization { get; set; }
+         public string? CreateOrganization { get; set; }
         /// <summary>
         /// 浣跨敤缁勭粐 
         ///</summary>
          [SugarColumn(ColumnName="USING_ORGANIZATION"    )]
-         public string UsingOrganization { get; set; }
+         public string? UsingOrganization { get; set; }
         /// <summary>
         /// 宸ヨ壓璺嚎 
         ///</summary>
          [SugarColumn(ColumnName="ROUTING"    )]
-         public string Routing { get; set; }
+         public string? Routing { get; set; }
         /// <summary>
         /// 璐寸墖宸ヨ壓 
         ///</summary>
          [SugarColumn(ColumnName="F_UNW_TEXT_TPGY"    )]
-         public string FUnwTextTpgy { get; set; }
+         public string? FUnwTextTpgy { get; set; }
         /// <summary>
         /// BOM鏇存柊绫诲瀷 
         ///</summary>
          [SugarColumn(ColumnName="BOM_UPDATE_TYPE"    )]
-         public string BomUpdateType { get; set; }
+         public string? BomUpdateType { get; set; }
     }
 }

--
Gitblit v1.9.3