diff --git a/AMESCoreStudio.Web/Controllers/RPTController.cs b/AMESCoreStudio.Web/Controllers/RPTController.cs index 8a342dbe..333a28aa 100644 --- a/AMESCoreStudio.Web/Controllers/RPTController.cs +++ b/AMESCoreStudio.Web/Controllers/RPTController.cs @@ -75,7 +75,7 @@ namespace AMESCoreStudio.Web.Controllers var edate = ""; var model = await _rptApi.GetRPT002View(sdate, edate); model.SerachData = DateTime.Now.ToString("yyyy/MM"); - ViewBag.werksNoSeq = 0; + ViewBag.werksNoSeq = 1; return View(model); } @@ -95,7 +95,7 @@ namespace AMESCoreStudio.Web.Controllers } else { - ViewBag.werksNoSeq = 0; + ViewBag.werksNoSeq = 1; } var model = await _rptApi.GetRPT002View(sDate, eDate, werkNo); diff --git a/AMESCoreStudio.Web/Views/RPT/RPT002.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT002.cshtml index ee8fbde0..68d434d1 100644 --- a/AMESCoreStudio.Web/Views/RPT/RPT002.cshtml +++ b/AMESCoreStudio.Web/Views/RPT/RPT002.cshtml @@ -35,6 +35,10 @@ color: #00CC00; } + .ColorRed { + color: #CC1100; + } + .DetailRow { text-align: center; margin: 5px 0px; @@ -79,7 +83,7 @@
- +
@@ -113,247 +117,409 @@
機構件
-
@Model.IQLRR_EE %
-
目標 < 1.10%
+
@Model.IQLRR_EE %
+
目標 < 1.10%
+
-
-
-
電子件
-
-
@Model.IQLRR_ME %
-
目標 < 0.14%
+
+
電子件
+
+
@Model.IQLRR_ME %
+
目標 < 0.14%
+
-
-
-
線上材料品質
-
-
@Model.LQC %
-
目標 > 95%
-
-
-
-
QRC件數
-
-
新增筆數
-
@Model.QRCNew
-
-
-
結案筆數
-
@Model.QRCClose
+
+
線上材料品質
+
+
@Model.LQC %
+
目標 > 95%
+
-
-
總筆數
-
@Model.QRCTotal
+
+
QRC件數
+
+
新增筆數
+
@Model.QRCNew
+
+
+
結案筆數
+
@Model.QRCClose
+
+
+
總筆數
+
@Model.QRCTotal
+
-
-
-
-
-
- 生產品質 -
-
-
-
IPQC異常件數
-
-
新增筆數
-
@Model.IPQCNew
-
-
-
結案筆數
-
@Model.IPQCClose
-
-
-
總筆數
-
@Model.IPQCTotal
-
-
-
-
FQC批退率
-
-
Board
-
-
@Model.FQCRRBoard %
-
目標 ≤ 0.20%
+
+
+
+
+ 生產品質
-
-
System
-
-
@Model.FQCRRSystem %
-
目標 ≤ 1.37%
+
+
IPQC異常件數
+
+
新增筆數
+
@Model.IPQCNew
+
+
+
結案筆數
+
@Model.IPQCClose
+
+
+
總筆數
+
@Model.IPQCTotal
-
-
Medical
-
-
@Model.FQCRRMedical %
-
目標 ≤ 0.59%
+
+
FQC批退率
+
+
Board
+
+
@Model.FQCRRBoard %
+
目標 ≤ 0.20%
+
+
+
+
System
+
+
@Model.FQCRRSystem %
+
目標 ≤ 1.37%
+
+
+
+
Medical
+
+
@Model.FQCRRMedical %
+
目標 ≤ 0.59%
+
-
-
-
-
-
-
- 製造品質 -
-
-
-
DOA Rate
-
-
Board
-
-
@Model.DOABoard %
-
目標 ≤ 0.05%
+
+
+
+
+
+ 製造品質
-
-
System
-
-
@Model.DOASystem %
-
目標 ≤ 0.1%
+
+
DOA Rate
+
+
Board
+
+
@Model.DOABoard %
+
目標 ≤ 0.05%
+
-
-
-
Medical
-
-
@Model.DOAMedical %
-
目標 ≤ 0.035%
+
+
System
+
+
@Model.DOASystem %
+
目標 ≤ 0.1%
+
-
-
-
-
FPY Rate(立德)
-
-
Board
-
-
@Model.FPYBoard_LEI %
-
目標 ≥ 99.89%
+
+
Medical
+
+
@Model.DOAMedical %
+
目標 ≤ 0.035%
+
-
-
System
-
-
@Model.FPYSystem_LEI %
-
目標 ≥ 96.51%
+
+
FPY Rate(立德)
+
+
Board
+
+
@Model.FPYBoard_LEI %
+
目標 ≥ 99.89%
+
-
-
-
Medical
-
-
@Model.FPYMedical_LEI %
-
目標 ≥ 97.81%
+
+
System
+
+
@Model.FPYSystem_LEI %
+
目標 ≥ 96.51%
+
-
-
-
-
FPY Rate(30秒切換外包)
-
-
Board
-
-
@Model.FPYBoard %
-
目標 ≥ 99.89%
+
+
Medical
+
+
@Model.FPYMedical_LEI %
+
目標 ≥ 97.81%
+
-
-
System
-
-
@Model.FPYSystem %
-
目標 ≥ 96.51%
+
+
FPY Rate(@Model.WerkNo)
+
+
Board
+
+
@Model.FPYBoard %
+
目標 ≥ 99.89%
+
-
-
-
Medical
-
-
@Model.FPYMedical %
-
目標 ≥ 97.81%
+
+
System
+
+
@Model.FPYSystem %
+
目標 ≥ 96.51%
+
+
+
+
Medical
+
+
@Model.FPYMedical %
+
目標 ≥ 97.81%
+
-
-
-
-
-
- 售後品質 -
-
-
-
RAM Rate
-
-
Board
-
-
@Model.RMABoard %
-
目標 ≤ 0.7%
+
+
+
+
+ 售後品質
-
-
System
-
-
@Model.RMASystem %
-
目標 ≤ 1.5%
-
-
-
-
Medical
-
-
@Model.RMAMedical %
-
目標 ≤ 1%
-
-
-
-
-
CFQR件數
-
-
-
新增筆數
-
@Model.CFQRNew
+
+
RAM Rate
+
+
Board
+
+
@Model.RMABoard %
+
目標 ≤ 0.7%
+
-
-
結案筆數
-
@Model.CFQRClose
+
+
System
+
+
@Model.RMASystem %
+
目標 ≤ 1.5%
+
-
總筆數
-
@Model.CFQRTotal
+
Medical
+
+
@Model.RMAMedical %
+
目標 ≤ 1%
+
+
+
+
+
CFQR件數
+
+
+
新增筆數
+
@Model.CFQRNew
+
+
+
結案筆數
+
@Model.CFQRClose
+
+
+
總筆數
+
@Model.CFQRTotal
+
-
- -
-@section Scripts { - - + -} \ No newline at end of file + // 每30秒執行autoSubmitForm + setInterval(autoSubmitForm, 30000); + + } \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index c74f4833..8efc49cd 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -879,6 +879,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL var vYear = DateTime.Parse(sDate).Year; var vMonth = DateTime.Parse(sDate).Month; + result.WerkNo = werksNo; // 進料批退率 電子 //result.IQLRR_EE = 0.84; diff --git a/AMESCoreStudio.WebApi/DTO/AMES/RPT002VIiewDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/RPT002VIiewDto.cs index 5e9288b8..3aee0e5d 100644 --- a/AMESCoreStudio.WebApi/DTO/AMES/RPT002VIiewDto.cs +++ b/AMESCoreStudio.WebApi/DTO/AMES/RPT002VIiewDto.cs @@ -19,6 +19,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES /// public string SerachData { get; set; } + /// + /// 外包代號 + /// + public string WerkNo { get; set; } + + /// /// 進料批退率 電子 ///