diff --git a/AMESCoreStudio.Web/Controllers/RPTController.cs b/AMESCoreStudio.Web/Controllers/RPTController.cs index 54a24528..22be3309 100644 --- a/AMESCoreStudio.Web/Controllers/RPTController.cs +++ b/AMESCoreStudio.Web/Controllers/RPTController.cs @@ -3,9 +3,17 @@ using AspNetCore.Reporting; using Microsoft.AspNetCore.Hosting; using System.Collections.Generic; using System.Threading.Tasks; +using System; using System.Data; using Oracle.EntityFrameworkCore; using Oracle.ManagedDataAccess.Client; +using AMESCoreStudio.WebApi.Models.BAS; +using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.Web.Models; +using AMESCoreStudio.WebApi.DTO.AMES; +using DocumentFormat.OpenXml.Math; +using AMESCoreStudio.Web.ViewModels.PCS; +using Microsoft.AspNetCore.Http; // For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 @@ -13,19 +21,29 @@ namespace AMESCoreStudio.Web.Controllers { public class RPTController : Controller { - private readonly IWebHostEnvironment environment = null; - public readonly IPCS _pcsApi; + private readonly IWebHostEnvironment environment = null; + public readonly IRPT _rptApi; - public RPTController(IWebHostEnvironment environment,IPCS pcsApi) + public RPTController(IWebHostEnvironment environment, IRPT rptApi) { this.environment = environment; System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); - _pcsApi = pcsApi; - + _rptApi = rptApi; } public async Task RPT001() { + var sdate = ""; + var edate = ""; + + var model = await _rptApi.GetRPT001View(sdate, edate); + // 異常工時 + //var a = await _whsApi.GetExceptionWorktimeByQueryWHS009("", "", "", "", sdate: sdate, edate: edate); + // 未結工單數 + //var b = await _pcsApi.GetWipInfoPCS008(date_str: sdate, date_end: edate); + // 完工入庫數 + //var c = await _pcsApi.GetFqcInhouseMasterMultiQuery(date_str: sdate, date_end: edate); + //string mimeType = ""; //int extension = 1; //var path = $"{this.environment.WebRootPath}\\Reports\\TEST02.rdlc"; @@ -39,8 +57,18 @@ namespace AMESCoreStudio.Web.Controllers //var result = localReport.Execute(RenderType.Pdf, extension, param, mimeType); //return File(result.MainStream, "application/pdf"); + //var model = new WebApi.DTO.AMES.RPT001VIiewDto(); + return View(model); + } - return View(); + [HttpPost] + public async Task RPT001(string SerachData) + { + 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.GetRPT001View(sDate, eDate); + return View(model); } } } diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IRPT.cs b/AMESCoreStudio.Web/HttpApis/AMES/IRPT.cs new file mode 100644 index 00000000..571a78cc --- /dev/null +++ b/AMESCoreStudio.Web/HttpApis/AMES/IRPT.cs @@ -0,0 +1,23 @@ +using System.Collections.Generic; +using WebApiClient; +using WebApiClient.Attributes; +using AMESCoreStudio.WebApi; +using Microsoft.AspNetCore.Mvc; +using AMESCoreStudio.WebApi.Models.AMES; +using AMESCoreStudio.WebApi.Models.BAS; +using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.WebApi.DTO.AMES; + +namespace AMESCoreStudio.Web +{ + [JsonReturn] + public interface IRPT: IHttpApi + { + /// + /// 生產即時效率 + /// + /// + [WebApiClient.Attributes.HttpGet("api/RPT/GetRPT001View")] + ITask GetRPT001View(string sDate, string eDate); + } +} diff --git a/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml b/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml index 61b08dee..fd7cdb3a 100644 --- a/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml +++ b/AMESCoreStudio.Web/Views/RPT/RPT001.cshtml @@ -1,4 +1,6 @@ -@{ +@model AMESCoreStudio.WebApi.DTO.AMES.RPT001ViewDto + +@{ ViewData["Title"] = "生產即時看板"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } @@ -63,14 +65,28 @@
-
-
-
-
@ViewBag.Title
+
+
+
+
+
@ViewBag.Title
+
+
+
+ +
+ +
+
+
+ +
+
-
- +
@@ -90,7 +106,7 @@
生產力
- 71.20 + @Model.productiveForces

%

@@ -98,7 +114,7 @@
生產效率
- 93.88 + @Model.productivity

%

@@ -115,21 +131,21 @@
IPQC合格率
- 99.8 + @Model.ipqc

%

測試直通率
-
- 96.2 +
+ @Model.test

%

FQC合格率
-
- 97.7 +
+ @Model.fqc

%

@@ -147,22 +163,22 @@
出勤率
-
- 91.2 +
+ @Model.attendance

%

加班工時
-
- 324 +
+ @Model.overtime

H

無效工時
-
- 109.4 +
+ @Model.invalidHours

H

@@ -178,22 +194,22 @@
未結工單數
-
- 11 +
+ @Model.openOrderWipQty

張

完工入庫數
-
- 94 +
+ @Model.finishedProducts

pcs

異常工時
-
- 39.7 +
+ @Model.abnormalTime

H

@@ -201,4 +217,20 @@
-
\ No newline at end of file + +
+@section Scripts { + +} \ No newline at end of file diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs new file mode 100644 index 00000000..2c99a854 --- /dev/null +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -0,0 +1,73 @@ +using AMESCoreStudio.CommonTools.Result; +using AMESCoreStudio.WebApi.Models.BAS; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using System.Threading.Tasks; +using System; +using System.Net.Mail; +using Microsoft.Extensions.Configuration; +using System.Net; +using System.Linq; +using System.Text.RegularExpressions; +using System.IO; +using AMESCoreStudio.WebApi.Controllers.AMES; +using AMESCoreStudio.WebApi.DTO.AMES; + + +namespace AMESCoreStudio.WebApi.Controllers.BLL +{ + /// + /// 報表資料 + /// + [Route("api/[controller]")] + [ApiController] + public class RPTController : Controller + { + private readonly AMESContext _context; + private readonly IConfiguration _config; + + /// + /// 建構式 + /// + /// + public RPTController(AMESContext context, IConfiguration config) + { + _config = config; + _context = context; + } + + /// + /// 生產即時效率 + /// + /// 開始日期 + /// 結束日期 + /// + [HttpGet("GetRPT001View")] + public async Task GetRPT001View(string sDate, string eDate) + { + if (string.IsNullOrWhiteSpace(sDate) || string.IsNullOrWhiteSpace(eDate)) + { + sDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1).ToString("yyyy/MM/dd"); + eDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.DaysInMonth(DateTime.Now.Year, DateTime.Now.Month)).ToString("yyyy/MM/dd"); + } + + var result = new RPT001ViewDto(); + // 未結工單數 + var a = await new WipInfosController(_context).GetWipInfoPCS008(new DTO.AMES.WipInfoDto + { + date_str = sDate, + date_end = eDate + }); + result.openOrderWipQty = a.DataTotal; + + // 完工入庫數：GetFqcInhouseMasterMultiQuery + var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, ""); + result.finishedProducts = b.DataTotal; + + //異常工時：GetExceptionWorktimeByQueryWHS009 + //var c = new ExceptionWorktimesController(_context).GetExceptionWorktimeByQueryWHS009("*", "*", "*", "*", sDate, eDate); + + return result; + } + } +} diff --git a/AMESCoreStudio.WebApi/DTO/AMES/RPT001VIiewDto.cs b/AMESCoreStudio.WebApi/DTO/AMES/RPT001VIiewDto.cs new file mode 100644 index 00000000..57a3511a --- /dev/null +++ b/AMESCoreStudio.WebApi/DTO/AMES/RPT001VIiewDto.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +#nullable disable + +namespace AMESCoreStudio.WebApi.DTO.AMES +{ + public partial class RPT001ViewDto + { + public RPT001ViewDto() + { + + } + + /// + /// 生產力 + /// + public double productiveForces { get; set; } = 0.0; + + /// + /// 生產效率 + /// + public double productivity { get; set; } = 0.0; + + /// + /// IPQC合格率 + /// + public double ipqc { get; set; } = 0.0; + + /// + /// 測試直通率 + /// + public double test { get; set; } = 0.0; + + /// + /// FQC合格率 + /// + public double fqc { get; set; } = 0.0; + + /// + /// 出勤率 + /// + public double attendance { get; set; } = 0.0; + + /// + /// 加班工時 + /// + public double overtime { get; set; } = 0.0; + + /// + /// 無效工時 + /// + public double invalidHours { get; set; } = 0.0; + + /// + /// 未結工單數 + /// + public int openOrderWipQty { get; set; } = 0; + + /// + /// 完工入庫數 + /// + public int finishedProducts { get; set; } = 0; + + /// + /// 異常工時 + /// + public double abnormalTime { get; set; } = 0.0; + + } +}