From 942f38826f6e46c7dc5cf475780e0adf801ae3d9 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Fri, 28 Apr 2023 21:14:41 +0800
Subject: [PATCH] commit by yzf

---
 FactorySystemBll/MaterialTeamworkBll.cs |  7 ++-----
 FactorySystemBll/ViewBll.cs             | 13 ++++---------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/FactorySystemBll/MaterialTeamworkBll.cs b/FactorySystemBll/MaterialTeamworkBll.cs
index 87bc776..48c7f3a 100644
--- a/FactorySystemBll/MaterialTeamworkBll.cs
+++ b/FactorySystemBll/MaterialTeamworkBll.cs
@@ -187,7 +187,6 @@ namespace FactorySystemBll
             int result = 0;
 
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
-            MaterialBll materialBll = new MaterialBll();
             MaterialTypeBll materialTypeBll = new MaterialTypeBll();
             if (viewList != null && viewList.Count > 0)
             {
@@ -210,13 +209,11 @@ namespace FactorySystemBll
 
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
-                    if (material.FType == "30")
+                    if (viewList[i]["FMRP1Type"].ToString() == "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 (materialType.FName.Contains("香基"))
                         {
                             if (viewList[i].ContainsKey("FViewType"))
                             {
diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index 45cdbb8..54f1661 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -498,7 +498,6 @@ namespace FactorySystemBll
         {
             int result = 0;
             SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
-            MaterialBll materialBll = new MaterialBll();
             MaterialTypeBll materialTypeBll = new MaterialTypeBll();
             if (viewList != null && viewList.Count > 0)
             {
@@ -511,13 +510,11 @@ namespace FactorySystemBll
 
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
-                    if (material.FType == "30")
+                    if (viewList[i]["FMRP1Type"].ToString() == "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 (materialType.FName.Contains("香基"))
                         {
                             if (viewList[i].ContainsKey("FViewType"))
                             {
@@ -702,13 +699,11 @@ namespace FactorySystemBll
                 }
                 for (int i = 0; i < viewList.Count; i++)
                 {
-                    TFS_Material material = materialBll.GetMaterial(int.Parse(viewList[i]["FMaterialID"].ToString())).LastOrDefault();
                     //判断是否等于中间品
-                    if (material.FType == "30")
+                    if (viewList[i]["FMRP1Type"].ToString() == "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 (materialType.FName.Contains("香基"))
                         {
                             if (viewList[i].ContainsKey("FViewType"))
                             {