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; }
///
- /// 采购订单
+ /// 导入日期
///
- [SugarColumn(ColumnName = "purchase_order")]
- public string PurchaseOrder { get; set; }
+ [SugarColumn(ColumnName = "import_date")]
+ public DateTime? ImportDate { get; set; }
+
+ ///
+ /// 订单号(MES扫描)
+ ///
+ [SugarColumn(ColumnName = "order_no_mes")]
+ public string OrderNoMes { get; set; }
+
+ ///
+ /// 采购订单(ERP)
+ ///
+ [SugarColumn(ColumnName = "purchase_order_erp")]
+ public string PurchaseOrderErp { get; set; }
///
/// Poitem
@@ -29,6 +41,34 @@ namespace DOAN.Model.MES.order
///
public string Variety { get; set; }
+ ///
+ /// 是否非标
+ ///
+ public string Specordindicator { get; set; }
+
+ ///
+ /// 类型
+ ///
+ [SugarColumn(ColumnName = "kd_type")]
+ public string KdType { get; set; }
+
+ ///
+ /// 单据日期
+ ///
+ [SugarColumn(ColumnName = "document_date")]
+ public DateTime? DocumentDate { get; set; }
+
+ ///
+ /// 售达方
+ ///
+ public string Seller { get; set; }
+
+ ///
+ /// 销售地区
+ ///
+ [SugarColumn(ColumnName = "sales_area")]
+ public string SalesArea { get; set; }
+
///
/// 物料
///
@@ -71,6 +111,27 @@ namespace DOAN.Model.MES.order
[SugarColumn(ColumnName = "end_date")]
public DateTime? EndDate { get; set; }
+ ///
+ /// 订单是否完成
+ ///
+ public string Orderindicator { get; set; }
+
+ ///
+ /// 短描述(所属产线)
+ ///
+ [SugarColumn(ColumnName = "route_code")]
+ public string RouteCode { get; set; }
+
+ ///
+ /// 状态
+ ///
+ public int? Status { get; set; }
+
+ ///
+ /// 备注
+ ///
+ public string Remark { get; set; }
+
///
/// 创建人
///