commit by yzf

FactorySystemApi/Controllers/ViewController.cs

@@ -11,6 +11,7 @@ using FactorySystemModel.EnumModel;
 using Aspose.Cells;
 using System.Globalization;
 using System.Linq;
+using SqlSugar;
 
 namespace FactorySystemApi.Controllers
 {
@@ -215,7 +216,9 @@ namespace FactorySystemApi.Controllers
                             TeamworkBll TeamworkBll = new TeamworkBll();
                             TeamworkBll.CreateMaterialTask(hasNewView, teamwork, user.FID);
                         }
-                        BaseBll.CreateTaskData(teamId, user.FID, "16");
+
+                        
+                       
 
                         //补充包材规格
                         BaseBll.CreateTaskData(teamId, user.FID, "14");
@@ -236,7 +239,14 @@ namespace FactorySystemApi.Controllers
                         }
                         BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.协同发起, 3, 2);
                         BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.成品视图, 2, 1);
-                        BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.替代品确认, 2, 1);
+
+                        SqlSugarClient db = AppSettingsHelper.GetSqlSugar();
+                        List<TFS_Material> tFS_Materials= db.Queryable<TFS_Material>().Where(m => m.FTestCode == teamwork.FTestCode).ToList();
+                        if (tFS_Materials.Count() == 0) 
+                        {
+                            BaseBll.CreateTaskData(teamId, user.FID, "16");
+                            BaseBll.UpdateTeamProcess(teamwork.FID, (int)Constant.ProcessType.替代品确认, 2, 1);
+                        }
                     }
                 }
             }, apiResult, Request);

FactorySystemBll/TeamworkBll.cs

@@ -112,9 +112,13 @@ namespace FactorySystemBll
                 List<TFS_FTeamProcess> taskList = new List<TFS_FTeamProcess>();
                 TFS_FTeamwork teamwork = BaseBll.GetTempModel<TFS_FTeamwork>(teamId);
 
-
+                List<TFS_Material> tFS_Materials = db.Queryable<TFS_Material>().Where(m => m.FTestCode == teamwork.FTestCode).ToList();
                 foreach (var item in typeList)
                 {
+                    if (tFS_Materials.Count() > 0 && item.FName.Equals("替代品确认")) 
+                    {
+                        continue;
+                    }
                     TFS_FTeamProcess process = new TFS_FTeamProcess()
                     {
                         FState = 0,//默认未开始