BB.Wang 增加開窗

AMESCoreStudio.Web/Controllers/RPTController.cs

@@ -26,12 +26,14 @@ namespace AMESCoreStudio.Web.Controllers
     {
         private readonly IWebHostEnvironment environment = null;
         public readonly IRPT _rptApi;
+        public readonly IPCS _pcsApi;
 
-        public RPTController(IWebHostEnvironment environment, IRPT rptApi)
+        public RPTController(IWebHostEnvironment environment, IRPT rptApi, IPCS pcsApi)
         {
             this.environment = environment;
             System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
             _rptApi = rptApi;
+            _pcsApi = pcsApi;
         }
 
         public async Task<IActionResult> RPT001()
@@ -111,17 +113,35 @@ namespace AMESCoreStudio.Web.Controllers
                 case "05":
                     title = data.Substring(0, 4) + "無效工時";
                     break;
+
+                case "06":
+                    title = data.Substring(0, 4) + "未結工單數";
+                    break;
             }
             ViewBag.Title = title;
 
-            string MonthDataList = "<table border='1' cellpadding='2'><tr class='TR_Item_Sstyle'><td>月份</td><td>01</td><td >02</td><td>03</td><td>04</td><td>05</td><td>06</td><td>07</td><td>08</td><td>09</td><td>10</td><td>11</td><td>12</td></tr><tr><td class='TD_Data_Sstyle'>數值</td>";
+            string MonthDataList = "<table border='1' cellpadding='2'><tr class='TR_Item_Sstyle'><td>月份</td><td>01</td><td>02</td><td>03</td><td>04</td><td>05</td><td>06</td><td>07</td><td>08</td><td>09</td><td>10</td><td>11</td><td>12</td></tr><tr><td class='TD_Data_Sstyle'>數值</td>";
             
             for (int m = 1; m <= 12; m++)
             {
                 var Data = DateTime.Parse(data.Substring(0, 4) + "/" + m.ToString().PadLeft(2, '0'));
                 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 pi = await _rptApi.GetProductionIndex4RPT001(sDate, eDate);
+
+                ResultModel<dynamic> pi;
+
+                switch (type)
+                {
+                    case "06":
+                        pi = await _pcsApi.GetWipInfoPCS008(null, null, 0, null, sDate, eDate, null, 0, 10);                        
+                        break;
+
+                    default: //以上都不符合走這個
+                        pi = await _rptApi.GetProductionIndex4RPT001(sDate, eDate);
+                        break;
+                }
+
+                //var pi = await _rptApi.GetProductionIndex4RPT001(sDate, eDate);
                 
                 if (pi.DataTotal > 0)
                 {
@@ -151,6 +171,10 @@ namespace AMESCoreStudio.Web.Controllers
                             case "05":
                                 rate = double.Parse(jo["invalidTime"].ToString());
                                 break;
+
+                            case "06":
+                                rate = double.Parse(pi.DataTotal.ToString());
+                                break;
                         }                        
                         sum_rate = sum_rate + rate;
                     }
@@ -178,6 +202,10 @@ namespace AMESCoreStudio.Web.Controllers
                         case "05":
                             avg_rate = sum_rate;
                             break;
+
+                        case "06":
+                            avg_rate = double.Parse(pi.DataTotal.ToString());
+                            break;
                     }
 
                     MonthDataList = MonthDataList + "<td class='TD_Data_Rate_Sstyle'>" + "<a href =\"javascript:hg.open('按日期統計資料','/RPT/RPT001B/" + type + "_" + Data.ToString("yyyyMM") + "',800,720);\">" + avg_rate.ToString("0.00") + "</a></td>";

AMESCoreStudio.Web/Views/RPT/RPT001.cshtml

@@ -193,7 +193,7 @@
                         </div>
                     </div>
                     <div class="layui-col-md4 Link-right">
-                        <div class="layui-col-md12 spanDetailTitleClass ColTitle">未結工單數</div>
+                        <div class="layui-col-md12 spanDetailTitleClass ColTitle"><a style="color:white" href="javascript:hg.open('按月份統計資料','/RPT/RPT001A/06_@ViewBag.QueryDate2',900,810)">未結工單數</a></div>
                         <div class="layui-col-md12 spanDetailNumberClass" style="color: #FFFFFF">
                             @Model.openOrderWipQty
                             <p class="spanUnitClass">張</p>