diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs deleted file mode 100644 index 29e52df..0000000 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs +++ /dev/null @@ -1,42 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using DOAN.Admin.WebApi.Filters; -using DOAN.Service.MES.bigScreen.IService; -using DOAN.Infrastructure; - -namespace DOAN.WebApi.Controllers.MES.BigScreen -{ - /// - /// 设备台账 - /// - [Verify] - [Route("mes/bigscreen/materialprogress")] - public class MaterialProgressScreenController : BaseController - { - private readonly IMaterialProgressService materialProgressService; - - - public MaterialProgressScreenController(IMaterialProgressService materialProgressService) - { - this.materialProgressService = materialProgressService; - } - - /// - /// 查看备料进度大屏 - /// - /// - /// - /// - [HttpGet("view_Material_paration_progress")] - public IActionResult ViewMaterialParationProgress(DateTime dateTime) - { - dateTime = ConvertDateTime.ConvertLocalDate(dateTime); - if (dateTime == DateTime.MinValue) { throw new CustomException("dateTime 为空"); } - - var response = materialProgressService.ViewMaterialParationProgress(dateTime); - - - return SUCCESS(response); - } - } -} - diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs deleted file mode 100644 index abaa786..0000000 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs +++ /dev/null @@ -1,148 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using DOAN.Admin.WebApi.Filters; -using DOAN.Service.MES.bigScreen.IService; -using DOAN.Infrastructure; -using DOAN.Model.MES.bigscreen.Dto; -using DOAN.Model.mes.echarts; - -namespace DOAN.WebApi.Controllers.MES.BigScreen -{ - /// - /// 生产大屏2 version 2 - /// - [AllowAnonymous] - [Route("mes/bigscreen/product2")] - public class Product2Controller : BaseController - { - private readonly IProduct2BigScreenService productBigScreenService; - - public Product2Controller(IProduct2BigScreenService _product2BigScreenService) - { - productBigScreenService = _product2BigScreenService; - } - - /// - /// 数字牌 - /// - /// - [HttpGet("getMoudle01")] - public IActionResult GetMoudle01() - { - var response = productBigScreenService.GetMoudle01(); - return SUCCESS(response); - } - - /// - /// 班组进度统计 - /// - /// - [HttpGet("getMoudle02")] - public IActionResult GetMoudle02() - { - var response = productBigScreenService.GetMoudle02(); - return SUCCESS(response); - } - - /// - /// 昨天 班组报工数 和计划数对比 - /// - /// - [HttpGet("getMoudle03")] - public IActionResult GetMoudle03() - { - var response = productBigScreenService.GetMoudle03(); - return SUCCESS(response); - - } - - /// - /// 昨天 班组报工数 和计划数对比 折线图 不完成TOP - /// - /// - [HttpGet("getMoudle09")] - public IActionResult GetMoudle09() - { - var response = productBigScreenService.GetMoudle09(); - return SUCCESS(response); - - } - - - /// - /// 上周 班组报工数 和计划数对比 - /// - /// - - [HttpGet("getMoudle04")] - public IActionResult GetMoudle04() - { - var response = productBigScreenService.GetMoudle04(); - return SUCCESS(response); - } - - /// - /// 上周 班组报工数 和计划数对比 折线图 不完成TOP - /// - /// - [HttpGet("getMoudle10")] - public IActionResult GetMoudle10() - { - var response = productBigScreenService.GetMoudle10(); - return SUCCESS(response); - - } - - - /// - /// 今天异常工单 - /// - /// - [HttpGet("getMoudle05")] - public IActionResult GetMoudle05() - { - var response = productBigScreenService.GetMoudle05(); - return SUCCESS(response); - } - - /// - /// 本月 工单达成率 - /// - /// - [HttpGet("getMoudle06")] - public IActionResult GetMoudle06() - { - var response = productBigScreenService.GetMoudle06(); - return SUCCESS(response); - } - - /// - /// 本月 生产产品 top10 - /// - /// - [HttpGet("getMoudle07")] - public IActionResult GetMoudle07() - { - var response = productBigScreenService.GetMoudle07(); - return SUCCESS(response); - } - - /// - /// 本月 报工不满原因 top10 - /// - /// - [HttpGet("getMoudle77")] - public IActionResult GetMoudle77() - { - var response = productBigScreenService.GetMoudle77(); - return SUCCESS(response); - } - - - [HttpGet("getMoudle08")] - public IActionResult GetMoudle08() - { - var response = productBigScreenService.GetMoudle08(); - return SUCCESS(response); - } - } -} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/ProductController.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/ProductController.cs deleted file mode 100644 index 8f2b457..0000000 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/ProductController.cs +++ /dev/null @@ -1,120 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using DOAN.Admin.WebApi.Filters; -using DOAN.Service.MES.bigScreen.IService; -using DOAN.Infrastructure; -using DOAN.Model.MES.bigscreen.Dto; -using DOAN.Model.mes.echarts; - -namespace DOAN.WebApi.Controllers.MES.BigScreen -{ - /// - /// 生产大屏 - /// - [AllowAnonymous] - [Route("mes/bigscreen/product")] - public class ProductController : BaseController - { - private readonly IProductBigScreenService productBigScreenService; - - public ProductController(IProductBigScreenService _productBigScreenService) - { - productBigScreenService = _productBigScreenService; - } - - // GET ProductBigScreenMoudle01Dto - /// - /// 获取产量 - /// - /// - [HttpGet("get_moudle01")] - public IActionResult GetMoudle01() - { - ProductBigScreenMoudle01Dto response = productBigScreenService.GetMoudle01(); - return SUCCESS(response); - } - - /// - /// 前7日产量趋势统计图 （折线图） - /// - /// - [HttpGet("get_moudle02")] - public IActionResult GetMoudle02() - { - EchartsOptions response= productBigScreenService.GetMoudle02(); - - return SUCCESS(response); - } - - /// - /// 前7日工单趋势统计图 （直方图） - /// - /// - [HttpGet("get_moudle03")] - public IActionResult GetMoudle03() - { - EchartsOptions response= productBigScreenService.GetMoudle03(); - - return SUCCESS(response); - } - - /// - /// 今日超时工单占比 - /// - /// - [HttpGet("get_moudle04")] - public IActionResult GetMoudle04() - { - EchartsOptions response= productBigScreenService.GetMoudle04(); - - return SUCCESS(response); - } - - /// - /// 前七日工单异常分布占比 - /// - /// - [HttpGet("get_moudle05")] - public IActionResult GetMoudle05() - { - EchartsOptions response= productBigScreenService.GetMoudle05(); - - return SUCCESS(response); - } - - /// - /// 获取今日工单列表 - /// - /// - [HttpGet("get_moudle06")] - public IActionResult GetMoudle06() - { - var response= productBigScreenService.GetMoudle06(); - - return SUCCESS(response); - } - - /// - /// 获取今日异常工单列表 - /// - /// - [HttpGet("get_moudle07")] - public IActionResult GetMoudle07() - { - var response= productBigScreenService.GetMoudle07(); - - return SUCCESS(response); - } - - /// - /// 获取昨天工单报工数 - /// - /// - [HttpGet("get_moudle08")] - public IActionResult GetMoudle08() - { - var response= productBigScreenService.GetMoudle08(); - - return SUCCESS(response); - } - } -} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/quality/QualityController.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/quality/QualityController.cs deleted file mode 100644 index c56d50d..0000000 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/quality/QualityController.cs +++ /dev/null @@ -1,141 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using DOAN.Admin.WebApi.Filters; -using DOAN.Service.MES.bigScreen.IService; -using DOAN.Infrastructure; - -namespace DOAN.WebApi.Controllers.MES.BigScreen -{ - /// - /// 质量大屏 - /// - [AllowAnonymous] - [Route("mes/bigscreen/quality")] - public class QualityController : BaseController - { - private readonly IQualityBigScreenService bigScreenService; - - public QualityController(IQualityBigScreenService bigScreenService) - { - this.bigScreenService=bigScreenService; - } - - /// - /// 获取数字翻牌器 - /// - /// - - [HttpGet("get_moudle01")] - public IActionResult GetMoudle00() - { - var response = bigScreenService.GetMoudle00(); - return SUCCESS(response); - } - - /// - /// 获取昨天 IQC list - /// - /// - [HttpGet("get_moudle02")] - public IActionResult GetMoudle10() - { - var response = bigScreenService.GetMoudle10(); - return SUCCESS(response); - } - - /// - /// 获取昨日IQC 缺陷饼图 - /// - /// - [HttpGet("get_moudle03")] - public IActionResult GetMoudle01() - { - var response = bigScreenService.GetMoudle01(); - return SUCCESS(response); - } - - /// - /// 获取本月 IQC 缺陷折线图 - /// - /// - - [HttpGet("get_moudle04")] - public IActionResult GetMoudle04() - { - var response = bigScreenService.GetMoudle04(); - return SUCCESS(response); - } - - /// - /// 获取昨天 IPQC list - /// - /// - [HttpGet("get_moudle05")] - public IActionResult GetMoudle11() - { - var response = bigScreenService.GetMoudle11(); - return SUCCESS(response); - } - - - /// - /// 获取昨日IPQC 缺陷饼图 - /// - /// - - [HttpGet("get_moudle06")] - public IActionResult GetMoudle02() - { - var response = bigScreenService.GetMoudle02(); - return SUCCESS(response); - } - - - /// - /// 获取本月 IPQC 缺陷折线图 - /// - /// - [HttpGet("get_moudle07")] - public IActionResult GetMoudle05() - { - var response = bigScreenService.GetMoudle05(); - return SUCCESS(response); - } - - /// - /// 获取昨天 FQC list - /// - /// - [HttpGet("get_moudle08")] - public IActionResult GetMoudle12() - { - var response = bigScreenService.GetMoudle12(); - return SUCCESS(response); - } - - - /// - /// 获取今日FQC 缺陷饼图 - /// - /// - - [HttpGet("get_moudle09")] - public IActionResult GetMoudle03() - { - var response = bigScreenService.GetMoudle03(); - return SUCCESS(response); - } - - - /// - /// 获取本月 FQC 缺陷折线图 - /// - /// - - [HttpGet("get_moudle10")] - public IActionResult GetMoudle06() - { - var response = bigScreenService.GetMoudle06(); - return SUCCESS(response); - } - } -} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/device/DeviceDataAnalysisController.cs b/DOAN.Admin.WebApi/Controllers/MES/Device/DeviceDataAnalysisController.cs similarity index 100% rename from DOAN.Admin.WebApi/Controllers/MES/BigScreen/device/DeviceDataAnalysisController.cs rename to DOAN.Admin.WebApi/Controllers/MES/Device/DeviceDataAnalysisController.cs diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 580f396..cbbc6bf 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -17,6 +17,7 @@ "IsAutoCloseConnection": true, "DbName": "bzfm_mes" //代码生成默认连接数据库,Oracle库是实例的名称 }, + "ShowDbLog": true, //是否打印db日志 "urls": "http://localhost:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改 "corsUrls": [ "http://localhost:8887", "http://localhost:8886", "http://localhost:9090", "http://localhost:8080" ] //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 } \ No newline at end of file diff --git a/DOAN.Admin.WebApi/appsettings.Production.json b/DOAN.Admin.WebApi/appsettings.Production.json index 7426e0c..15c623f 100644 --- a/DOAN.Admin.WebApi/appsettings.Production.json +++ b/DOAN.Admin.WebApi/appsettings.Production.json @@ -17,6 +17,7 @@ "IsAutoCloseConnection": true, "DbName": "bzfm_mes" //代码生成默认连接数据库,Oracle库是实例的名称 }, + "ShowDbLog": false, //是否打印db日志 "urls": "http://0.0.0.0:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改 "corsUrls": [ "http://localhost:8887", "http://localhost:8886", "http://localhost:9090", "http://localhost:8080" ] //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开 } \ No newline at end of file diff --git a/DOAN.Admin.WebApi/appsettings.json b/DOAN.Admin.WebApi/appsettings.json index 3830605..0e66047 100644 --- a/DOAN.Admin.WebApi/appsettings.json +++ b/DOAN.Admin.WebApi/appsettings.json @@ -18,7 +18,7 @@ "TokenType": "Bearer" }, "InjectClass": [ "DOAN.Repository", "DOAN.Service", "DOAN.Tasks", "DOAN.ServiceCore" ], //自动注入类 - "ShowDbLog": true, //是否打印db日志 + "InitDb": false, //(新建项目的时候需要)是否初始化db "DemoMode": false, //是否演示模式 "SingleLogin": false, //是否允许多设备/浏览器登录 diff --git a/DOAN.Model/MES/Bigscreen/Dto/MaterialProgressDto.cs b/DOAN.Model/MES/Bigscreen/Dto/MaterialProgressDto.cs new file mode 100644 index 0000000..c187960 --- /dev/null +++ b/DOAN.Model/MES/Bigscreen/Dto/MaterialProgressDto.cs @@ -0,0 +1,73 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.bigscreen.Dto +{ + public class MaterialProgressDto + { + + public DateTime Date { get; set; } + /// + /// 产线 code + /// + public string LineCode { get; set; } + /// + /// 产线 name + /// + public string LineName { get; set; } + + + public List materialInfos { get; set; } + + + + } + public class MaterialProgressDto2 + { + + public DateTime Date { get; set; } + /// + /// 产线 code + /// + public string LineCode { get; set; } + /// + /// 产线 name + /// + public string LineName { get; set; } + public string MaterialCode { get; set; } + + + public string MaterialName { get; set; } + + + + public decimal PlanNum { get; set; } + + + public decimal ActualNum { get; set; } + + + } + + + public class MaterialInfo + { + public string MaterialCode { get; set; } + + + public string MaterialName { get; set; } + + + + public decimal PlanNum { get; set; } + + + public decimal ActualNum { get; set; } + + + } + +} diff --git a/DOAN.Model/MES/Bigscreen/Dto/ProductBigScreenDto.cs b/DOAN.Model/MES/Bigscreen/Dto/ProductBigScreenDto.cs new file mode 100644 index 0000000..3e5185a --- /dev/null +++ b/DOAN.Model/MES/Bigscreen/Dto/ProductBigScreenDto.cs @@ -0,0 +1,114 @@ +namespace DOAN.Model.MES.bigscreen.Dto +{ + + + public class ProductBigScreenMoudle01Dto + { + /// + /// 当日产量 + /// + public int TodayOutputQuantity { get; set; } + + /// + /// 当日工单 + /// + public int TodayWorkOrderQuantity { get; set; } + + + /// + /// 当周产量 + /// + public int WeekOutputQuantity { get; set; } + + + /// + /// 当周工单 + /// + public int WeekWorkOrderQuantity { get; set; } + + + /// + /// 今天异常工单数 + /// + public int TodayExceptionWorkOrderQuantity { get; set; } + + /// + /// 本周异常工单数 + /// + public int WeekExceptionWorkOrderQuantity { get; set; } + } + + + + public class ProductBigScreenMoudle02Dto + { + /// + /// 今日班组数 + /// + public int TodayGroupQuantity { get; set; } + + + /// + /// 今日产线数 + /// + public int TodayLineQuantity { get; set; } + + + /// + /// 今天计划数 + /// + public int TodayPlanQuantity { get; set; } + + + /// + /// 今日实际产量数 + /// + public int TodayActionProductionQuantity { get; set; } + + + /// + /// 今日产成品种类数 + /// + public int TodayProductTypeQuantity { get; set; } + + + /// + /// 七日计划变更数 + /// + public int SevenDaysPriorPlanQuantity { get; set; } + } + + + + /// + /// 今日班组产量进度 + /// + public class TodayGroupProductionProgress + { + //组code + public string GroupCode { get; set; } + + //计划数 + public int PlanQuantity { get; set; } + + /// + ///报工数 + /// + public int ReportQuantity { get; set; } + } + + public class TodayExceptionWorkOrder + { + /// + /// 工单号 + /// + public string workorder { get; set; } + + + /// + /// 描述 + /// + public string description { get; set; } + } + +} diff --git a/DOAN.Model/MES/Bigscreen/Dto/QualityBigScreenDto.cs b/DOAN.Model/MES/Bigscreen/Dto/QualityBigScreenDto.cs new file mode 100644 index 0000000..9adcbca --- /dev/null +++ b/DOAN.Model/MES/Bigscreen/Dto/QualityBigScreenDto.cs @@ -0,0 +1,63 @@ +namespace DOAN.Model.MES.bigscreen.Dto +{ + /// + /// 数字翻牌器 + /// + public class QualityBigScreenDto + { + /// + /// 本周IQC + /// + public decimal WeekIQCquantity { get; set; } + + /// + /// 本月IQC + /// + public decimal MonthIQCquantity { get; set; } + + /// + /// 本周IPQC + /// + public decimal WeekIPQCquantity { get; set; } + + /// + /// 本月IPQC + /// + public decimal MonthIPQCquantity { get; set; } + + + /// + /// 本月FQC + /// + public decimal WeekFQCquantity { get; set; } + + /// + /// 本月FQC + /// + public decimal MonthFQCquantity { get; set; } + } + + + /// + /// 缺陷list + /// + public class DefectBigScreenDto + { + /// + /// 产线 + /// + public string LineCode { get; set; } + + /// + /// 缺陷描述 + /// + public string DefectDesciption { get; set; } + + /// + /// 缺陷数量 + /// + public decimal DefectQuantity { get; set; } + } + +} + diff --git a/DOAN.Model/MES/Bigscreen/Dto/WorkOrderBigScreenDto.cs b/DOAN.Model/MES/Bigscreen/Dto/WorkOrderBigScreenDto.cs new file mode 100644 index 0000000..f6cf23d --- /dev/null +++ b/DOAN.Model/MES/Bigscreen/Dto/WorkOrderBigScreenDto.cs @@ -0,0 +1,35 @@ +namespace DOAN.Model.MES.bigscreen.Dto; + +public class WorkOrderBigScreenDto +{ + /// + /// 工单号 + /// + public string Workorder { get; set; } + + + /// + /// 产品名称 + /// + public string ProductionName { get; set; } + + /// + /// 存货编码 + /// + public string ProductionCode { get; set; } + + /// + /// 派发数量 + /// + public int? DispatchNum { get; set; } + + /// + /// 完成数量 + /// + public int? FinishedNum { get; set; } + + /// + /// 状态 + /// + public int? Status { get; set; } +} \ No newline at end of file diff --git a/DOAN.Model/echarts/EchartsDto.cs b/DOAN.Model/echarts/EchartsDto.cs new file mode 100644 index 0000000..ab328c6 --- /dev/null +++ b/DOAN.Model/echarts/EchartsDto.cs @@ -0,0 +1,98 @@ +using Newtonsoft.Json.Converters; + +namespace DOAN.Model.mes.echarts +{ + + + + /// + /// echarts 通用Options返回值 + /// + public class EchartsOptions + { + public EchartsTitle Title { get; set; } = null; + public EchartsXAxis XAxis { get; set; } = null; + public EchartsYAxis YAxis { get; set; } = null; + public List Series { get; set; } = new List(); + } + + /// + /// echarts图表标题 + /// + public class EchartsTitle + { + public EchartsTitle(string Text,string SubText) + { + this.Text = Text; + this.SubText = SubText; + } + + public EchartsTitle(){} + public string Text { get; set; } = string.Empty; + public string SubText { get; set; } = string.Empty; + } + + /// + /// echarts X轴 + /// + public class EchartsXAxis + { + public List Data { get; set; } = new List(); + // public string[] Data { get; set; } =Array.Empty(); + + // value 数值轴，适用于连续数据 category 类目轴，适用于离散的类目数据 time 时间轴，适用于连续的时序数据 log 对数轴。适用于对数数据 + public string Type { get; set; } = "category"; + public string Max { get; set; } + public string Min { get; set; } + } + + /// + /// echarts Y轴 + /// + public class EchartsYAxis + { + public List Data { get; set; } = new List(); + + // value 数值轴，适用于连续数据 category 类目轴，适用于离散的类目数据 time 时间轴，适用于连续的时序数据 log 对数轴。适用于对数数据 + public string Type { get; set; } = "category"; + public string Max { get; set; } + public string Min { get; set; } + } + + /// + /// echarts图表series返回值 + /// + public class EchartsSeries + { + /// + /// 标签名称 + /// + public string Name { get; set; } = "category"; + + /// + /// bar-柱状图 line-折线图 EchartsSeriesType enum结构 + /// + public string Type { get; set; } = "bar"; + + /// + /// 参数值 + /// + public List Data { get; set; } = new List(); + } + + /// + /// echarts图表series返回值内容 + /// + public class EchartsSeriesData + { + /// + /// 标签名称 + /// + public string Name { get; set; } = string.Empty; + + /// + /// 参数值 + /// + public decimal Value { get; set; } = new decimal(); + } +}