From 6cc576e43ef1223f1c54a4f4f48cd3e66c2860dc Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 3 Dec 2024 16:41:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/Base/BaseWorkRoute.cs          | 7 +++++--
 DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs   | 4 ++++
 DOAN.Service/MES/Base/BaseWorkRouteService.cs | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/DOAN.Model/MES/Base/BaseWorkRoute.cs b/DOAN.Model/MES/Base/BaseWorkRoute.cs
index 328d069..33fab2e 100644
--- a/DOAN.Model/MES/Base/BaseWorkRoute.cs
+++ b/DOAN.Model/MES/Base/BaseWorkRoute.cs
@@ -18,11 +18,14 @@ namespace DOAN.Model.MES.base_
         /// 名称
         /// </summary>
         public string Name { get; set; }
+        
+        public string Code { get; set; }
 
         /// <summary>
-        /// 编号
+        /// 产成品编号
         /// </summary>
-        public string Code { get; set; }
+        [SugarColumn(ColumnName = "production_code")]
+        public string  ProductionCode{ get; set; }
 
         [SugarColumn(IsIgnore =true)]
         public List<BaseWorkProcessesDto3> BaseWorkProcessesList { get; set; }
diff --git a/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs b/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs
index 1b4f2c8..2ea5c8c 100644
--- a/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs
+++ b/DOAN.Model/MES/Base/Dto/BaseWorkRouteDto.cs
@@ -12,6 +12,8 @@ namespace DOAN.Model.MES.base_.Dto
         public string Code { get; set; }
 
         public int? Status { get; set; }
+        
+        public string  ProductionCode{ get; set; }
     }
 
     /// <summary>
@@ -25,6 +27,8 @@ namespace DOAN.Model.MES.base_.Dto
         public string Name { get; set; }
 
         public string Code { get; set; }
+        
+        public string  ProductionCode{ get; set; }
 
         public string LogicFlowData { get; set; }
 
diff --git a/DOAN.Service/MES/Base/BaseWorkRouteService.cs b/DOAN.Service/MES/Base/BaseWorkRouteService.cs
index 8eca54c..9907a80 100644
--- a/DOAN.Service/MES/Base/BaseWorkRouteService.cs
+++ b/DOAN.Service/MES/Base/BaseWorkRouteService.cs
@@ -38,6 +38,7 @@ namespace DOAN.Service.MES.base_
                 .Create<BaseWorkRoute>()
                 .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
                 .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
+                .AndIF(!string.IsNullOrEmpty(parm.ProductionCode), it => it.Code.Contains(parm.ProductionCode))
                 .AndIF(parm.Status > -1, it => it.Status == parm.Status);
             var response = Queryable()
                 .Where(predicate.ToExpression())