From 59bf61e6015fa0c3d005580f7c2c64d14a1e430b Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Thu, 18 May 2023 22:15:50 +0800 Subject: [PATCH] commit by yzf --- .../Controllers/HalfMaterialTeamworkController.cs | 13 +++++++++---- FactorySystemBll/HalfMaterialTaskBll.cs | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs index 203827e..dab90f4 100644 --- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs @@ -251,7 +251,7 @@ namespace FactorySystemApi.Controllers //创建 TFS_FTeamwork int teamId = BaseBll.InsertDataModel(inParam, "TFS_HalfMaterialFTeamwork"); - + TFS_Material tFS_Material = BaseBll.GetTempModel(string.Format("FTestCode='{0}'", inParam["FNewTestCode"].ToString())); List editMaterialList = MaterialTeamworkBll.UpdateFormula(inParam["FTestCode"].ToString(), inParam["FNewTestCode"].ToString(), teamId, factory); ids = editMaterialList.Select(m => m.FID).Distinct().ToList(); @@ -272,7 +272,7 @@ namespace FactorySystemApi.Controllers //TeamworkBll TeamworkBll = new TeamworkBll(); //List materialList = TeamworkBll.CheckMaterialListByTest(teamwork.FNewTestCode, teamwork.FNewVersionCode); - TFS_Material tFS_Material = BaseBll.GetTempModel(string.Format("FTestCode='{0}'", teamwork.FNewTestCode)); + if (tFS_Material == null) { @@ -305,6 +305,11 @@ namespace FactorySystemApi.Controllers apiResult.Error("未能找到物料"); } + else + { + BaseBll.CreateTaskData2(teamwork.FID, user.FID, "1"); //新增物料分类事项 + BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程 + } } @@ -728,8 +733,8 @@ namespace FactorySystemApi.Controllers * 在创建各类事项前，先创建物料分类事项 * 此处创建各类事项流程中断，转移至物料分类事项提交后进行 * **/ - //BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项 - //BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程 + BaseBll.CreateTaskData2(teamwork.FID, userId, "1"); //新增物料分类事项 + BaseBll.UpdateTeamProcess2(teamId, (int)Constant.HalfMaterialProcessType.物料分类, 2, 1); // 更新物料分类流程 HalfMaterialTaskBll halfMaterialTaskBll = new HalfMaterialTaskBll(); halfMaterialTaskBll.CloseHalfMaterialTask(teamId, userId, (int)Constant.HalfMaterialProcessType.BOM下载); diff --git a/FactorySystemBll/HalfMaterialTaskBll.cs b/FactorySystemBll/HalfMaterialTaskBll.cs index 60c17d9..2370037 100644 --- a/FactorySystemBll/HalfMaterialTaskBll.cs +++ b/FactorySystemBll/HalfMaterialTaskBll.cs @@ -38,7 +38,7 @@ namespace FactorySystemBll .WhereIF(tq.FUserID != null, a => (',' + a.FUserID + ',').Contains(',' + tq.FUserID + ',')) // 协同 .WhereIF(tq.FTeamID > 0, a => a.FTeamID == tq.FTeamID).OrderBy((a, b, c) => a.FID, OrderByType.Desc) - .Select("a.*,b.FNewTestCode,b.FVersionCode,a.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,d.FName AS 'FUserName1'") + .Select("a.*,b.FNewTestCode,b.FVersionCode,a.FType as 'FormulaType',b.FSaleCode,b.FFormulaTestCode as FTestCode,b.FMdmCode,b.FFormulaName,b.FMaterialHalfIDs,cast(substring(c.FRemark,4,2)as int)as FViewType,d.FName AS 'FUserName1',(case when b.FBomJson IS NULL then 0 when cast(b.FBomJson as nvarchar) = '' then 0 else 1 end) as FHasBomJson") .ToPageList(tq.FPageIndex, tq.FPageSize, ref totalNumber); }