From 4c94e6f74329c023b54577a07e6a63d92450c2a5 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 17 Feb 2025 14:20:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=952?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs | 29 ++++++++-
 DOAN.Model/MES/Order/OrderPurchase.cs        | 67 +++++++++++++++++++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs b/DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs
index 6bd075c..4b605c7 100644
--- a/DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs
+++ b/DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs
@@ -16,12 +16,26 @@ namespace DOAN.Model.MES.order.Dto
         [Required(ErrorMessage = "雪花id不能为空")]
         public string Id { get; set; }
 
-        public string PurchaseOrder { get; set; }
+        public DateTime? ImportDate { get; set; }
+
+        public string OrderNoMes { get; set; }
+
+        public string PurchaseOrderErp { get; set; }
 
         public string Poitem { get; set; }
 
         public string Variety { get; set; }
 
+        public string Specordindicator { get; set; }
+
+        public string KdType { get; set; }
+
+        public DateTime? DocumentDate { get; set; }
+
+        public string Seller { get; set; }
+
+        public string SalesArea { get; set; }
+
         public string MaterialName { get; set; }
 
         public string MaterialCode { get; set; }
@@ -36,6 +50,14 @@ namespace DOAN.Model.MES.order.Dto
 
         public DateTime? EndDate { get; set; }
 
+        public string Orderindicator { get; set; }
+
+        public string RouteCode { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
         public string CreatedBy { get; set; }
 
         public DateTime? CreatedTime { get; set; }
@@ -46,5 +68,10 @@ namespace DOAN.Model.MES.order.Dto
 
 
 
+        [ExcelColumn(Name = "类型")]
+        public string KdTypeLabel { get; set; }
+
+
+
     }
 }
\ No newline at end of file
diff --git a/DOAN.Model/MES/Order/OrderPurchase.cs b/DOAN.Model/MES/Order/OrderPurchase.cs
index 1a5f64b..e6bd451 100644
--- a/DOAN.Model/MES/Order/OrderPurchase.cs
+++ b/DOAN.Model/MES/Order/OrderPurchase.cs
@@ -14,10 +14,22 @@ namespace DOAN.Model.MES.order
         public string Id { get; set; }
 
         /// <summary>
-        /// 采购订单 
+        /// 导入日期 
         /// </summary>
-        [SugarColumn(ColumnName = "purchase_order")]
-        public string PurchaseOrder { get; set; }
+        [SugarColumn(ColumnName = "import_date")]
+        public DateTime? ImportDate { get; set; }
+
+        /// <summary>
+        /// 订单号（MES扫描） 
+        /// </summary>
+        [SugarColumn(ColumnName = "order_no_mes")]
+        public string OrderNoMes { get; set; }
+
+        /// <summary>
+        /// 采购订单(ERP) 
+        /// </summary>
+        [SugarColumn(ColumnName = "purchase_order_erp")]
+        public string PurchaseOrderErp { get; set; }
 
         /// <summary>
         /// Poitem 
@@ -29,6 +41,34 @@ namespace DOAN.Model.MES.order
         /// </summary>
         public string Variety { get; set; }
 
+        /// <summary>
+        /// 是否非标 
+        /// </summary>
+        public string Specordindicator { get; set; }
+
+        /// <summary>
+        /// 类型 
+        /// </summary>
+        [SugarColumn(ColumnName = "kd_type")]
+        public string KdType { get; set; }
+
+        /// <summary>
+        /// 单据日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "document_date")]
+        public DateTime? DocumentDate { get; set; }
+
+        /// <summary>
+        /// 售达方 
+        /// </summary>
+        public string Seller { get; set; }
+
+        /// <summary>
+        /// 销售地区 
+        /// </summary>
+        [SugarColumn(ColumnName = "sales_area")]
+        public string SalesArea { get; set; }
+
         /// <summary>
         /// 物料 
         /// </summary>
@@ -71,6 +111,27 @@ namespace DOAN.Model.MES.order
         [SugarColumn(ColumnName = "end_date")]
         public DateTime? EndDate { get; set; }
 
+        /// <summary>
+        /// 订单是否完成 
+        /// </summary>
+        public string Orderindicator { get; set; }
+
+        /// <summary>
+        /// 短描述（所属产线) 
+        /// </summary>
+        [SugarColumn(ColumnName = "route_code")]
+        public string RouteCode { get; set; }
+
+        /// <summary>
+        /// 状态 
+        /// </summary>
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 备注 
+        /// </summary>
+        public string Remark { get; set; }
+
         /// <summary>
         /// 创建人 
         /// </summary>