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 1/3] 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); From ef181c2af2d8979cfe5ac58ea3da876c8e5fc9fc Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Tue, 9 May 2023 13:07:45 +0800 Subject: [PATCH 2/3] commit by yzf --- FactorySystemBll/HalfMaterialTeamworkBll.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FactorySystemBll/HalfMaterialTeamworkBll.cs b/FactorySystemBll/HalfMaterialTeamworkBll.cs index 4dd99e2..7ebd7a4 100644 --- a/FactorySystemBll/HalfMaterialTeamworkBll.cs +++ b/FactorySystemBll/HalfMaterialTeamworkBll.cs @@ -489,7 +489,7 @@ namespace FactorySystemBll mItem.FOldID = oldId; mItem.FLevelID = vItem.FLevel; mItem.FParentID = oldParent; - mItem.FTestCode = teamInfo.FNewTestCode; + //mItem.FTestCode = teamInfo.FNewTestCode; if (mItem.FLevelID >= 1) formulaList.Add(mItem); } From 16096d7f1fc236ae8a46c3311431fc7554649b98 Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Wed, 10 May 2023 00:04:01 +0800 Subject: [PATCH 3/3] commit by yzf --- .../HalfMaterialTeamworkController.cs | 9 +++ FactorySystemBll/HalfMaterialTeamworkBll.cs | 63 ++++++++++--------- FactorySystemBll/ViewBll.cs | 4 +- 3 files changed, 45 insertions(+), 31 deletions(-) diff --git a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs index 0272a3d..c95a4f0 100644 --- a/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/HalfMaterialTeamworkController.cs @@ -788,6 +788,15 @@ namespace FactorySystemApi.Controllers FTestCode = item.SP_VALUE, FVersionCode = item.SP_Version, FParentID = parentId + + //FID = DateTime.Now.DayOfYear * 10 + dataId, + //FPlmCode = item.Code, + //FName = item.Name, + ////FCode = item.Code, + //FType = item.Type.ToLower(), + //FTestCode = item.TestNO, + //FVersionCode = item.Version, + //FParentID = parentId }; TFS_ViewMaterial view = new TFS_ViewMaterial() diff --git a/FactorySystemBll/HalfMaterialTeamworkBll.cs b/FactorySystemBll/HalfMaterialTeamworkBll.cs index 7ebd7a4..f126ed6 100644 --- a/FactorySystemBll/HalfMaterialTeamworkBll.cs +++ b/FactorySystemBll/HalfMaterialTeamworkBll.cs @@ -782,41 +782,46 @@ namespace FactorySystemBll { SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); List materialList = null; - List factoryList = new List(); - if (factory != null) + + + materialList = db.Queryable().Where(m => m.FTestCode == testCode).ToList(); + List ids = materialList.Select(m => m.FID).ToList(); + //更新配方 + string sql = ""; + + + if (string.IsNullOrWhiteSpace(idList)) { - if (factory.FType != (int)Constant.FactoryType.单工厂) - { - factoryList.Add(factory.FID); - factoryList.Add(factory.FFactoryID); - } - else - { - factoryList.Add(factory.FID); - } + sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2} WHERE FMaterialID in ({1})", testCode2, string.Join(",", ids), temId); + } + else + { + sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList); + } + if (materialList.Count() > 0) + { + db.Ado.ExecuteCommand(sql); + } - materialList = db.Queryable().Where(m => m.FTestCode == testCode&&string.Join(",", factoryList).Contains(m.FFactoryID.ToString())).ToList(); - List ids = materialList.Select(m => m.FID).ToList(); - //更新配方 - string sql = ""; + //List factoryList = new List(); + //if (factory != null) + //{ + // if (factory.FType != (int)Constant.FactoryType.单工厂) + // { + // factoryList.Add(factory.FID); + // factoryList.Add(factory.FFactoryID); + // } + // else + // { + // factoryList.Add(factory.FID); + // } - if (string.IsNullOrWhiteSpace(idList)) - { - sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1});update TFS_ViewMaterial set FHalfMaterialTeamID={2} WHERE FMaterialID in ({1})", testCode2, string.Join(",", ids), temId); - } - else - { - sql = string.Format("update TFS_Material set FTestCode='{0}' WHERE FID in ({1})", testCode, idList); - } - if (materialList.Count() > 0) - { - db.Ado.ExecuteCommand(sql); - } - } - + + //} + diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs index 4f70593..7f89acb 100644 --- a/FactorySystemBll/ViewBll.cs +++ b/FactorySystemBll/ViewBll.cs @@ -772,10 +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"); }