From 3d536481dc53ef9b263263fa3e680972d87b9c53 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Mon, 8 May 2023 23:44:20 +0800
Subject: [PATCH] commit by yzf

---
 .../Controllers/HalfMaterialTeamworkController.cs     | 11 ++++++++---
 FactorySystemBll/ViewBll.cs                           |  9 ++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
index 45250ba..0272a3d 100644
--- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
+++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs
@@ -288,7 +288,7 @@ namespace FactorySystemApi.Controllers
 
                                 //开始BOM下载
                                 int dow = DockGetBomData(teamwork.FID, user.FID);
-                                if (dow > 0 || editMaterialList.Count() > 0)
+                                if (dow > 0)
                                 {
                                     MaterialTeamworkBll.HasMaterialTestCode(teamwork);
                                     BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项
@@ -296,8 +296,13 @@ namespace FactorySystemApi.Controllers
                                 }
                                 else
                                 {
-                                    BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
-                                    apiResult.Error("未能找到物料");
+
+                                    BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
+                                    BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.BOM下载, 1, 1);
+                                    //BaseBll.DeleteDataById(teamId, "TFS_HalfMaterialFTeamwork", true);
+
+                                    //apiResult.Error("未能找到物料");
+
                                     //BaseBll.CreateTaskData2(teamId, user.FID, ((int)Constant.HalfMaterialTask.BOM下载).ToString());
                                     //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialTask.物料分类, 1, 1);
                                 }
diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index 94d04aa..4f70593 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -772,9 +772,10 @@ namespace FactorySystemBll
                                 break;
                         }
                     }
+                    result += db.Updateable(viewList[i]).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
                 }
 
-                result += db.Updateable(viewList).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand();
+                
 
                 result += HalfMaterialUnionModifyData(viewList, "TFS_ViewMaterial", teamId, db, "FMaterialID");
             }
@@ -795,11 +796,12 @@ namespace FactorySystemBll
                             materialList[i].Add("FK3ShortCode", k3Code.ToString().Split('.').Last());
                         }
                     }
+                    result += db.Updateable(materialList[i]).AS("TFS_Material").WhereColumns("FID").ExecuteCommand();
                 }
 
 
 
-                result += db.Updateable(materialList).AS("TFS_Material").WhereColumns("FID").ExecuteCommand();
+               
                 result += HalfMaterialUnionModifyData(materialList, "TFS_Material", teamId, db);
             }
             if (infoList != null && infoList.Count > 0)
@@ -810,8 +812,9 @@ namespace FactorySystemBll
                     infoList[i].Remove("FMaterialID");
                     infoList[i].Add("FType", 2);
                     infoList[i].Add("FType2", int.Parse(materialList[i]["FTypeID2"].ToString()));
+                    result += db.Updateable(infoList[i]).AS("TFS_MaterialInfo").WhereColumns("FType", "FDataID").ExecuteCommand();
                 }
-                result += db.Updateable(infoList).AS("TFS_MaterialInfo").WhereColumns("FType", "FDataID").ExecuteCommand();
+                
                 result += UnionModifyData(infoList, "TFS_MaterialInfo", teamId, db, "FDataID");
             }
             //result += CheckTaskComplete2(db, teamId, viewType, userId);