From 431a63b3c2335c5ecb8cf78507f470eb26e9b6d7 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 28 二月 2025 14:43:50 +0800
Subject: [PATCH] 1.调拨申请时间改为 传到mes的时间

---
 MES.Service/Modes/Womcaa.cs |  100 ++++++++++++++++++++++++++-----------------------
 1 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 0dc869e..85694b4 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -24,43 +24,43 @@
     ///     鍗曟嵁缂栧彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA001")]
-    public string Caa001 { get; set; }
+    public string? Caa001 { get; set; }
 
     /// <summary>
     ///     鍗曟嵁绫诲瀷(&quot;1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇&quot;)
     /// </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>
     ///     浜у搧ID
     /// </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>
     ///     宸ュ崟鏁伴噺
@@ -72,19 +72,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>
     ///     宸叉帓鏁伴噺锛堝純鐢級
@@ -108,13 +108,13 @@
     ///     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>
     ///     瀹℃牳鐮�
@@ -132,7 +132,7 @@
     ///     瀹℃牳浜�
     /// </summary>
     [SugarColumn(ColumnName = "CHECK_USER")]
-    public string CheckUser { get; set; }
+    public string? CheckUser { get; set; }
 
     /// <summary>
     ///     鏈帓鏁伴噺锛堝純鐢級
@@ -144,7 +144,7 @@
     ///     涓氬姟鐘舵��(&quot;1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�&quot;)
     /// </summary>
     [SugarColumn(ColumnName = "CAA023")]
-    public string Caa023 { get; set; }
+    public string? Caa023 { get; set; }
 
     /// <summary>
     ///     宸插叆搴撴暟閲�
@@ -156,121 +156,121 @@
     ///     宸ヨ壓璺嚎
     /// </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>
     ///     鏄惁绠℃帶
@@ -287,7 +287,7 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
-    public string MainProductNo { get; set; }
+    public string? MainProductNo { get; set; }
 
     /// <summary>
     /// </summary>
@@ -297,32 +297,32 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
-    public string CustomerItemNumber { get; set; }
+    public string? CustomerItemNumber { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
-    public string PackingListNumber { get; set; }
+    public string? PackingListNumber { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "CUSTOMER_NAME")]
-    public string CustomerName { get; set; }
+    public string? CustomerName { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "CUSTOMER")]
-    public string Customer { get; set; }
+    public string? Customer { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "TYPE")]
-    public string Type { get; set; }
+    public string? Type { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "JA_BS")]
-    public string JaBs { get; set; }
+    public string? JaBs { get; set; }
 
     /// <summary>
     /// </summary>
@@ -337,7 +337,7 @@
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "CAA011_1")]
-    public string Caa0111 { get; set; }
+    public string? Caa0111 { get; set; }
 
     /// <summary>
     /// </summary>
@@ -389,29 +389,35 @@
     ///     閲囪喘璁㈠崟鍙�
     /// </summary>
     [SugarColumn(ColumnName = "FPURORDERNO")]
-    public string Fpurorderno { get; set; }
+    public string? Fpurorderno { get; set; }
 
     /// <summary>
     ///     閲囪喘璁㈠崟琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
-    public string Fpurorderentryseq { get; set; }
+    public string? Fpurorderentryseq { get; set; }
 
     /// <summary>
     ///     澶囨敞锛堣〃浣擄級
     /// </summary>
     [SugarColumn(ColumnName = "Btbz")]
-    public string Btbz { get; set; }
+    public string? Btbz { get; set; }
 
     /// <summary>
     ///     婧愭媶鍒嗚鍗曠紪鍙�
     /// </summary>
     [SugarColumn(ColumnName = "fmoentryid")]
-    public string Fmoentryid { get; set; }
+    public string? Fmoentryid { get; set; }
 
     /// <summary>
     ///     鎺掍骇绾垮埆
     /// </summary>
     [SugarColumn(ColumnName = "prod_line")]
-    public string ProdLine { get; set; }
+    public string? ProdLine { get; set; }
+
+    /// <summary>
+    ///     1锛屾柊澧烇紱2锛屽彉鏇�
+    /// </summary>
+    [SugarColumn(ColumnName = "TYPEA")]
+    public string? Typea { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3