From 4f0cb973a7db26a9e65247033a95d9a8b3380d4b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 17:26:37 +0800
Subject: [PATCH] 基础信息和采购订单接口更新

---
 MES.Service/Modes/MesRohInData.cs |  266 +++++++++++++++++++++++++---------------------------
 1 files changed, 127 insertions(+), 139 deletions(-)

diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index 4c09c4c..62a7b64 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -9,364 +9,346 @@
 public class MesRohInData
 {
     /// <summary>
-    ///     涓婚敭
-    ///     榛樿鍊�: (newid())
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: (newid())
+    ///</summary>
     [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    ///     閲囪喘鍗曞彿
-    /// </summary>
+    /// 閲囪喘鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "BILL_NO")]
     public string? BillNo { get; set; }
 
     /// <summary>
-    ///     閿�鍞鍗曞彿
-    /// </summary>
+    /// 閿�鍞鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "SALES_ORDER_ID")]
     public string? SalesOrderId { get; set; }
 
     /// <summary>
-    ///     閲囪喘璁㈠崟琛屽彿
-    /// </summary>
+    /// 閲囪喘璁㈠崟琛屽彿 
+    ///</summary>
     [SugarColumn(ColumnName = "ORDER_LINE_ID")]
     public string? OrderLineId { get; set; }
 
     /// <summary>
-    ///     鐗╂枡缂栫爜
-    /// </summary>
+    /// 鐗╂枡缂栫爜 
+    ///</summary>
     [SugarColumn(ColumnName = "ITEM_ID")]
     public string? ItemId { get; set; }
 
     /// <summary>
-    ///     閲囪喘鍗曚綅
-    /// </summary>
+    /// 閲囪喘鍗曚綅 
+    ///</summary>
     [SugarColumn(ColumnName = "PURCHASE_UNIT")]
     public string? PurchaseUnit { get; set; }
 
     /// <summary>
-    ///     閲囪喘鏁伴噺
-    /// </summary>
+    /// 閲囪喘鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "PURCHASE_QTY")]
     public decimal? PurchaseQty { get; set; }
 
     /// <summary>
-    ///     搴撳瓨鍗曚綅
-    /// </summary>
+    /// 搴撳瓨鍗曚綅 
+    ///</summary>
     [SugarColumn(ColumnName = "INVENTORY_UNIT")]
     public string? InventoryUnit { get; set; }
 
     /// <summary>
-    ///     璁′环鍗曚綅
-    /// </summary>
+    /// 璁′环鍗曚綅 
+    ///</summary>
     [SugarColumn(ColumnName = "PRICING_UNIT")]
     public string? PricingUnit { get; set; }
 
     /// <summary>
-    ///     璁′环鏁伴噺
-    /// </summary>
+    /// 璁′环鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "PRICING_QTY")]
     public decimal? PricingQty { get; set; }
 
     /// <summary>
-    ///     浜よ揣鏃ユ湡
-    /// </summary>
+    /// 浜よ揣鏃ユ湡 
+    ///</summary>
     [SugarColumn(ColumnName = "DELIVERY_DATE")]
     public DateTime? DeliveryDate { get; set; }
 
     /// <summary>
-    ///     鏈�鏃╀氦璐ф棩鏈�
-    /// </summary>
+    /// 鏈�鏃╀氦璐ф棩鏈� 
+    ///</summary>
     [SugarColumn(ColumnName = "EARLIEST_DELIVERY_DATE")]
     public DateTime? EarliestDeliveryDate { get; set; }
 
     /// <summary>
-    ///     鏈�鏅氫氦璐ф棩鏈�
-    /// </summary>
+    /// 鏈�鏅氫氦璐ф棩鏈� 
+    ///</summary>
     [SugarColumn(ColumnName = "LATEST_DELIVERY_DATE")]
     public DateTime? LatestDeliveryDate { get; set; }
 
     /// <summary>
-    ///     闇�姹傜粍缁�
-    /// </summary>
+    /// 闇�姹傜粍缁� 
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_ORG")]
     public string? DemandOrg { get; set; }
 
     /// <summary>
-    ///     鏀舵枡缁勭粐
-    /// </summary>
+    /// 鏀舵枡缁勭粐 
+    ///</summary>
     [SugarColumn(ColumnName = "RECEIVING_ORG")]
     public string? ReceivingOrg { get; set; }
 
     /// <summary>
-    ///     缁撶畻缁勭粐
-    /// </summary>
+    /// 缁撶畻缁勭粐 
+    ///</summary>
     [SugarColumn(ColumnName = "SETTLEMENT_ORG")]
     public string? SettlementOrg { get; set; }
 
     /// <summary>
-    ///     鏄惁璧犲搧
-    /// </summary>
+    /// 鏄惁璧犲搧 
+    ///</summary>
     [SugarColumn(ColumnName = "IS_GIFT")]
     public string? IsGift { get; set; }
 
     /// <summary>
-    ///     澶囨敞
-    /// </summary>
+    /// 澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARKS")]
     public string? Remarks { get; set; }
 
     /// <summary>
-    ///     渚涘簲鍟嗙墿鏂欑紪鐮�
-    /// </summary>
+    /// 渚涘簲鍟嗙墿鏂欑紪鐮� 
+    ///</summary>
     [SugarColumn(ColumnName = "SUPPLIER_ITEM_CODE")]
     public string? SupplierItemCode { get; set; }
 
     /// <summary>
-    ///     渚涘簲鍟嗙墿鏂欏悕绉�
-    /// </summary>
+    /// 渚涘簲鍟嗙墿鏂欏悕绉� 
+    ///</summary>
     [SugarColumn(ColumnName = "SUPPLIER_ITEM_NAME")]
     public string? SupplierItemName { get; set; }
 
     /// <summary>
-    ///     濮斿璁㈠崟鍙�
-    /// </summary>
+    /// 濮斿璁㈠崟缂栧彿 
+    ///</summary>
     [SugarColumn(ColumnName = "OUTSOURCING_ORDER_ID")]
     public string? OutsourcingOrderId { get; set; }
 
     /// <summary>
-    ///     鎵规鍙�
-    /// </summary>
+    /// 鎵瑰彿 
+    ///</summary>
     [SugarColumn(ColumnName = "BATCH_NUMBER")]
     public string? BatchNumber { get; set; }
 
     /// <summary>
-    ///     涓氬姟鍏抽棴鏍囪瘑
-    /// </summary>
+    /// 涓氬姟鍏抽棴 
+    ///</summary>
     [SugarColumn(ColumnName = "BUSINESS_CLOSE")]
     public string? BusinessClose { get; set; }
 
     /// <summary>
-    ///     涓氬姟鍐荤粨鏍囪瘑
-    /// </summary>
+    /// 涓氬姟鍐荤粨 
+    ///</summary>
     [SugarColumn(ColumnName = "BUSINESS_FREEZE")]
     public string? BusinessFreeze { get; set; }
 
     /// <summary>
-    ///     鍐荤粨浜�
-    /// </summary>
+    /// 鍐荤粨浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "FREEZER")]
     public string? Freezer { get; set; }
 
     /// <summary>
-    ///     鍐荤粨鏃堕棿
-    /// </summary>
+    /// 鍐荤粨鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "FREEZE_TIME")]
     public DateTime? FreezeTime { get; set; }
 
     /// <summary>
-    ///     涓氬姟缁堟鏍囪瘑
-    /// </summary>
+    /// 涓氬姟缁堟 
+    ///</summary>
     [SugarColumn(ColumnName = "BUSINESS_TERMINATE")]
     public string? BusinessTerminate { get; set; }
 
     /// <summary>
-    ///     缁堟浜�
-    /// </summary>
+    /// 缁堟浜� 
+    ///</summary>
     [SugarColumn(ColumnName = "TERMINATOR")]
     public string? Terminator { get; set; }
 
     /// <summary>
-    ///     缁堟鏃堕棿
-    /// </summary>
+    /// 缁堟鏃堕棿 
+    ///</summary>
     [SugarColumn(ColumnName = "TERMINATE_TIME")]
     public DateTime? TerminateTime { get; set; }
 
     /// <summary>
-    ///     鎬诲凡鏀舵暟閲�
-    /// </summary>
+    /// 绱鏀舵枡鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "TOTAL_RECEIVED_QTY")]
     public decimal? TotalReceivedQty { get; set; }
 
     /// <summary>
-    ///     鍓╀綑鏀惰揣鏁伴噺
-    /// </summary>
+    /// 鍓╀綑鏀舵枡鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "REMAINING_RECEIVED_QTY")]
     public decimal? RemainingReceivedQty { get; set; }
 
     /// <summary>
-    ///     鎬诲凡鍏ュ簱鏁伴噺
-    /// </summary>
+    /// 绱鍏ュ簱鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "TOTAL_STORED_QTY")]
     public decimal? TotalStoredQty { get; set; }
 
     /// <summary>
-    ///     鍓╀綑鍏ュ簱鏁伴噺
-    /// </summary>
+    /// 鍓╀綑鍏ュ簱鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "REMAINING_STORED_QTY")]
     public decimal? RemainingStoredQty { get; set; }
 
     /// <summary>
-    ///     鎬婚��璐ф暟閲�
-    /// </summary>
+    /// 绱閫�鏂欐暟閲� 
+    ///</summary>
     [SugarColumn(ColumnName = "TOTAL_RETURNED_QTY")]
     public decimal? TotalReturnedQty { get; set; }
 
     /// <summary>
-    ///     鍙��鏀惰揣鏁伴噺
-    /// </summary>
+    /// 鏀舵枡鍙��鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "RETURNABLE_RECEIVED_QTY")]
     public decimal? ReturnableReceivedQty { get; set; }
 
     /// <summary>
-    ///     鍙��鍏ュ簱鏁伴噺
-    /// </summary>
+    /// 搴撳瓨鍙��鏁伴噺 
+    ///</summary>
     [SugarColumn(ColumnName = "RETURNABLE_STORED_QTY")]
     public decimal? ReturnableStoredQty { get; set; }
 
     /// <summary>
-    ///     鏉ユ簮鍗曟嵁绫诲瀷
-    /// </summary>
+    /// 婧愬崟绫诲瀷 
+    ///</summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_TYPE")]
     public string? SourceDocumentType { get; set; }
 
     /// <summary>
-    ///     鏉ユ簮鍗曟嵁鍙�
-    /// </summary>
+    /// 婧愬崟鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "SOURCE_DOCUMENT_ID")]
     public string? SourceDocumentId { get; set; }
 
     /// <summary>
-    ///     闇�姹傝窡韪彿
-    /// </summary>
+    /// 闇�姹傝窡韪彿 
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_TRACKING_ID")]
     public string? DemandTrackingId { get; set; }
 
     /// <summary>
-    ///     璁″垝璺熻釜鍙�
-    /// </summary>
+    /// 璁″垝璺熻釜鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "PLAN_TRACKING_ID")]
     public string? PlanTrackingId { get; set; }
 
     /// <summary>
-    ///     鍙樻洿鏍囪瘑
-    /// </summary>
+    /// 鍙樻洿鏍囧織 
+    ///</summary>
     [SugarColumn(ColumnName = "CHANGE_FLAG")]
     public string? ChangeFlag { get; set; }
 
     /// <summary>
-    ///     闇�姹傛潵婧�
-    /// </summary>
+    /// 闇�姹傛潵婧� 
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_SOURCE")]
     public string? DemandSource { get; set; }
 
     /// <summary>
-    ///     闇�姹傚崟鎹彿
-    /// </summary>
+    /// 闇�姹傚崟鎹紪鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_DOCUMENT_ID")]
     public string? DemandDocumentId { get; set; }
 
     /// <summary>
-    ///     闇�姹傚崟鎹鍙�
-    /// </summary>
+    /// 闇�姹傚崟鎹鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_DOCUMENT_LINE_ID")]
     public string? DemandDocumentLineId { get; set; }
 
     /// <summary>
-    ///     閲囪喘璁㈠崟琛屽彿锛圞3绯荤粺锛�
-    /// </summary>
+    /// ERP鐨処D鍙� 
+    ///</summary>
     [SugarColumn(ColumnName = "EBELN_K3ID")]
     public decimal? EbelnK3id { get; set; }
 
     /// <summary>
-    ///     澶囨敞1
-    /// </summary>
+    /// 瀹㈡埛璐у彿 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARK1")]
     public string? Remark1 { get; set; }
 
     /// <summary>
-    ///     澶囨敞2
-    /// </summary>
+    /// 鍖呰鍗曞彿 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARK2")]
     public string? Remark2 { get; set; }
 
     /// <summary>
-    ///     澶囨敞3
-    /// </summary>
+    /// 涓讳骇鍝� 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARK3")]
     public string? Remark3 { get; set; }
 
     /// <summary>
-    ///     澶囨敞4
-    /// </summary>
+    /// SMT澶囨敞 
+    ///</summary>
     [SugarColumn(ColumnName = "REMARK4")]
     public string? Remark4 { get; set; }
 
     /// <summary>
-    ///     澶囨敞5
-    /// </summary>
-    [SugarColumn(ColumnName = "REMARK5")]
-    public string? Remark5 { get; set; }
-
-    /// <summary>
-    ///     涓婚敭ID
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "ID")]
-    public long Id { get; set; }
+    public decimal? Id { get; set; }
 
     /// <summary>
-    ///     ERP绯荤粺涓殑ID
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "ERP_ID")]
     public decimal? ErpId { get; set; }
 
     /// <summary>
-    ///     閲囪喘璁㈠崟琛屽彿
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "PURCHASE_ORDER_LINE_NUMBER")]
     public string? PurchaseOrderLineNumber { get; set; }
 
     /// <summary>
-    ///     闇�姹傜粍缁囷紙鎵╁睍锛�
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND")]
     public string? Demand { get; set; }
 
     /// <summary>
-    ///     鏀舵枡缁勭粐锛堟墿灞曪級
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "RECEIVING")]
     public string? Receiving { get; set; }
 
     /// <summary>
-    ///     缁撶畻缁勭粐锛堟墿灞曪級
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "SETTLEMENT")]
     public string? Settlement { get; set; }
 
     /// <summary>
-    ///     棰勭暀瀛楁CGB014
-    ///     榛樿鍊�: ((0))
-    /// </summary>
+    ///  
+    /// 榛樿鍊�: ((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>
-    ///     闇�姹傞儴闂�
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
     public string? DemandDepartment { get; set; }
 
@@ -377,8 +359,14 @@
     public string? ReceivingDepartment { get; set; }
 
     /// <summary>
-    ///     棰勮鍒拌揣鏃堕棿
-    /// </summary>
-    [SugarColumn(ColumnName = "prearrivaldate")]
-    public DateTime? prearrivaldate { get; set; }
+    ///  
+    ///</summary>
+    [SugarColumn(ColumnName = "FPREARRIVALDATE")]
+    public DateTime? Fprearrivaldate { get; set; }
+
+    /// <summary>
+    ///  
+    ///</summary>
+    [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
+    public string? FdemandbillnoLine { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.3