From c6936453bae6d22eaf81cbc8090aec7337aa68d4 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 10 Dec 2024 15:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs |  5 +
 DOAN.Model/MES/Product/ProReportwork01.cs     | 92 -------------------
 DOAN.Model/MES/Product/ProWorkorder.cs        |  7 ++
 3 files changed, 12 insertions(+), 92 deletions(-)
 delete mode 100644 DOAN.Model/MES/Product/ProReportwork01.cs

diff --git a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
index 730724d..8dc9614 100644
--- a/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
+++ b/DOAN.Model/MES/Product/Dto/ProWorkorderDto.cs
@@ -79,6 +79,11 @@ namespace DOAN.Model.MES.product.Dto
 
         public string GroupCode { get; set; }
 
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNumber { get; set; }
+
         public string Remark01 { get; set; }
 
         public string Remark02 { get; set; }
diff --git a/DOAN.Model/MES/Product/ProReportwork01.cs b/DOAN.Model/MES/Product/ProReportwork01.cs
deleted file mode 100644
index 6feb309..0000000
--- a/DOAN.Model/MES/Product/ProReportwork01.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-
-namespace DOAN.Model.MES.product
-{
-    /// <summary>
-    /// 报工
-    /// </summary>
-    [SugarTable("pro_reportwork")]
-    public class ProReportwork01
-    {
-        /// <summary>
-        /// 雪花 
-        /// </summary>
-        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
-        public string Id { get; set; }
-
-        /// <summary>
-        /// 工单code 
-        /// </summary>
-        public string Workorder { get; set; }
-
-        /// <summary>
-        /// 路线code 
-        /// </summary>
-        [SugarColumn(ColumnName = "route_code")]
-        public string RouteCode { get; set; }
-
-        /// <summary>
-        /// 工序id 
-        /// </summary>
-        [SugarColumn(ColumnName = "process_id")]
-        public int ProcessId { get; set; }
-
-        /// <summary>
-        /// 计划数量 
-        /// </summary>
-        [SugarColumn(ColumnName = "plan_num")]
-        public int? PlanNum { get; set; }
-
-        /// <summary>
-        /// 完成数量 
-        /// </summary>
-        [SugarColumn(ColumnName = "finish_num")]
-        public int? FinishNum { get; set; }
-
-        /// <summary>
-        /// 不良数量 
-        /// </summary>
-        [SugarColumn(ColumnName = "bad_num")]
-        public int? BadNum { get; set; }
-
-        /// <summary>
-        /// 作业员 
-        /// </summary>
-        public string Worker { get; set; }
-
-        /// <summary>
-        /// 作业日期 
-        /// </summary>
-        [SugarColumn(ColumnName = "job_date")]
-        public DateTime? JobDate { get; set; }
-
-        /// <summary>
-        /// 备注 
-        /// </summary>
-        public string Remark { get; set; }
-
-        /// <summary>
-        /// 创建人 
-        /// </summary>
-        [SugarColumn(ColumnName = "cREATED_BY")]
-        public string CreatedBy { get; set; }
-
-        /// <summary>
-        /// 创建时间 
-        /// </summary>
-        [SugarColumn(ColumnName = "cREATED_TIME")]
-        public DateTime? CreatedTime { get; set; }
-
-        /// <summary>
-        /// 更新人 
-        /// </summary>
-        [SugarColumn(ColumnName = "uPDATED_BY")]
-        public string UpdatedBy { get; set; }
-
-        /// <summary>
-        /// 更新时间 
-        /// </summary>
-        [SugarColumn(ColumnName = "uPDATED_TIME")]
-        public DateTime? UpdatedTime { get; set; }
-
-    }
-}
\ No newline at end of file
diff --git a/DOAN.Model/MES/Product/ProWorkorder.cs b/DOAN.Model/MES/Product/ProWorkorder.cs
index 74dda31..f40d881 100644
--- a/DOAN.Model/MES/Product/ProWorkorder.cs
+++ b/DOAN.Model/MES/Product/ProWorkorder.cs
@@ -126,6 +126,13 @@ namespace DOAN.Model.MES.product
         [SugarColumn(ColumnName = "group_code")]
         public string GroupCode { get; set; }
 
+        
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        [SugarColumn(ColumnName = "ordernumber")]
+        public string OrderNumber { get; set; }
+
         /// <summary>
         /// 备注 
         /// </summary>