From f56fcadd8d412fa1a65c873e77ad04ebb31fc954 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期五, 18 七月 2025 14:27:43 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~cnj/ZMZ_MES_Api

---
 StandardPda/MES.Service/Modes/Womcaa.cs |  368 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 227 insertions(+), 141 deletions(-)

diff --git a/StandardPda/MES.Service/Modes/Womcaa.cs b/StandardPda/MES.Service/Modes/Womcaa.cs
index 86b5acb..00b2669 100644
--- a/StandardPda/MES.Service/Modes/Womcaa.cs
+++ b/StandardPda/MES.Service/Modes/Womcaa.cs
@@ -3,39 +3,37 @@
 namespace MES.Service.Modes;
 
 /// <summary>
-///     宸ュ崟琛�
+///     浠诲姟鍗曡〃
 /// </summary>
 [SugarTable("WOMCAA")]
 public class Womcaa
 {
     /// <summary>
-    ///     鑷鍒�  SEQ_AOI
+    ///     鑷鍒�
     /// </summary>
-    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
-        OracleSequenceName = "SEQ_CAA")]
-    public decimal? Id { get; set; }
+    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_CAA", IsPrimaryKey = true)]
+    public decimal Id { get; set; }
 
     /// <summary>
-    ///     ERPID
+    ///     鐢熶骇璁㈠崟琛屽唴鐮�
     /// </summary>
     [SugarColumn(ColumnName = "ERPID")]
     public decimal? Erpid { get; set; }
 
     /// <summary>
-    ///     鍗曞彿
+    ///     鍗曟嵁缂栧彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA001")]
     public string? Caa001 { get; set; }
 
     /// <summary>
-    ///     鍗曟嵁绫诲瀷 1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� SCDD03_SYS2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 SCDD04_SYS3銆佸伐搴忔眹鎶�-鏅�氱敓浜�
-    ///     SCDD01_SYS4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇 SCDD02_SYS
+    ///     鍗曟嵁绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "CAA004")]
     public string? Caa004 { get; set; }
 
     /// <summary>
-    ///     寮�鍗曟棩鏈�
+    ///     璁″垝涓嬭揪鏃ユ湡
     /// </summary>
     [SugarColumn(ColumnName = "CAA005")]
     public string? Caa005 { get; set; }
@@ -65,7 +63,7 @@
     public string? Caa011 { get; set; }
 
     /// <summary>
-    ///     鏁伴噺
+    ///     宸ュ崟鏁伴噺
     /// </summary>
     [SugarColumn(ColumnName = "CAA012")]
     public decimal? Caa012 { get; set; }
@@ -95,25 +93,25 @@
     public decimal? Caa017 { get; set; }
 
     /// <summary>
-    ///     ERP婧愬崟ID
+    ///     ERP鐢熶骇璁㈠崟ID
     /// </summary>
     [SugarColumn(ColumnName = "CAA018")]
     public decimal? Caa018 { get; set; }
 
     /// <summary>
-    ///     ERP婧愬崟琛屽彿
+    ///     ERP鐢熶骇璁㈠崟搴忓彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA019")]
-    public string? Caa019 { get; set; }
+    public decimal? Caa019 { get; set; }
 
     /// <summary>
-    ///     ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
+    ///     ERP鐢熶骇璁㈠崟鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA020")]
     public string? Caa020 { get; set; }
 
     /// <summary>
-    ///     宸ヤ綔杞﹂棿
+    ///     鐢熶骇杞﹂棿
     /// </summary>
     [SugarColumn(ColumnName = "CAA021")]
     public string? Caa021 { get; set; }
@@ -143,7 +141,7 @@
     public decimal? Caa022 { get; set; }
 
     /// <summary>
-    ///     鐘舵�� 瀹屽伐锛屾湭瀹屽伐
+    ///     涓氬姟鐘舵��
     /// </summary>
     [SugarColumn(ColumnName = "CAA023")]
     public string? Caa023 { get; set; }
@@ -233,7 +231,7 @@
     public string? SrcBillType { get; set; }
 
     /// <summary>
-    ///     婧愬崟缂栧彿
+    ///     婧愬崟缂栫爜
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILL_NO")]
     public string? SrcBillNo { get; set; }
@@ -275,18 +273,6 @@
     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")]
@@ -314,7 +300,49 @@
     ///     缁撴鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "JA_BS")]
-    public string? JaBs { get; set; }
+    public decimal? JaBs { get; set; }
+
+    /// <summary>
+    ///     鏃х墿鏂欑紪鐮�
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_BASEPROPERTY")]
+    public string? FwwcBaseproperty { get; set; }
+
+    /// <summary>
+    ///     璁″垝瀹屽伐鎼哄甫鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DATETIME")]
+    public DateTime? FwwcDatetime { get; set; }
+
+    /// <summary>
+    ///     鐢熶骇鍏ュ簱鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_SCRKRQ")]
+    public DateTime? FwwcScrkrq { get; set; }
+
+    /// <summary>
+    ///     宸ユ椂
+    /// </summary>
+    [SugarColumn(ColumnName = "FGS")]
+    public decimal? Fgs { get; set; }
+
+    /// <summary>
+    ///     浜х嚎浜烘暟
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_DECIMAL")]
+    public decimal? FwwcDecimal { get; set; }
+
+    /// <summary>
+    ///     绾垮埆
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_XB")]
+    public string? FwwcXb { get; set; }
+
+    /// <summary>
+    ///     閿�鍞憳
+    /// </summary>
+    [SugarColumn(ColumnName = "F_WWC_BASE")]
+    public string? FwwcBase { get; set; }
 
     /// <summary>
     ///     淇敼鏍囪瘑
@@ -323,118 +351,176 @@
     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 = "F_ZSXG_KH")]
+    public string? FZsxgKh { get; set; }
+
+    /// <summary>
+    ///     瑕佽揣鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "F_ZJXF_YHRQ")]
+    public string? FZjxfYhrq { get; set; }
+
+    /// <summary>
+    ///     BOM绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "BOMTYPE")]
+    public string? Bomtype { get; set; }
+
+    /// <summary>
+    ///     BOM姣嶉」
+    /// </summary>
+    [SugarColumn(ColumnName = "BOMMASTER")]
+    public decimal? Bommaster { get; set; }
+
+    /// <summary>
+    ///     BOM鐢熶骇鐩殑
+    /// </summary>
+    [SugarColumn(ColumnName = "BOMALTRNATE")]
+    public string? Bomaltrnate { get; set; }
+
+    /// <summary>
+    ///     BOM鏈夋晥鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "BOMEFFEDATE")]
+    public string? Bomeffedate { get; set; }
+
+    /// <summary>
+    ///     宸ヨ壓鐢熶骇鐩殑
+    /// </summary>
+    [SugarColumn(ColumnName = "ROUTINGALTERNATE")]
+    public string? Routingalternate { get; set; }
+
+    /// <summary>
+    ///     宸ヨ壓鏈夋晥鏃ユ湡
+    /// </summary>
+    [SugarColumn(ColumnName = "ROUTINGEFFEDATE")]
+    public string? Routingeffedate { get; set; }
+
+    /// <summary>
+    ///     MRP鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "MRPQTY")]
+    public decimal? Mrpqty { get; set; }
+
+    /// <summary>
+    ///     涓氬姟寮�濮嬫椂闂�
+    /// </summary>
+    [SugarColumn(ColumnName = "ACTUALSTARTDATE")]
+    public DateTime? Actualstartdate { get; set; }
+
+    /// <summary>
+    ///     涓氬姟缁撴潫鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "ACTUALCOMPLETEDATE")]
+    public DateTime? Actualcompletedate { get; set; }
+
+    /// <summary>
+    ///     鏉ユ簮绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "MOSOURCEDOCTYPE")] 
+    public string? Mosourcedoctype { get; set; }
+
+    /// <summary>
+    ///     椤圭洰
+    /// </summary>
+    [SugarColumn(ColumnName = "PROJECT")]
+    public decimal? Project { get; set; }
+
+    /// <summary>
+    ///     璐т富缁勭粐
+    /// </summary>
+    [SugarColumn(ColumnName = "OWNERORG")]
+    public decimal? Ownerorg { get; set; }
+
+    /// <summary>
+    ///     鍒涘缓浜�
+    /// </summary>
+    [SugarColumn(ColumnName = "CREATEDBY")]
+    public string? Createdby { get; set; }
+
+    /// <summary>
+    ///     鍒涘缓鏃堕棿
+    /// </summary>
+    [SugarColumn(ColumnName = "CREATEDON")]
+    public DateTime? Createdon { get; set; }
+
+    /// <summary>
+    ///     寮�宸ユ暟閲�
+    /// </summary>
+    [SugarColumn(ColumnName = "TOTALSTARTQTY")]
+    public decimal? Totalstartqty { get; set; }
+
+    /// <summary>
+    ///     瀹屽伐鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "TOTALCOMPLETEQTY")]
+    public decimal? Totalcompleteqty { get; set; }
+
+    /// <summary>
+    ///     鍏ュ簱鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "TOTALRCVQTY")]
+    public decimal? Totalrcvqty { get; set; }
+
+    /// <summary>
+    ///     杩斿伐鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "TOTALREWORKINGQTY")]
+    public decimal? Totalreworkingqty { get; set; }
+
+    /// <summary>
+    ///     杩斿伐鍘熷洜
+    /// </summary>
+    [SugarColumn(ColumnName = "REASONFORREWORK")]
+    public string? Reasonforrework { get; set; }
+
+    /// <summary>
+    ///     寮哄埗榻愬
+    /// </summary>
+    [SugarColumn(ColumnName = "ISFORCEWHOLESET")]
+    public decimal? Isforcewholeset { get; set; }
+
+    /// <summary>
+    ///    鍒嗗壊鍓嶅師璁㈠崟缂栧彿
+    /// </summary>
+    [SugarColumn(ColumnName = "PREVMO")]
+    public string? PREVMO { get; set; }
+
+    /// <summary>
     ///     1锛屾柊澧烇紱2锛屽彉鏇�
     /// </summary>
     [SugarColumn(ColumnName = "TYPEA")]
     public string? Typea { get; set; }
-
-
-    /// <summary>
-    ///     鐢熶骇閫氱煡鍗� 锛堟矁灏旀柊澧烇級
-    /// </summary>
-    [SugarColumn(ColumnName = "WR_F_SCDD_SCTZD")]
-    public string? WR_F_SCDD_SCTZD { get; set; }
-
-    /// <summary>
-    ///     鍨嬪彿 锛堟矁灏旀柊澧烇級
-    /// </summary>
-    [SugarColumn(ColumnName = "WR_F_SCDD_XH")]
-    public string? WR_F_SCDD_XH { get; set; }
-
-    /// <summary>
-    ///     澶囨敞(琛ㄤ綋)
-    /// </summary>
-    [SugarColumn(ColumnName = "BTBZ")]
-    public string? BTBZ { get; set; }
-
-
-    /// <summary>
-    ///     璁″垝纭鏃堕棿锛堟墽琛屾棩鏈燂級 --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "PLANCONFIRMATION")]
-    public string? PLANCONFIRMATION { get; set; }
-
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟ID --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FSUBID")]
-    public string? FSUBID { get; set; }
-
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟搴忓彿 --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FSUBBILLNOSEQ")]
-    public string? FSUBBILLNOSEQ { get; set; }
-
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟鍗曞彿 --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FSUBBILLNO")]
-    public string? FSUBBILLNO { get; set; }
-
-    /// <summary>
-    ///     闇�姹傛潵婧� --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FREQSRC")]
-    public string? FREQSRC { get; set; }
-
-    /// <summary>
-    ///     婧愭媶鍒嗚鍗曡鍙� --濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "SRCSPLITSEQ")]
-    public string? SRCSPLITSEQ { get; set; }
-
-    /// <summary>
-    ///     ERP濮斿璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FSUBENTRYID")]
-    public string? FSUBENTRYID { get; set; }
-
-    /// <summary>
-    ///     ERP濮斿璁㈠崟鍒嗗綍鍐呯爜 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FPURORDERNO")]
-    public string? FPURORDERNO { get; set; }
-
-    /// <summary>
-    ///     閲囪喘璁㈠崟琛屽彿 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
-    public string? FPURORDERENTRYSEQ { get; set; }
-
-    /// <summary>
-    ///     鍩烘湰鍗曚綅鍏ュ簱鏁伴噺 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FBASESTOCKINQTY")]
-    public decimal? FBASESTOCKINQTY { get; set; }
-
-    /// <summary>
-    ///     鍩烘湰鍗曚綅鏈叆搴撴暟閲� -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FBASENOSTOCKINQTY")]
-    public decimal? FBASENOSTOCKINQTY { get; set; }
-
-    /// <summary>
-    ///     鍏ュ簱璐т富 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "FINSTOCKOWNERID")]
-    public string? FINSTOCKOWNERID { get; set; }
-
-    /// <summary>
-    ///     鐢熶骇閫氱煡鍗� -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "F_WWDD_SCTZD")]
-    public string? F_WWDD_SCTZD { get; set; }
-
-    /// <summary>
-    ///     鍨嬪彿 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "F_WWDD_XH")]
-    public string? F_WWDD_XH { get; set; }
-
-    /// <summary>
-    ///     BOM澶囨敞 -- 濮斿
-    /// </summary>
-    [SugarColumn(ColumnName = "F_XIFG_TEXT_TZK")]
-    public string? F_XIFG_TEXT_TZK { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3