From cc02014e0d85cbce87a787d4b2df445cc3e982dd Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Mon, 17 Apr 2023 17:13:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=9B=B4=E9=80=9A=E7=8E=87?=
 =?UTF-8?q?=EF=BC=8C=E6=B1=87=E6=80=BB=E9=80=BB=E8=BE=91=EF=BC=8C=E9=87=87?=
 =?UTF-8?q?=E7=94=A8Config=E8=AE=BE=E5=AE=9A=E7=9A=84FPY=E7=AB=99=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AMES/WipStationController.cs  | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
index 732e8e93..4187500e 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs
@@ -11,6 +11,7 @@ using AMESCoreStudio.WebApi.DTO.AMES;
 using AMESCoreStudio.CommonTools.Result;
 using System.Data.Common;
 using System.Reflection;
+using Microsoft.Extensions.Configuration;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -22,6 +23,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
     public class WipStationController : ControllerBase
     {
         private readonly AMESContext _context;
+        private readonly IConfiguration _config;
 
         /// <summary>
         /// 
@@ -29,6 +31,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <param name="context"></param>
         public WipStationController(AMESContext context)
         {
+            _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build();
             _context = context;
         }
 
@@ -272,26 +275,31 @@ FROM JHAMES.WIP_STATION";
         [HttpGet("GetWipStation4QRS014GroupS")]
         public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
         {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
             ResultModel<dynamic> result = new ResultModel<dynamic>();
 
             var q = from q1 in _context.WipStations
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
                     select new
                     {
                         q1.WipID,
                         q2.WerksNO,
-                        q2.UnitNO,
                         q2.CustomerMedical,
+                        q2.UnitNO,
                         q3.ItemNO,
                         q3.ModelNO,
                         q1.StationID,
+                        q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
                         q1.CreateDate
                     };
 
             q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "S");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
 
             if (itemNo != null)
             {
@@ -346,11 +354,15 @@ FROM JHAMES.WIP_STATION";
         [HttpGet("GetWipStation4QRS014GroupB")]
         public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
         {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
+
             ResultModel<dynamic> result = new ResultModel<dynamic>();
 
             var q = from q1 in _context.WipStations
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
                     select new
                     {
                         q1.WipID,
@@ -360,12 +372,14 @@ FROM JHAMES.WIP_STATION";
                         q3.ItemNO,
                         q3.ModelNO,
                         q1.StationID,
+                        q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
                         q1.CreateDate
                     };
 
             q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "B");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
 
             if (itemNo != null)
             {
@@ -420,11 +434,15 @@ FROM JHAMES.WIP_STATION";
         [HttpGet("GetWipStation4QRS014GroupM")]
         public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo)
         {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
+
             ResultModel<dynamic> result = new ResultModel<dynamic>();
 
             var q = from q1 in _context.WipStations
                     join q2 in _context.WipInfos on q1.WipID equals q2.WipID
                     join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
                     select new
                     {
                         q1.WipID,
@@ -434,12 +452,14 @@ FROM JHAMES.WIP_STATION";
                         q3.ItemNO,
                         q3.ModelNO,
                         q1.StationID,
+                        q4.StationName,
                         q1.RuleStatus,
                         q1.FirstCnt,
                         q1.CreateDate
                     };
 
             q = q.Where(w => w.CustomerMedical == "Y");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
 
             if (itemNo != null)
             {