diff --git a/FactorySystemApi/Controllers/MaterialTeamworkController.cs b/FactorySystemApi/Controllers/MaterialTeamworkController.cs index 93e40f9..ff105e3 100644 --- a/FactorySystemApi/Controllers/MaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/MaterialTeamworkController.cs @@ -250,12 +250,16 @@ namespace FactorySystemApi.Controllers string viewType = GetViewType(viewList); // 更新视图 - MaterialTeamworkBll.UpdateMaterialViewById(viewList, user.FID, teamId, teamworkType); + int MaterialType = MaterialTeamworkBll.UpdateMaterialViewById(viewList, user.FID, teamId, teamworkType); // 更新物料 MaterialTeamworkBll.UpdateMaterialById(materialList, user.FID, teamId, teamworkType); // 更新物料信息 MaterialTeamworkBll.UpdateMaterialInfoById(infoList, user.FID, teamId, teamworkType); + TFS_FMaterialTeamwork teamwork = MaterialTeamworkBll.GetMaterialTeamworkById(teamId); + teamwork.FMaterialType = MaterialType.ToString(); + MaterialTeamworkBll.UpdateMaterialTeamwork(teamwork); + List tasks = MaterialTaskBll.GetMaterialTasks(teamId); TFS_FMaterialTask task = null; @@ -303,7 +307,6 @@ namespace FactorySystemApi.Controllers { result.Add("TaskId", -9); } - } result.Add("TeamId", teamId); diff --git a/FactorySystemBll/MaterialTeamworkBll.cs b/FactorySystemBll/MaterialTeamworkBll.cs index 89eb7e9..7f9d95c 100644 --- a/FactorySystemBll/MaterialTeamworkBll.cs +++ b/FactorySystemBll/MaterialTeamworkBll.cs @@ -279,10 +279,12 @@ namespace FactorySystemBll viewList[i].Remove("FTypeID2"); // 更新视图 - result += db.Updateable(viewList[i]).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand(); + db.Updateable(viewList[i]).AS("TFS_ViewMaterial").WhereColumns("FMaterialID").Where(sqlWhere).ExecuteCommand(); + + int.TryParse(viewList[i]["FMRP1ProductType"].ToString(), out result); } - result += UnionModifyData(viewList, "TFS_ViewMaterial", teamId, teamworkType, db, "FMaterialID"); + UnionModifyData(viewList, "TFS_ViewMaterial", teamId, teamworkType, db, "FMaterialID"); } return result; @@ -338,7 +340,7 @@ namespace FactorySystemBll infoList[i].Remove("FMaterialID"); infoList[i].Add("FType", 2); - result += db.Updateable(infoList[i]).AS("TFS_MaterialInfo").WhereColumns("FDataID", "FType").ExecuteCommand(); + result += db.Updateable(infoList[i]).IgnoreColumns(true).AS("TFS_MaterialInfo").WhereColumns("FDataID", "FType").ExecuteCommand(); } result += UnionModifyData(infoList, "TFS_MaterialInfo", teamId, teamworkType, db, "FDataID"); @@ -422,6 +424,20 @@ namespace FactorySystemBll return result; } + public TFS_FMaterialTeamwork GetMaterialTeamworkById(int teamId) + { + SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); + TFS_FMaterialTeamwork teamwork = null; + List teamworkList = db.Queryable().Where(s => s.FID == teamId && s.FState == 1).ToList(); + + if (teamworkList != null && teamworkList.Count > 0) + { + teamwork = teamworkList[0]; + } + + return teamwork; + } + public int UpdateMaterialTeamwork(TFS_FMaterialTeamwork teamwork) { SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); @@ -460,6 +476,27 @@ namespace FactorySystemBll return viewList; } + public List> GetViewPower(int userId, List factoryId) + { + SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); + List> factoryPowers = new List>(); + + List powers = db.Queryable((a, b) => new JoinQueryInfos( + JoinType.Left, b.FRole.Equals(a.FRoleID.ToString()) + )) + .Where((a, b) => b.FUserID.Equals(userId.ToString()) && b.FFactoryID.Equals(factoryId.ToString())) + .Where((a, b) => a.FType == 3) + .Select("a.FFunctionID, b.FFactoryID").Distinct() + .ToList(); + + if (powers != null && powers.Count > 0) + { + + } + + return factoryPowers; + } + public DataTable GetViewMaterialSAP(string teamworkId, string teamworkType) { SqlSugarClient db = AppSettingsHelper.GetSqlSugar(); diff --git a/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs b/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs index c67fc8f..5b951be 100644 --- a/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs +++ b/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs @@ -17,5 +17,19 @@ namespace FactorySystemModel.ResponseModel /// Nullable: /// public string FAddUserName { get; set; } + + /// + /// Desc:是否具备视图查看权限 + /// Default: + /// Nullable: + /// + public bool FIsShowView { get; set; } + + /// + /// Desc:是否具备视图导出权限 + /// Default: + /// Nullable: + /// + public bool FIsDownloadView { get; set; } } }