From 3a6f7cb36dff0ec99edddbb53078947fcf08a47e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 19 七月 2025 09:32:15 +0800
Subject: [PATCH] 1.用料清单变更

---
 MES.Service/Modes/Womcab.cs |  140 +++++++++++++++++++++++++++-------------------
 1 files changed, 82 insertions(+), 58 deletions(-)

diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index e8c82a6..5288f84 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -3,7 +3,7 @@
 namespace MES.Service.Modes;
 
 /// <summary>
-///     浠诲姟鍗曠墿鏂欒〃
+///     浠诲姟鍗曠墿鏂欒〃bom
 /// </summary>
 [SugarTable("WOMCAB")]
 public class Womcab
@@ -24,55 +24,55 @@
     ///     宸ュ崟鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "CAB001")]
-    public string? Cab001 { get; set; }
+    public string Cab001 { get; set; }
 
     /// <summary>
     ///     搴忓彿
     /// </summary>
     [SugarColumn(ColumnName = "CAB002")]
-    public string? Cab002 { get; set; }
+    public int? Cab002 { get; set; }
 
     /// <summary>
     ///     鏉愭枡缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "CAB003")]
-    public string? Cab003 { get; set; }
+    public string Cab003 { get; set; }
 
     /// <summary>
     ///     闇�棰嗙敤閲�
     /// </summary>
     [SugarColumn(ColumnName = "CAB006")]
-    public int? Cab006 { get; set; }
+    public decimal? Cab006 { get; set; }
 
     /// <summary>
     ///     宸查鐢ㄩ噺
     /// </summary>
     [SugarColumn(ColumnName = "CAB007")]
-    public int? Cab007 { get; set; }
+    public decimal? Cab007 { get; set; }
 
     /// <summary>
     ///     宸ヨ壓
     /// </summary>
     [SugarColumn(ColumnName = "CAB008")]
-    public string? Cab008 { get; set; }
+    public string Cab008 { get; set; }
 
     /// <summary>
     ///     鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "CAB009")]
-    public string? Cab009 { get; set; }
+    public string Cab009 { get; set; }
 
     /// <summary>
     ///     缁勬垚鐢ㄩ噺
     /// </summary>
     [SugarColumn(ColumnName = "CAB012")]
-    public int? Cab012 { get; set; }
+    public decimal? Cab012 { get; set; }
 
     /// <summary>
     ///     鏄惁鏇挎枡
     /// </summary>
     [SugarColumn(ColumnName = "CAB014")]
-    public string? Cab014 { get; set; }
+    public string Cab014 { get; set; }
 
     /// <summary>
     ///     PID
@@ -90,142 +90,166 @@
     ///     浣嶇疆鍙�
     /// </summary>
     [SugarColumn(ColumnName = "POSITION_NO")]
-    public string? PositionNo { get; set; }
+    public string PositionNo { get; set; }
 
     /// <summary>
     ///     鍙戞枡缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
-    public string? IssuingOrganization { get; set; }
+    public string IssuingOrganization { get; set; }
 
     /// <summary>
     ///     渚涘簲缁勭粐
     /// </summary>
     [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
-    public string? SupplyOrganization { get; set; }
+    public string SupplyOrganization { get; set; }
 
     /// <summary>
     ///     璐т富
     /// </summary>
     [SugarColumn(ColumnName = "OWNER_ID")]
-    public string? OwnerId { get; set; }
+    public string OwnerId { get; set; }
 
     /// <summary>
     ///     璁″垝璺熻釜鍙�
     /// </summary>
     [SugarColumn(ColumnName = "MTONO")]
-    public string? Mtono { get; set; }
+    public string Mtono { get; set; }
 
     /// <summary>
     ///     鎵瑰彿
     /// </summary>
     [SugarColumn(ColumnName = "LOT")]
-    public string? Lot { get; set; }
+    public string Lot { get; set; }
 
     /// <summary>
     ///     浠撳簱
     /// </summary>
     [SugarColumn(ColumnName = "DEPOT_CODE")]
-    public string? DepotCode { get; set; }
+    public string DepotCode { get; set; }
 
     /// <summary>
     ///     鍙戞枡鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "ISSUE_TYPE")]
-    public string? IssueType { get; set; }
+    public string IssueType { get; set; }
 
     /// <summary>
     ///     渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
     /// </summary>
     [SugarColumn(ColumnName = "SUPPLY_TYPE")]
-    public string? SupplyType { get; set; }
+    public string SupplyType { get; set; }
 
     /// <summary>
     ///     鍒嗗瓙
     /// </summary>
     [SugarColumn(ColumnName = "NUMERATOR")]
-    public string? Numerator { get; set; }
+    public string Numerator { get; set; }
 
     /// <summary>
     ///     鍒嗘瘝
     /// </summary>
     [SugarColumn(ColumnName = "DENOMINATOR")]
-    public string? Denominator { get; set; }
+    public string Denominator { get; set; }
 
     /// <summary>
     ///     鍥哄畾鎹熻��
     /// </summary>
     [SugarColumn(ColumnName = "SCRAPQTY")]
-    public string? Scrapqty { get; set; }
+    public string Scrapqty { get; set; }
 
     /// <summary>
     ///     鍙樺姩鎹熻�楃巼
     /// </summary>
     [SugarColumn(ColumnName = "SCRAPRATE")]
-    public string? Scraprate { get; set; }
+    public string Scraprate { get; set; }
 
-    // /// <summary>
-    // ///     瀹㈡埛璐у彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
-    // public string? CustomerItemNumber { get; set; }
+    /// <summary>
+    ///     瀹㈡埛璐у彿
+    /// </summary>
+    [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+    public string CustomerItemNumber { get; set; }
 
-    // /// <summary>
-    // ///     鍖呰鍗曞彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
-    // public string? PackingListNumber { get; set; }
+    /// <summary>
+    ///     鍖呰鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+    public string PackingListNumber { get; set; }
 
-    // /// <summary>
-    // ///     涓讳骇鍝�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT")]
-    // public string? MainProduct { get; set; }
+    /// <summary>
+    ///     涓讳骇鍝�
+    /// </summary>
+    [SugarColumn(ColumnName = "MAIN_PRODUCT")]
+    public string MainProduct { get; set; }
 
-    // /// <summary>
-    // ///     涓讳骇鍝佹暟閲�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
-    // public int? MainProductQty { get; set; }
+    /// <summary>
+    ///     涓讳骇鍝佹暟閲�
+    /// </summary>
+    [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+    public int? MainProductQty { get; set; }
 
-    // /// <summary>
-    // ///     鐖堕」鐗╂枡鍚嶇О
-    // /// </summary>
-    // [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
-    // public string? ParentItemName { get; set; }
+    /// <summary>
+    ///     鐖堕」鐗╂枡鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
+    public string ParentItemName { get; set; }
 
-    // /// <summary>
-    // ///     閿�鍞鍗�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "FSALEORDERNO")]
-    // public string? Fsaleorderno { get; set; }
+    /// <summary>
+    ///     閿�鍞鍗�
+    /// </summary>
+    [SugarColumn(ColumnName = "FSALEORDERNO")]
+    public string Fsaleorderno { get; set; }
 
     /// <summary>
     ///     璐т富绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "FOWNERTYPEID")]
-    public string? Fownertypeid { get; set; }
+    public string Fownertypeid { get; set; }
 
     /// <summary>
     ///     椤规鍙�
     /// </summary>
     [SugarColumn(ColumnName = "FREPLACEGROUP")]
-    public string? Freplacegroup { get; set; }
+    public int? Freplacegroup { get; set; }
 
     /// <summary>
     ///     閿�鍞鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "ERP_XSDDH")]
-    public string? ErpXsddh { get; set; }
+    public string ErpXsddh { get; set; }
 
     /// <summary>
     ///     瀛愰」绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "FMATERIALTYPE")]
-    public string? Fmaterialtype { get; set; }
+    public string Fmaterialtype { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "FUNITID")]
-    public string? Funitid { get; set; }
+    public string Funitid { get; set; }
+
+    /// <summary>
+    ///     搴斿彂鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "Must_Qty")]
+    public decimal? MustQty { get; set; }
+
+    /// <summary>
+    ///     浣跨敤姣斾緥锛�%锛�
+    /// </summary>
+    [SugarColumn(ColumnName = "Use_Rate")]
+    public decimal? UseRate { get; set; }
+
+    /// <summary>
+    ///     瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+    /// </summary>
+    [SugarColumn(ColumnName = "Material_Type")]
+    public string MaterialType { get; set; }
+
+    /// <summary>
+    ///     A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+    /// </summary>
+    [SugarColumn(ColumnName = "TYPEB")]
+    public string? Typeb { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3