完善订单查询，导出功能，完善工单查询功能

DOAN.Model/MES/Order/Dto/OrderPurchaseDto.cs

@@ -6,16 +6,39 @@ namespace DOAN.Model.MES.order.Dto
     /// </summary>
     public class OrderPurchaseQueryDto : PagerInfo 
     {
+        /// <summary>
+        /// 导入日期
+        /// </summary>
         public DateTime[] ImportDate { get; set; }
-
+        /// <summary>
+        /// 订单号（MES实际使用）
+        /// </summary>
         public string OrderNoMes { get; set; }
-
+        /// <summary>
+        /// 采购订单号（对接ERP）
+        /// </summary>
         public string PurchaseOrderErp { get; set; }
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string WorkOrder { get; set; }
+        /// <summary>
+        /// 领料单号
+        /// </summary>
+        public string FeedOrder { get; set; }
 
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string MaterialCode { get; set; }
         /// <summary>
         /// 是否完成订单
         /// </summary>
         public  int Orderindicator { get; set; }
+        /// <summary>
+        /// 是否非标
+        /// </summary>
+        public int Specordindicator { get; set; }
     }
 
     /// <summary>
@@ -76,12 +99,38 @@ namespace DOAN.Model.MES.order.Dto
 
         public DateTime? UpdatedTime { get; set; }
 
+    }
 
-
-        [ExcelColumn(Name = "类型")]
-        public string KdTypeLabel { get; set; }
-
-
-
+    /// <summary>
+    /// 采购订单导出对象
+    /// </summary>
+    public class OrderPurchaseExcelDto
+    {
+        [ExcelColumnName("系统编号（id）")]
+        public string Id { get; set; }
+        [ExcelColumnName("导入时间（import_date）")]
+        public DateTime? ImportDate { get; set; }
+        [ExcelColumnName("订单号（order_no_mes）")]
+        public string OrderNoMes { get; set; }
+        [ExcelColumnName("物料名称")]
+        public string MaterialName { get; set; }
+        [ExcelColumnName("物料编号")]
+        public string MaterialCode { get; set; }
+        [ExcelColumnName("交货日期（delivery_date）")]
+        public DateTime? DocumentDate { get; set; }
+        [ExcelColumnName("需求数量（demand_quantity）")]
+        public int? DemandQuantity { get; set; }
+        [ExcelColumnName("交货日期（delivery_date）")]
+        public DateTime? DeliveryDate { get; set; }
+        [ExcelColumnName("交货数量（delivery_quantity）")]
+        public int? DeliveryQuantity { get; set; }
+        [ExcelColumnName("订单开始时间（start_date）")]
+        public DateTime? StartDate { get; set; }
+        [ExcelColumnName("订单结束时间（end_date）")]
+        public DateTime? EndDate { get; set; }
+        [ExcelColumnName("订单是否完成（0-未完成/1-完成）")]
+        public int Orderindicator { get; set; }
+        [ExcelColumnName("备注")]
+        public string Remark { get; set; }
     }
 }

DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs

@@ -16,6 +16,16 @@ namespace DOAN.Model.MES.product.Dto
         public string RouteCode { get; set; }
         public string GroupCode { get; set; }
 
+        /// <summary>
+        /// 进料单号（领料）
+        /// </summary>
+        public string FeedOrder { get; set; }
+
+        /// <summary>
+        /// 客户单号（出货）
+        /// </summary>
+        public string CustomerOrder { get; set; }
+
         public int Status { get; set; }
 
         public DateTime[] WorkorderDate { get; set; } = new DateTime[2];