From 5de35354e8dfcb4933350d0d1b645d400bcf23ab Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期二, 22 七月 2025 15:30:09 +0800
Subject: [PATCH] 优化多组织

---
 MES.Service/Modes/Womcaa.cs |  170 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 133 insertions(+), 37 deletions(-)

diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index e6e2a2d..86381d8 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -9,10 +9,10 @@
 public class Womcaa
 {
     /// <summary>
-    ///     鑷鍒�  SEQ_AOI
+    ///     鑷鍒�  SEQ_CAA
     /// </summary>
     [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
-        OracleSequenceName = "SEQ_AOI")]
+        OracleSequenceName = "SEQ_CAA")]
     public decimal? Id { get; set; }
 
     /// <summary>
@@ -25,44 +25,44 @@
     ///     鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA001")]
-    public string Caa001 { get; set; }
+    public string? Caa001 { get; set; }
 
     /// <summary>
     ///     鍗曟嵁绫诲瀷 1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� SCDD03_SYS2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 SCDD04_SYS3銆佸伐搴忔眹鎶�-鏅�氱敓浜�
     ///     SCDD01_SYS4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇 SCDD02_SYS
     /// </summary>
     [SugarColumn(ColumnName = "CAA004")]
-    public string Caa004 { get; set; }
+    public string? Caa004 { get; set; }
 
     /// <summary>
     ///     寮�鍗曟棩鏈�
     /// </summary>
     [SugarColumn(ColumnName = "CAA005")]
-    public string Caa005 { get; set; }
+    public string? Caa005 { get; set; }
 
     /// <summary>
     ///     浜у搧缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "CAA006")]
-    public string Caa006 { get; set; }
+    public string? Caa006 { get; set; }
 
     /// <summary>
     ///     鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "CAA009")]
-    public string Caa009 { get; set; }
+    public string? Caa009 { get; set; }
 
     /// <summary>
     ///     棰勮寮�宸ユ椂闂�
     /// </summary>
     [SugarColumn(ColumnName = "CAA010")]
-    public string Caa010 { get; set; }
+    public string? Caa010 { get; set; }
 
     /// <summary>
     ///     棰勮瀹屽伐鏃堕棿
     /// </summary>
     [SugarColumn(ColumnName = "CAA011")]
-    public string Caa011 { get; set; }
+    public string? Caa011 { get; set; }
 
     /// <summary>
     ///     鏁伴噺
@@ -74,19 +74,19 @@
     ///     BOM鐗堟
     /// </summary>
     [SugarColumn(ColumnName = "CAA013")]
-    public string Caa013 { get; set; }
+    public string? Caa013 { get; set; }
 
     /// <summary>
     ///     閿�鍞鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA015")]
-    public string Caa015 { get; set; }
+    public string? Caa015 { get; set; }
 
     /// <summary>
     ///     澶囨敞
     /// </summary>
     [SugarColumn(ColumnName = "CAA016")]
-    public string Caa016 { get; set; }
+    public string? Caa016 { get; set; }
 
     /// <summary>
     ///     宸叉帓鏁伴噺
@@ -104,19 +104,19 @@
     ///     ERP婧愬崟琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA019")]
-    public decimal? Caa019 { get; set; }
+    public string? Caa019 { get; set; }
 
     /// <summary>
     ///     ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
     /// </summary>
     [SugarColumn(ColumnName = "CAA020")]
-    public string Caa020 { get; set; }
+    public string? Caa020 { get; set; }
 
     /// <summary>
     ///     宸ヤ綔杞﹂棿
     /// </summary>
     [SugarColumn(ColumnName = "CAA021")]
-    public string Caa021 { get; set; }
+    public string? Caa021 { get; set; }
 
     /// <summary>
     ///     瀹℃牳鐮�
@@ -134,7 +134,7 @@
     ///     瀹℃牳浜�
     /// </summary>
     [SugarColumn(ColumnName = "CHECK_USER")]
-    public string CheckUser { get; set; }
+    public string? CheckUser { get; set; }
 
     /// <summary>
     ///     鏈帓鏁伴噺
@@ -146,7 +146,7 @@
     ///     鐘舵�� 瀹屽伐锛屾湭瀹屽伐
     /// </summary>
     [SugarColumn(ColumnName = "CAA023")]
-    public string Caa023 { get; set; }
+    public string? Caa023 { get; set; }
 
     /// <summary>
     ///     宸插叆搴撴暟閲�
@@ -158,119 +158,215 @@
     ///     宸ヨ壓璺嚎
     /// </summary>
     [SugarColumn(ColumnName = "ROUTING_ID")]
-    public string RoutingId { get; set; }
+    public string? RoutingId { get; set; }
 
     /// <summary>
     ///     浜х嚎
     /// </summary>
     [SugarColumn(ColumnName = "WORK_SHOP_ID")]
-    public string WorkShopId { get; set; }
+    public string? WorkShopId { get; set; }
 
     /// <summary>
     ///     浠撳簱
     /// </summary>
     [SugarColumn(ColumnName = "DEPOT_CODE")]
-    public string DepotCode { get; set; }
+    public string? DepotCode { get; set; }
 
     /// <summary>
     ///     鍗曟嵁鏃ユ湡
     /// </summary>
     [SugarColumn(ColumnName = "CREATE_DATE")]
-    public string CreateDate { get; set; }
+    public string? CreateDate { get; set; }
 
     /// <summary>
     ///     璁″垝缁�
     /// </summary>
     [SugarColumn(ColumnName = "WORK_GROUP_ID")]
-    public string WorkGroupId { get; set; }
+    public string? WorkGroupId { get; set; }
 
     /// <summary>
     ///     璁″垝鍛�
     /// </summary>
     [SugarColumn(ColumnName = "PLAN_ID")]
-    public string PlanId { get; set; }
+    public string? PlanId { get; set; }
 
     /// <summary>
     ///     鍏ュ簱涓婇檺
     /// </summary>
     [SugarColumn(ColumnName = "STOCK_INLIMITH")]
-    public string StockInlimith { get; set; }
+    public string? StockInlimith { get; set; }
 
     /// <summary>
     ///     鍏ュ簱涓嬮檺
     /// </summary>
     [SugarColumn(ColumnName = "STOCK_INLIMITL")]
-    public string StockInlimitl { get; set; }
+    public string? StockInlimitl { 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 = "CAA015_HEAD")]
-    public string Caa015Head { get; set; }
+    public string? Caa015Head { get; set; }
 
     /// <summary>
     ///     鐢熸垚鏂瑰紡
     /// </summary>
     [SugarColumn(ColumnName = "CREATE_TYPE")]
-    public string CreateType { get; set; }
+    public string? CreateType { get; set; }
 
     /// <summary>
     ///     婧愬崟绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
-    public string SrcBillType { get; set; }
+    public string? SrcBillType { get; set; }
 
     /// <summary>
     ///     婧愬崟缂栧彿
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILL_NO")]
-    public string SrcBillNo { get; set; }
+    public string? SrcBillNo { get; set; }
 
     /// <summary>
     ///     婧愬崟鍒嗗綍琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
-    public string SrcBillentryseq { get; set; }
+    public string? SrcBillentryseq { get; set; }
 
     /// <summary>
     ///     闇�姹傚崟鎹彿
     /// </summary>
     [SugarColumn(ColumnName = "SALE_ORDER_NO")]
-    public string SaleOrderNo { get; set; }
+    public string? SaleOrderNo { get; set; }
 
     /// <summary>
     ///     闇�姹傚崟鎹鍙�
     /// </summary>
     [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
-    public string SaleOrderEntryseq { get; set; }
+    public string? SaleOrderEntryseq { get; set; }
 
     /// <summary>
     ///     缁撴浜�
     /// </summary>
     [SugarColumn(ColumnName = "FORCE_CLOSERID")]
-    public string ForceCloserid { get; set; }
+    public string? ForceCloserid { get; set; }
 
     /// <summary>
     ///     缁撴绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "CLOSE_TYPE")]
-    public string CloseType { get; set; }
+    public string? CloseType { get; set; }
 
     /// <summary>
     ///     婧愭媶鍒嗚鍗曠紪鍙�
     /// </summary>
     [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
-    public string SrcSplitBillno { get; set; }
+    public string? SrcSplitBillno { get; set; }
+
+    /// <summary>
+    ///     瀹㈡埛
+    /// </summary>
+    [SugarColumn(ColumnName = "F_ZSXG_KH")]
+    public string? F_ZSXG_KH { get; set; }
+
+    /// <summary>
+    ///     瑕佽揣鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
+    public string? F_ZJXF_YHRQ { get; set; }
+
+    /// <summary>
+    ///     鐢熶骇缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "PRD_ORG")]
+    public string? PrdOrg { get; set; }
+
+    /// <summary>
+    ///     濮旀墭缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "TRUST_ORG")]
+    public string? TrustOrg { get; set; }
+
+    /// <summary>
+    ///     鍚屾鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "TB_TIME")]
+    public DateTime? TbTime { get; set; }
+
+    /// <summary>
+    ///     缁撴鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "JA_TIME")]
+    public DateTime? JaTime { get; set; }
+
+    /// <summary>
+    ///     缁撴鏍囪瘑
+    /// </summary>
+    [SugarColumn(ColumnName = "JA_BS")]
+    public string? JaBs { get; set; }
+
+    /// <summary>
+    ///     淇敼鏍囪瘑
+    /// </summary>
+    [SugarColumn(ColumnName = "IS_XG")]
+    public decimal? IsXg { get; set; }
+
+    /// <summary>
+    ///     濮斿閲囪喘璁㈠崟
+    /// </summary>
+    [SugarColumn(ColumnName = "FPURORDERNO")]
+    public string? FPURORDERNO { get; set; }
+
+    /// <summary>
+    ///     濮斿閲囪喘璁㈠崟
+    /// </summary>
+    [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
+    public decimal? FPURORDERENTRYSEQ { get; set; }
+
+    /// <summary>
+    ///     濮斿璁㈠崟鍒嗗綍鍐呯爜
+    /// </summary>
+    [SugarColumn(ColumnName = "FSUBENTRYID")]
+    public decimal? FSUBENTRYID { get; set; }
+
+    /// <summary>
+    ///     濮斿鍏ュ簱鏁�
+    /// </summary>
+    [SugarColumn(ColumnName = "FSTOCKINQTY")]
+    public decimal? FSTOCKINQTY { get; set; }
+
+    /// <summary>
+    ///     濮斿鏈叆搴撴暟
+    /// </summary>
+    [SugarColumn(ColumnName = "FNOSTOCKINQTY")]
+    public decimal? FNOSTOCKINQTY { get; set; }
+
+    /// <summary>
+    ///     渚涘簲鍟�
+    /// </summary>
+    [SugarColumn(ColumnName = "SUPPLIER_ID")]
+    public string? SupplierId { get; set; }
+
+    /// <summary>
+    ///     鎴愬搧
+    /// </summary>
+    [SugarColumn(ColumnName = "FINISHED_PRODUCT")]
+    public string? FinishedProduct { get; set; }
+
+    /// <summary>
+    ///     鍚◣鍗曚环
+    /// </summary>
+    [SugarColumn(ColumnName = "F_ZJXF_HSDJ")]
+    public string? F_ZJXF_HSDJ { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3