1. RPT002 品質看板加入30秒外包廠商刷新

AMESCoreStudio.Web/Controllers/RPTController.cs

@@ -75,16 +75,30 @@ namespace AMESCoreStudio.Web.Controllers
             var edate = "";
             var model = await _rptApi.GetRPT002View(sdate, edate);
             model.SerachData = DateTime.Now.ToString("yyyy/MM");
+            ViewBag.werksNoSeq = 0;
             return View(model);
         }
 
         [HttpPost]
-        public async Task<IActionResult> RPT002(string SerachData)
+        public async Task<IActionResult> RPT002(string SerachData, int werksNoSeq)
         {
             var Data = DateTime.Parse(SerachData);
             var sDate = new DateTime(Data.Year, Data.Month, 1).ToString("yyyy/MM/dd");
             var eDate = new DateTime(Data.Year, Data.Month, DateTime.DaysInMonth(Data.Year, Data.Month)).ToString("yyyy/MM/dd");
-            var model = await _rptApi.GetRPT002View(sDate, eDate);
+
+            var werkNo = string.Empty;
+            var werksNoArrsy = new List<string> { "YS31", "YS32", "YS33", "YS34" };
+            if (werksNoArrsy.Count >= werksNoSeq + 1)
+            {
+                werkNo = werksNoArrsy[werksNoSeq];
+                ViewBag.werksNoSeq = werksNoSeq + 1;
+            }
+            else
+            {
+                ViewBag.werksNoSeq = 0;
+            }
+
+            var model = await _rptApi.GetRPT002View(sDate, eDate, werkNo);
             model.SerachData = SerachData;
             return View(model);
         }
@@ -1701,7 +1715,8 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpPost]
         public async Task<IActionResult> RPT003D(string year, string month, string qcRateType, string productType)
         {
-            var model = new QcRate(){
+            var model = new QcRate()
+            {
                 Yrer = year,
                 Month = month,
                 QcRateType = qcRateType,

AMESCoreStudio.Web/HttpApis/AMES/IRPT.cs

@@ -25,7 +25,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/RPT/GetRPT002View")]
-        ITask<RPT002ViewDto> GetRPT002View(string sDate, string eDate);
+        ITask<RPT002ViewDto> GetRPT002View(string sDate, string eDate ,string werksNo = null);
 
         /// <summary>
         /// 生產看板

AMESCoreStudio.Web/Views/RPT/RPT002.cshtml

@@ -77,7 +77,9 @@
 </style>
 
 <div class="layui-card" style="background-color:#000000">
-    <form enctype="multipart/form-data" method="post" asp-action="RPT002" class="layui-form">
+    <form id="rpt002Form" enctype="multipart/form-data" method="post" asp-action="RPT002" class="layui-form">
+        <input id="werksNoSeq" name="werksNoSeq" type="hidden" value="@ViewBag.werksNoSeq" />
+       
         <div class="layui-card-body" style="background-color:#1f3770">
             <div class="layui-row">
                 <div class="layui-col-md7 spanMasterTitleClass" style="text-align:center;margin-top:5px;">
@@ -345,5 +347,13 @@
                 , theme: 'grid'
             });
         });
+
+        // 自動提交
+        function autoSubmitForm() {
+            document.getElementById('rpt002Form').submit();
+        }
+
+        // 每30秒執行autoSubmitForm
+        setInterval(autoSubmitForm, 30000);
     </script>
 }

AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs

@@ -859,9 +859,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
         /// </summary>
         /// <param name="sDate">開始日期</param>
         /// <param name="eDate">結束日期</param>
+        /// <param name="werksNo">外包廠商代號</param>
         /// <returns></returns>
         [HttpGet("GetRPT002View")]
-        public async Task<RPT002ViewDto> GetRPT002View(string sDate, string eDate)
+        public async Task<RPT002ViewDto> GetRPT002View(string sDate, string eDate, string werksNo)
         {
             if (string.IsNullOrWhiteSpace(sDate) || string.IsNullOrWhiteSpace(eDate))
             {
@@ -869,6 +870,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 eDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month)).ToString("yyyy/MM/dd");
             }
 
+            if (string.IsNullOrWhiteSpace(werksNo))
+            {
+                werksNo = "YS31";
+            }
+
             var result = new RPT002ViewDto();
 
             var vYear = DateTime.Parse(sDate).Year;
@@ -1289,7 +1295,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             // FPY Board
             #region 立德 委外 Board
             //result.FPYBoard = 100.00;
-            var f_FPYBoard = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, eDate, null, "YS31", null);
+            var f_FPYBoard = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, eDate, null, werksNo, null);
             if (f_FPYBoard.DataTotal > 0)
             {
                 double sum_rate = 100.0;
@@ -1394,7 +1400,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             // FPY System            
             #region  立德 委外 System
             //result.FPYSystem = 99.12;
-            var f_FPYSystem = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, eDate, null, "YS31", null);
+            var f_FPYSystem = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, eDate, null, werksNo, null);
             if (f_FPYSystem.DataTotal > 0)
             {
                 double sum_rate = 100.0;
@@ -1499,7 +1505,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             // FPY Medical            
             #region 立德 委外 Medical
             //result.FPYMedical = 12.12;
-            var f_FPYMedical = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, eDate, null, "YS31", null);
+            var f_FPYMedical = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, eDate, null, werksNo, null);
             if (f_FPYMedical.DataTotal > 0)
             {
                 double sum_rate = 100.0;