1、配方申请结果导出按钮和工艺指导书查看增加权限

2、修改导出的BUG
3、配方查询改为模糊查询

FactorySystemApi/Controllers/FormulaController.cs

@@ -276,6 +276,43 @@ namespace FactorySystemApi.Controllers
             }, apiResult, Request);
         }
 
+        /// <summary>
+        /// 获取用户是否导出配方和查看工艺指导书的权限
+        /// </summary>
+        /// <returns></returns>
+        [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<object> powerList = FormulaBll.GetTaskPower(user.FID);
+                List<object> BomDownloadPowers = powerList.FindAll(p => ((IDictionary<string, object>)p)["FFunctionID"].ToString().Equals("13")).ToList();
+                List<object> plmWebsitedPowers = powerList.FindAll(p => ((IDictionary<string, object>)p)["FFunctionID"].ToString().Equals("14")).ToList();
+
+                if (BomDownloadPowers.Count > 0)
+                {
+                    bomDownloadPower = true;
+                }
+
+                if (plmWebsitedPowers.Count > 0)
+                {
+                    plmWebsitePower = true;
+                }
+
+                Dictionary<string, bool> bomPowers = new Dictionary<string, bool>();
+
+                bomPowers.Add("bomDownloadPower", bomDownloadPower);
+                bomPowers.Add("plmWebsitePower", plmWebsitePower);
+
+                apiResult.Data = bomPowers;
+            }, apiResult, Request);
+        }
+
         /// <summary>
         /// 获取用户是否具备申请查询配方权限
         /// </summary>

FactorySystemBll/FormulaBll.cs

@@ -318,7 +318,7 @@ namespace FactorySystemBll
                 formulas = db.Queryable<TFS_Formula, TFS_FormulaApplyHistory>((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<object>("a. *, b.FUserName, b.FApplyTime")
                     .ToPageList(sfq.FPageIndex, sfq.FPageSize, ref totalNumber);

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