From 302054e253f1550ee64430882786ec9a3920ec92 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期六, 19 七月 2025 08:33:44 +0800
Subject: [PATCH] 优化多组织代码

---
 MES.Service/Modes/Womcab.cs |   66 ++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index ed90591..46bb1fe 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -12,7 +12,7 @@
     ///     鑷鍒�
     /// </summary>
     [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
-        OracleSequenceName = "SEQ_AOI")]
+        OracleSequenceName = "SEQ_CAB")]
     public decimal? Id { get; set; }
 
     /// <summary>
@@ -25,19 +25,19 @@
     ///     鍗曞彿
     /// </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 string? Cab002 { get; set; }
 
     /// <summary>
     ///     鏉愭枡缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "CAB003")]
-    public string Cab003 { get; set; }
+    public string? Cab003 { get; set; }
 
     /// <summary>
     ///     闇�棰嗙敤閲�
@@ -55,13 +55,13 @@
     ///     宸ヨ壓
     /// </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>
     ///     缁勬垚鐢ㄩ噺
@@ -73,7 +73,7 @@
     ///     鏄惁鏇挎枡
     /// </summary>
     [SugarColumn(ColumnName = "CAB014")]
-    public string Cab014 { get; set; }
+    public string? Cab014 { get; set; }
 
     /// <summary>
     ///     PID
@@ -91,65 +91,95 @@
     ///     浣嶇疆鍙�
     /// </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>
     ///     渚涘簲绫诲瀷
     /// </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 decimal? Numerator { get; set; }
 
     /// <summary>
     ///     鍒嗘瘝
     /// </summary>
     [SugarColumn(ColumnName = "DENOMINATOR")]
-    public string Denominator { get; set; }
+    public decimal? Denominator { get; set; }
+
+    /// <summary>
+    ///     鍥哄畾鎹熻��
+    /// </summary>
+    [SugarColumn(ColumnName = "SCRAPQTY")]
+    public decimal? SCRAPQTY { get; set; }
+
+    /// <summary>
+    ///     鍙樺姩鎹熻�楃巼
+    /// </summary>
+    [SugarColumn(ColumnName = "SCRAPRATE")]
+    public decimal? SCRAPRATE { get; set; }
+
+    /// <summary>
+    ///     閿�鍞鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "SALES_ORDER")]
+    public string? SalesOrder { get; set; }
+
+    /// <summary>
+    ///     瑕佽揣鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
+    public string? F_ZJXF_YHRQ { get; set; }
+
+    /// <summary>
+    ///     宸ュ簭缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "PROC_NO")]
+    public string? ProcNo { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3