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/MesBomDetail1.cs | 71 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 29 deletions(-)
diff --git a/MES.Service/Modes/BOM/MesBomDetail1.cs b/MES.Service/Modes/BOM/MesBomDetail1.cs
index d1b19e1..d8462bc 100644
--- a/MES.Service/Modes/BOM/MesBomDetail1.cs
+++ b/MES.Service/Modes/BOM/MesBomDetail1.cs
@@ -11,12 +11,25 @@
public class MesBomDetail1
{
/// <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>
- ///
+ /// erphid
///</summary>
[SugarColumn(ColumnName="ERPHID" )]
public decimal? Erphid { get; set; }
@@ -24,52 +37,52 @@
/// 椤规
///</summary>
[SugarColumn(ColumnName="FREPLACEGROUP" )]
- public string Freplacegroup { get; set; }
+ public string? Freplacegroup { get; set; }
/// <summary>
/// 鍙樺姩鎹熻�楃巼锛堝 0.05 琛ㄧず 5%锛�
///</summary>
[SugarColumn(ColumnName="FSCRAPRATE" )]
- public decimal Fscraprate { get; set; }
+ public decimal? Fscraprate { get; set; }
/// <summary>
/// 浣嶇疆鍙�
///</summary>
[SugarColumn(ColumnName="FPOSITIONNO" )]
- public string Fpositionno { get; set; }
+ public string? Fpositionno { get; set; }
/// <summary>
/// 瀛愰」鐗╂枡缂栫爜
///</summary>
[SugarColumn(ColumnName="FMATERIALIDCHILD" )]
- public string Fmaterialidchild { get; set; }
+ public string? Fmaterialidchild { get; set; }
/// <summary>
/// 鐢ㄩ噺鍒嗗瓙
///</summary>
[SugarColumn(ColumnName="FNUMERATOR" )]
- public long? Fnumerator { get; set; }
+ public decimal? Fnumerator { get; set; }
/// <summary>
/// 鐢ㄩ噺鍒嗘瘝
///</summary>
[SugarColumn(ColumnName="FDENOMINATOR" )]
- public long? Fdenominator { get; set; }
+ public decimal? Fdenominator { get; set; }
/// <summary>
/// 瀛愰」鐗╂枡鍚嶇О
///</summary>
[SugarColumn(ColumnName="FCHILDITEMNAME" )]
- public string Fchilditemname { get; set; }
+ public string? Fchilditemname { get; set; }
/// <summary>
/// 瀛愰」鐗╂枡灞炴��
///</summary>
[SugarColumn(ColumnName="FCHILDITEMPROPERTY" )]
- public string Fchilditemproperty { get; set; }
+ public string? Fchilditemproperty { get; set; }
/// <summary>
/// 渚涘簲绫诲瀷
///</summary>
[SugarColumn(ColumnName="FSUPPLYTYPE" )]
- public string Fsupplytype { get; set; }
+ public string? Fsupplytype { get; set; }
/// <summary>
/// 瀛愰」绫诲瀷
///</summary>
[SugarColumn(ColumnName="FMATERIALTYPE" )]
- public string Fmaterialtype { get; set; }
+ public string? Fmaterialtype { get; set; }
/// <summary>
/// 鏍囧噯鐐规暟
///</summary>
@@ -79,37 +92,37 @@
/// 瀛愰」鍗曚綅
///</summary>
[SugarColumn(ColumnName="FCHILDUNITID" )]
- public string Fchildunitid { get; set; }
+ public string? Fchildunitid { get; set; }
/// <summary>
/// 鐢ㄩ噺绫诲瀷
///</summary>
[SugarColumn(ColumnName="FDOSAGETYPE" )]
- public string Fdosagetype { get; set; }
+ public string? Fdosagetype { get; set; }
/// <summary>
/// 瀛愰」 BOM 鐗堟湰
///</summary>
[SugarColumn(ColumnName="FBOMID" )]
- public string Fbomid { get; set; }
+ public string? Fbomid { get; set; }
/// <summary>
/// 澶囨敞
///</summary>
[SugarColumn(ColumnName="FMEMO" )]
- public string Fmemo { get; set; }
+ public string? Fmemo { get; set; }
/// <summary>
/// 榛樿鍙戞枡浠撳簱
///</summary>
[SugarColumn(ColumnName="FSTOCKID" )]
- public string Fstockid { get; set; }
+ public string? Fstockid { get; set; }
/// <summary>
/// 璺冲眰锛圷/N锛�
///</summary>
[SugarColumn(ColumnName="FISSKIP" )]
- public string Fisskip { get; set; }
+ public string? Fisskip { get; set; }
/// <summary>
/// 瀛樺湪澶氫釜鏇夸唬鏂规锛圷/N锛�
///</summary>
[SugarColumn(ColumnName="FISMULCSD" )]
- public string Fismulcsd { get; set; }
+ public string? Fismulcsd { get; set; }
/// <summary>
/// 鐢熸晥鏃ユ湡
///</summary>
@@ -124,7 +137,7 @@
/// 鍙戞枡鏂瑰紡
///</summary>
[SugarColumn(ColumnName="FISSUETYPE" )]
- public string Fissuetype { get; set; }
+ public string? Fissuetype { get; set; }
/// <summary>
/// 鍑�闇�姹傛瘮渚�
///</summary>
@@ -134,17 +147,17 @@
/// 璐寸墖宸ヨ壓锛堝瓙椤癸級
///</summary>
[SugarColumn(ColumnName="F_UNW_TEXT_TPGY_Z" )]
- public string FUnwTextTpgyZ { get; set; }
+ public string? FUnwTextTpgyZ { get; set; }
/// <summary>
/// 鍊掑啿鏃舵満
///</summary>
[SugarColumn(ColumnName="FBACKFLUSHTYPE" )]
- public string Fbackflushtype { get; set; }
+ public string? Fbackflushtype { get; set; }
/// <summary>
/// 瓒呭彂鎺у埗鏂瑰紡
///</summary>
[SugarColumn(ColumnName="FOVERCONTROLMODE" )]
- public string Fovercontrolmode { get; set; }
+ public string? Fovercontrolmode { get; set; }
/// <summary>
/// 鏈�灏忓彂鏂欐壒閲�
///</summary>
@@ -154,27 +167,27 @@
/// 鏄惁鑰冭檻鏈�灏忓彂鏂欙紙Y/N锛�
///</summary>
[SugarColumn(ColumnName="FISMINISSUEQTY" )]
- public string Fisminissueqty { get; set; }
+ public string? Fisminissueqty { get; set; }
/// <summary>
/// 鏄惁鍙戞崯鑰楋紙Y/N锛�
///</summary>
[SugarColumn(ColumnName="FISGETSCRAP" )]
- public string Fisgetscrap { get; set; }
+ public string? Fisgetscrap { get; set; }
/// <summary>
/// 宸ュ簭搴忓垪
///</summary>
[SugarColumn(ColumnName="FOPTQUEUE" )]
- public string Foptqueue { get; set; }
+ public string? Foptqueue { get; set; }
/// <summary>
/// 宸ュ簭ID
///</summary>
[SugarColumn(ColumnName="FOPERID" )]
- public string Foperid { get; set; }
+ public string? Foperid { get; set; }
/// <summary>
/// 浣滀笟ID
///</summary>
[SugarColumn(ColumnName="FPROCESSID" )]
- public string Fprocessid { get; set; }
+ public string? Fprocessid { get; set; }
/// <summary>
/// 璁′环鐐规暟
///</summary>
--
Gitblit v1.9.3