From bb6dfe5a4061392aca3fb9707c782dfb3e64bfe9 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Fri, 28 Apr 2023 20:33:20 +0800
Subject: [PATCH] commit by yzf

---
 FactorySystemBll/MaterialTeamworkBll.cs |  5 +++--
 FactorySystemBll/MaterialTypeBll.cs     |  8 ++++++++
 FactorySystemBll/ViewBll.cs             | 16 ++++++++++------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/FactorySystemBll/MaterialTeamworkBll.cs b/FactorySystemBll/MaterialTeamworkBll.cs
index 03efb97..87bc776 100644
--- a/FactorySystemBll/MaterialTeamworkBll.cs
+++ b/FactorySystemBll/MaterialTeamworkBll.cs
@@ -188,7 +188,7 @@ namespace FactorySystemBll
 
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
             MaterialBll materialBll = new MaterialBll();
-
+            MaterialTypeBll materialTypeBll = new MaterialTypeBll();
             if (viewList != null && viewList.Count > 0)
             {
                 for(int i = 0; i < viewList.Count; i++)
@@ -210,10 +210,11 @@ namespace FactorySystemBll
 
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID1"].ToString())).LastOrDefault();
+                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
                     if (material.FType == "30")
                     {
+                        TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
                         TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
                         if (material2.FName.Contains("香基"))
                         {
diff --git a/FactorySystemBll/MaterialTypeBll.cs b/FactorySystemBll/MaterialTypeBll.cs
index 0077561..872c2bc 100644
--- a/FactorySystemBll/MaterialTypeBll.cs
+++ b/FactorySystemBll/MaterialTypeBll.cs
@@ -70,5 +70,13 @@ namespace FactorySystemBll
             temp.FID = db.Insertable(temp).ExecuteReturnIdentity();
             return temp;
         }
+
+        public List<TFS_MaterialType> GetMaterialTypeByID(int id)
+        {
+            return AppSettingsHelper.GetSqlSugar()
+                .Queryable<TFS_MaterialType>()
+                .Where(a=>a.FID==id).ToList();
+        }
+
     }
 }
\ No newline at end of file
diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index 4a1c727..45cdbb8 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -499,6 +499,7 @@ namespace FactorySystemBll
             int result = 0;
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
             MaterialBll materialBll = new MaterialBll();
+            MaterialTypeBll materialTypeBll = new MaterialTypeBll();
             if (viewList != null && viewList.Count > 0)
             {
                 string sqlWhere = string.Format("FViewType={0} and FTeamID={1}", viewType, teamId);
@@ -510,10 +511,11 @@ namespace FactorySystemBll
 
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID1"].ToString())).LastOrDefault();
+                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
                     if (material.FType == "30")
                     {
+                        TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
                         TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
                         if (material2.FName.Contains("香基"))
                         {
@@ -687,6 +689,7 @@ namespace FactorySystemBll
             int result = 0;
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
             MaterialBll materialBll = new MaterialBll();
+            MaterialTypeBll materialTypeBll = new MaterialTypeBll();
 
             if (viewList != null && viewList.Count > 0)
             {
@@ -699,23 +702,24 @@ namespace FactorySystemBll
                 }
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID1"].ToString())).LastOrDefault();
+                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
                     if (material.FType == "30")
                     {
+                        TFS_MaterialType materialType = materialTypeBll.GetMaterialTypeByID(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
                         TFS_Material material2 = materialBll.GetMaterial(int.Parse(viewList[i]["FTypeID2"].ToString())).LastOrDefault();
-                        if (material2.FName.Contains("香基")) 
+                        if (material2.FName.Contains("香基"))
                         {
-                            if (viewList[i].ContainsKey("FViewType")) 
+                            if (viewList[i].ContainsKey("FViewType"))
                             {
                                 viewList[i]["FViewType"] = (int)Constant.ViewType.香基视图;
                             }
-                            else 
+                            else
                             {
                                 viewList[i].Add("FViewType", (int)Constant.ViewType.香基视图);
                             }
                         }
-                        else 
+                        else
                         {
                             if (viewList[i].ContainsKey("FViewType"))
                             {