From 61ec1abbccf52014c96154d9d13a882aeffa5f56 Mon Sep 17 00:00:00 2001
From: Leo <novelliou@hotmail.com>
Date: Thu, 14 Sep 2023 11:43:45 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=85=8D=E6=96=B9=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E5=92=8C?=
 =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=8C=87=E5=AF=BC=E4=B9=A6=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=202=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=BC=E5=87=BA=E7=9A=84BUG=203=E3=80=81=E9=85=8D?=
 =?UTF-8?q?=E6=96=B9=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA=E6=A8=A1=E7=B3=8A?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/FormulaController.cs          | 37 +++++++++++++++++++
 FactorySystemBll/FormulaBll.cs                |  2 +-
 FactorySystemCommon/NPOIHelper.cs             |  1 -
 3 files changed, 38 insertions(+), 2 deletions(-)

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);
         }
 
+        /// <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>
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<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);
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);