commit by yzf

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);

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();