From d00bae09d4c2fd9acf4cdf1d7fea6f507010cceb Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 16 Apr 2023 01:59:43 +0800
Subject: [PATCH] commit by yzf

---
 FactorySystemApi/Controllers/ViewController.cs | 2 ++
 FactorySystemBll/ViewBll.cs                    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/FactorySystemApi/Controllers/ViewController.cs b/FactorySystemApi/Controllers/ViewController.cs
index 7e524ff..ca7e973 100644
--- a/FactorySystemApi/Controllers/ViewController.cs
+++ b/FactorySystemApi/Controllers/ViewController.cs
@@ -149,6 +149,7 @@ 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");
@@ -169,6 +170,7 @@ 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);
                     }
                 }
             }, apiResult, Request);
diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs
index 5231dc3..cb3b502 100644
--- a/FactorySystemBll/ViewBll.cs
+++ b/FactorySystemBll/ViewBll.cs
@@ -39,7 +39,7 @@ namespace FactorySystemBll
                     new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID))
                    .Where((a, b) => a.FTeamID == teamId)
                    .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID)
-                   .WhereIF(viewType > 0, (a, b) => a.FViewType == 2 || a.FViewType == 3 || a.FViewType == 4 || a.FViewType == 5)
+                   .WhereIF(viewType > 0, (a, b) => a.FViewType == 2 || a.FViewType == 3 || a.FViewType == 4 || a.FViewType == 5||a.FViewType==10)
                    .Select<object>("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," +
                    "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," +
                    "b.FQualityTest1,b.FQualityTest2").ToDictionaryList();