diff --git a/FactorySystemApi/Controllers/FormulaController.cs b/FactorySystemApi/Controllers/FormulaController.cs index ac36be9..81a5de7 100644 --- a/FactorySystemApi/Controllers/FormulaController.cs +++ b/FactorySystemApi/Controllers/FormulaController.cs @@ -276,6 +276,43 @@ namespace FactorySystemApi.Controllers }, apiResult, Request); } + /// + /// 获取用户是否导出配方和查看工艺指导书的权限 + /// + /// + [HttpPost] + public ApiResult GetBomPower() + { + ApiResult apiResult = new ApiResult(); + return ExceptionHelper.TryReturnException(() => + { + bool bomDownloadPower = false; + bool plmWebsitePower = false; + ApiAuthInfo user = Request.Properties["token"] as ApiAuthInfo; + + List powerList = FormulaBll.GetTaskPower(user.FID); + List BomDownloadPowers = powerList.FindAll(p => ((IDictionary)p)["FFunctionID"].ToString().Equals("13")).ToList(); + List plmWebsitedPowers = powerList.FindAll(p => ((IDictionary)p)["FFunctionID"].ToString().Equals("14")).ToList(); + + if (BomDownloadPowers.Count > 0) + { + bomDownloadPower = true; + } + + if (plmWebsitedPowers.Count > 0) + { + plmWebsitePower = true; + } + + Dictionary bomPowers = new Dictionary(); + + bomPowers.Add("bomDownloadPower", bomDownloadPower); + bomPowers.Add("plmWebsitePower", plmWebsitePower); + + apiResult.Data = bomPowers; + }, apiResult, Request); + } + /// /// 获取用户是否具备申请查询配方权限 /// diff --git a/FactorySystemBll/FormulaBll.cs b/FactorySystemBll/FormulaBll.cs index e28cf7d..939ad85 100644 --- a/FactorySystemBll/FormulaBll.cs +++ b/FactorySystemBll/FormulaBll.cs @@ -318,7 +318,7 @@ namespace FactorySystemBll formulas = db.Queryable((a, b) => new JoinQueryInfos( JoinType.Left, a.FID == b.FFormulaID )) - .Where((a, b) => a.FTestCode.Equals(sfq.FTestCode)) + .Where((a, b) => a.FTestCode.Contains(sfq.FTestCode)) .OrderBy((a, b) => a.FID) .Select("a. *, b.FUserName, b.FApplyTime") .ToPageList(sfq.FPageIndex, sfq.FPageSize, ref totalNumber); diff --git a/FactorySystemCommon/NPOIHelper.cs b/FactorySystemCommon/NPOIHelper.cs index 7d06eed..f89b0f1 100644 --- a/FactorySystemCommon/NPOIHelper.cs +++ b/FactorySystemCommon/NPOIHelper.cs @@ -1533,7 +1533,6 @@ namespace FactorySystemCommon workbook = new XSSFWorkbook(templateFile); ISheet sheetBomList = workbook.GetSheetAt(0); - ISheet sheetApplyHistory = workbook.GetSheetAt(1); IRow row = sheetBomList.GetRow(2);