From cdb8ca3f97ded53176a7b5a967932335ea0ac6e1 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 23 十月 2024 16:26:02 +0800
Subject: [PATCH] 1

---
 MES.Service/Modes/MesRohInData.cs |  163 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 93 insertions(+), 70 deletions(-)

diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 61ae226..4c09c4c 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -9,6 +9,13 @@
 public class MesRohInData
 {
     /// <summary>
+    ///     涓婚敭
+    ///     榛樿鍊�: (newid())
+    /// </summary>
+    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+    public Guid Guid { get; set; }
+
+    /// <summary>
     ///     閲囪喘鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "BILL_NO")]
@@ -32,7 +39,6 @@
     [SugarColumn(ColumnName = "ITEM_ID")]
     public string? ItemId { get; set; }
 
-
     /// <summary>
     ///     閲囪喘鍗曚綅
     /// </summary>
@@ -51,6 +57,17 @@
     [SugarColumn(ColumnName = "INVENTORY_UNIT")]
     public string? InventoryUnit { get; set; }
 
+    /// <summary>
+    ///     璁′环鍗曚綅
+    /// </summary>
+    [SugarColumn(ColumnName = "PRICING_UNIT")]
+    public string? PricingUnit { get; set; }
+
+    /// <summary>
+    ///     璁′环鏁伴噺
+    /// </summary>
+    [SugarColumn(ColumnName = "PRICING_QTY")]
+    public decimal? PricingQty { get; set; }
 
     /// <summary>
     ///     浜よ揣鏃ユ湡
@@ -113,25 +130,25 @@
     public string? SupplierItemName { get; set; }
 
     /// <summary>
-    ///     濮斿璁㈠崟缂栧彿
+    ///     濮斿璁㈠崟鍙�
     /// </summary>
     [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
     public string? OutsourcingOrderId { get; set; }
 
     /// <summary>
-    ///     鎵瑰彿
+    ///     鎵规鍙�
     /// </summary>
     [SugarColumn(ColumnName = "BATCH_NUMBER")]
     public string? BatchNumber { get; set; }
 
     /// <summary>
-    ///     涓氬姟鍏抽棴  A:姝e父锛孊:涓氬姟缁堟
+    ///     涓氬姟鍏抽棴鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
     public string? BusinessClose { get; set; }
 
     /// <summary>
-    ///     涓氬姟鍐荤粨  A:姝e父锛孊:涓氬姟缁堟
+    ///     涓氬姟鍐荤粨鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
     public string? BusinessFreeze { get; set; }
@@ -149,7 +166,7 @@
     public DateTime? FreezeTime { get; set; }
 
     /// <summary>
-    ///     涓氬姟缁堟
+    ///     涓氬姟缁堟鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
     public string? BusinessTerminate { get; set; }
@@ -167,19 +184,19 @@
     public DateTime? TerminateTime { get; set; }
 
     /// <summary>
-    ///     绱鏀舵枡鏁伴噺
+    ///     鎬诲凡鏀舵暟閲�
     /// </summary>
     [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
     public decimal? TotalReceivedQty { get; set; }
 
     /// <summary>
-    ///     鍓╀綑鏀舵枡鏁伴噺
+    ///     鍓╀綑鏀惰揣鏁伴噺
     /// </summary>
     [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
     public decimal? RemainingReceivedQty { get; set; }
 
     /// <summary>
-    ///     绱鍏ュ簱鏁伴噺
+    ///     鎬诲凡鍏ュ簱鏁伴噺
     /// </summary>
     [SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
     public decimal? TotalStoredQty { get; set; }
@@ -191,31 +208,31 @@
     public decimal? RemainingStoredQty { get; set; }
 
     /// <summary>
-    ///     绱閫�鏂欐暟閲�
+    ///     鎬婚��璐ф暟閲�
     /// </summary>
     [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
     public decimal? TotalReturnedQty { get; set; }
 
     /// <summary>
-    ///     鏀舵枡鍙��鏁伴噺
+    ///     鍙��鏀惰揣鏁伴噺
     /// </summary>
     [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
     public decimal? ReturnableReceivedQty { get; set; }
 
     /// <summary>
-    ///     搴撳瓨鍙��鏁伴噺
+    ///     鍙��鍏ュ簱鏁伴噺
     /// </summary>
     [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
     public decimal? ReturnableStoredQty { get; set; }
 
     /// <summary>
-    ///     婧愬崟绫诲瀷
+    ///     鏉ユ簮鍗曟嵁绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
     public string? SourceDocumentType { get; set; }
 
     /// <summary>
-    ///     婧愬崟鍗曞彿
+    ///     鏉ユ簮鍗曟嵁鍙�
     /// </summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
     public string? SourceDocumentId { get; set; }
@@ -233,7 +250,7 @@
     public string? PlanTrackingId { get; set; }
 
     /// <summary>
-    ///     鍙樻洿鏍囧織
+    ///     鍙樻洿鏍囪瘑
     /// </summary>
     [SugarColumn(ColumnName = "CHANGE_FLAG")]
     public string? ChangeFlag { get; set; }
@@ -245,7 +262,7 @@
     public string? DemandSource { get; set; }
 
     /// <summary>
-    ///     闇�姹傚崟鎹紪鍙�
+    ///     闇�姹傚崟鎹彿
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
     public string? DemandDocumentId { get; set; }
@@ -257,20 +274,49 @@
     public string? DemandDocumentLineId { get; set; }
 
     /// <summary>
-    ///     ERP鐨処D鍙�
+    ///     閲囪喘璁㈠崟琛屽彿锛圞3绯荤粺锛�
     /// </summary>
     [SugarColumn(ColumnName = "EBELN_K3ID")]
     public decimal? EbelnK3id { get; set; }
 
     /// <summary>
-    ///     SEQ_BASEINFO_ID
+    ///     澶囨敞1
     /// </summary>
-    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_BASEINFO_ID",
-        IsPrimaryKey = true)]
-    public decimal Id { get; set; }
+    [SugarColumn(ColumnName = "REMARK1")]
+    public string? Remark1 { get; set; }
 
     /// <summary>
-    ///     ERP澶碔D
+    ///     澶囨敞2
+    /// </summary>
+    [SugarColumn(ColumnName = "REMARK2")]
+    public string? Remark2 { get; set; }
+
+    /// <summary>
+    ///     澶囨敞3
+    /// </summary>
+    [SugarColumn(ColumnName = "REMARK3")]
+    public string? Remark3 { get; set; }
+
+    /// <summary>
+    ///     澶囨敞4
+    /// </summary>
+    [SugarColumn(ColumnName = "REMARK4")]
+    public string? Remark4 { get; set; }
+
+    /// <summary>
+    ///     澶囨敞5
+    /// </summary>
+    [SugarColumn(ColumnName = "REMARK5")]
+    public string? Remark5 { get; set; }
+
+    /// <summary>
+    ///     涓婚敭ID
+    /// </summary>
+    [SugarColumn(ColumnName = "ID")]
+    public long Id { get; set; }
+
+    /// <summary>
+    ///     ERP绯荤粺涓殑ID
     /// </summary>
     [SugarColumn(ColumnName = "ERP_ID")]
     public decimal? ErpId { get; set; }
@@ -278,26 +324,45 @@
     /// <summary>
     ///     閲囪喘璁㈠崟琛屽彿
     /// </summary>
-    [SugarColumn(ColumnName = "purchase_order_line_number")]
+    [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
     public string? PurchaseOrderLineNumber { get; set; }
 
     /// <summary>
-    ///     闇�姹傜粍缁�
+    ///     闇�姹傜粍缁囷紙鎵╁睍锛�
     /// </summary>
     [SugarColumn(ColumnName = "DEMAND")]
     public string? Demand { get; set; }
 
     /// <summary>
-    ///     鏀舵枡缁勭粐
+    ///     鏀舵枡缁勭粐锛堟墿灞曪級
     /// </summary>
     [SugarColumn(ColumnName = "RECEIVING")]
     public string? Receiving { get; set; }
 
     /// <summary>
-    ///     缁撶畻缁勭粐
+    ///     缁撶畻缁勭粐锛堟墿灞曪級
     /// </summary>
     [SugarColumn(ColumnName = "SETTLEMENT")]
     public string? Settlement { get; set; }
+
+    /// <summary>
+    ///     棰勭暀瀛楁CGB014
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "CGB014")]
+    public decimal? Cgb014 { get; set; }
+
+    /// <summary>
+    ///     宸ュ巶
+    /// </summary>
+    [SugarColumn(ColumnName = "FACTORY")]
+    public string? Factory { get; set; }
+
+    /// <summary>
+    ///     鍏徃缂栧彿
+    /// </summary>
+    [SugarColumn(ColumnName = "COMPANY")]
+    public string? Company { get; set; }
 
     /// <summary>
     ///     闇�姹傞儴闂�
@@ -314,48 +379,6 @@
     /// <summary>
     ///     棰勮鍒拌揣鏃堕棿
     /// </summary>
-    [SugarColumn(ColumnName = "FPREARRIVALDATE")]
-    public DateTime? FPREARRIVALDATE { get; set; }
-
-    /// <summary>
-    /// 瀹㈡埛璐у彿
-    /// </summary>
-    [SugarColumn(ColumnName = "REMARK1")]
-    public string? Remark1 { get; set; }
-
-    /// <summary>
-    /// 鍖呰鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "REMARK2")]
-    public string? Remark2 { get; set; }
-
-    /// <summary>
-    /// 涓讳骇鍝�
-    /// </summary>
-    [SugarColumn(ColumnName = "REMARK3")]
-    public string? Remark3 { get; set; }
-
-    /// <summary>
-    /// SMT澶囨敞
-    /// </summary>
-    [SugarColumn(ColumnName = "REMARK4")]
-    public string? Remark4 { get; set; }
-
-    /// <summary>
-    /// 閿�鍞鍗曡鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
-    public string? FdemandbillnoLine { get; set; }
-
-    /// <summary>
-    /// 鐢垫皵鎴愬搧鍨嬪彿
-    /// </summary>
-    [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_MODEL")]
-    public string? ElectricalProductModel { get; set; }
-
-    /// <summary>
-    /// 鐢垫皵鎴愬搧鍚嶇О
-    /// </summary>
-    [SugarColumn(ColumnName = "ELECTRICAL_PRODUCT_NAME")]
-    public string? ElectricalProductName { get; set; }
+    [SugarColumn(ColumnName = "prearrivaldate")]
+    public DateTime? prearrivaldate { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3