From 8136e95a5daf29c57bcf09e96e877323e7a1fd85 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Mon, 26 Aug 2024 17:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huate_group/Recipe/RecipeService.cs       | 30 +++++++++++++++++++
 .../WebExtensions/EntityExtension.cs          |  3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/DOAN.Service/huate_group/Recipe/RecipeService.cs b/DOAN.Service/huate_group/Recipe/RecipeService.cs
index f8b7169..d60aa5e 100644
--- a/DOAN.Service/huate_group/Recipe/RecipeService.cs
+++ b/DOAN.Service/huate_group/Recipe/RecipeService.cs
@@ -54,6 +54,36 @@ namespace DOAN.Service.huate_group.Recipe
         /// <returns></returns>
         public Recipee AddRecipe(Recipee model)
         {
+            // 根据设备id 填充  company  workshop  line
+            BaseDeviceAccount account = Context.Queryable<BaseDeviceAccount>().Where(x => x.Id == model.FkDeviceId).First();
+            model.DeviceName = account.DeviceName;
+            if (account != null)
+            {
+                BaseProductionLine line = Context.Queryable<BaseProductionLine>()
+                    .Where(it => it.Id == account.FkLineId).First();
+                if (line != null)
+                {
+                    model.FkLineId = line.Id;
+                    model.ProductlineName = line.LineName;
+                    BaseWorkshop baseWorkshop = Context.Queryable<BaseWorkshop>().Where(it => it.Id == line.FkWorkshopId).First();
+                    if (baseWorkshop != null)
+                    {
+                        model.FkWorkshopId = baseWorkshop.Id;
+                        model.WorkshopName = baseWorkshop.WorkshopName;
+                        BaseCompany company = Context.Queryable<BaseCompany>().Where(it => it.Id == baseWorkshop.FkCompanyId).First();
+                        if (company != null)
+                        {
+                            model.FkCompanyId = company.Id;
+                            model.CompanyName = company.CompanyName;
+
+                        }
+                    }
+                }
+
+
+
+            }
+
             return Insertable(model).ExecuteReturnEntity();
         }
 
diff --git a/Infrastructure/WebExtensions/EntityExtension.cs b/Infrastructure/WebExtensions/EntityExtension.cs
index 66ed7f5..17e983c 100644
--- a/Infrastructure/WebExtensions/EntityExtension.cs
+++ b/Infrastructure/WebExtensions/EntityExtension.cs
@@ -13,11 +13,12 @@ namespace Infrastructure
             var types = source?.GetType();
             if (types == null || context == null) return source;
             BindingFlags flag = BindingFlags.Public | BindingFlags.IgnoreCase | BindingFlags.Instance;
-
             types.GetProperty("CreateTime", flag)?.SetValue(source, DateTime.Now, null);
             types.GetProperty("CREATED_TIME", flag)?.SetValue(source, DateTime.Now, null);
+            types.GetProperty("CreatedTime", flag)?.SetValue(source, DateTime.Now, null);
             types.GetProperty("AddTime", flag)?.SetValue(source, DateTime.Now, null);
             types.GetProperty("CreateBy", flag)?.SetValue(source, context.GetName(), null); 
+            types.GetProperty("CreatedBy", flag)?.SetValue(source, context.GetName(), null);
             types.GetProperty("CREATED_BY", flag)?.SetValue(source, context.GetName(), null); 
             types.GetProperty("Create_by", flag)?.SetValue(source, context.GetName(), null);
             //types.GetProperty("UserId", flag)?.SetValue(source, context.GetUId(), null);