diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/device/DeviceDataAnalysisController.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/device/DeviceDataAnalysisController.cs
new file mode 100644
index 0000000..0750fa2
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/device/DeviceDataAnalysisController.cs
@@ -0,0 +1,134 @@
+using Microsoft.AspNetCore.Mvc;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model.MES.dev.Dto;
+using DOAN.Service.MES.dev.IService;
+
+namespace DOAN.WebApi.Controllers.MES.dev
+{
+    /// <summary>
+    /// 数据分析 
+    /// </summary>
+    [Verify]
+    [Route("mes/deviceManagement/dataAnalysis")]
+    public class DeviceDataAnalysisController : BaseController
+    {
+        private readonly IDeviceDataAnalysisServcie deviceDataAnalysisServcie;
+
+        public DeviceDataAnalysisController(IDeviceDataAnalysisServcie deviceDataAnalysisServcie) 
+        {
+            this.deviceDataAnalysisServcie = deviceDataAnalysisServcie;
+        }
+
+        /// <summary>
+        /// 故障类型 pie
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("defaultTypePie")]
+        public IActionResult FaultTypePie([FromBody] DeviceDefaultDto    devicedefault) 
+        {
+            if (devicedefault == null) {
+                return SUCCESS(null);            
+            }
+           var response=  deviceDataAnalysisServcie.DefaultTypePie(devicedefault);
+           return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 每日故障数量
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("faultTypeBar")]
+        public IActionResult FaultTypeBar([FromBody] DeviceDefaultDto devicedefault)
+        {
+
+            if (devicedefault == null)
+            {
+                return SUCCESS(null);
+            }
+            var response = deviceDataAnalysisServcie.FaultTypeBar(devicedefault);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取设备故障类别累计次数折线图
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("faultTypeLine")]
+        public IActionResult FaultTypeLine([FromBody] DeviceDefaultDto devicedefault)
+        {
+
+            if (devicedefault == null)
+            {
+                return SUCCESS(null);
+            }
+            var response = deviceDataAnalysisServcie.FaultTypeLine(devicedefault);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取每天的错误类型
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("faultTypeBarByDay")]
+        public IActionResult FaultTypeBarByDay([FromBody] DeviceDefaultDto devicedefault)
+        {
+            if (devicedefault == null)
+            {
+                return SUCCESS(null);
+            }
+            var response = deviceDataAnalysisServcie.FaultTypeBarByDay(devicedefault);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取每日点检巡检总数折线图
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("taskLinebyDay")]
+        public IActionResult TaskLinebyDay([FromBody] DeviceDefaultDto devicedefault)
+        {
+            if (devicedefault == null)
+            {
+                return SUCCESS(null);
+            }
+            var response = deviceDataAnalysisServcie.TaskLinebyDay(devicedefault);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取人员响应折线图
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("personResponseLine")]
+        public IActionResult PersonResponse([FromBody] DeviceDefaultDto devicedefault)
+        {
+            if (devicedefault == null)
+            {
+                return SUCCESS(null);
+            }
+            var response = deviceDataAnalysisServcie.PersonResponse(devicedefault);
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取大屏总数
+        /// </summary>
+        /// <param name="devicedefault"></param>
+        /// <returns></returns>
+        [HttpPost("getAllTotal")]
+        public IActionResult GetAllTotal()
+        {
+            
+            var response = deviceDataAnalysisServcie.GetAllTotal();
+            return SUCCESS(response);
+        }
+    }
+}
diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs
new file mode 100644
index 0000000..29e52df
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/material/MaterialProgressScreenController.cs
@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Mvc;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Service.MES.bigScreen.IService;
+using DOAN.Infrastructure;
+
+namespace DOAN.WebApi.Controllers.MES.BigScreen
+{
+    /// <summary>
+    /// 设备台账
+    /// </summary>
+    [Verify]
+    [Route("mes/bigscreen/materialprogress")]
+    public class MaterialProgressScreenController : BaseController
+    {
+        private readonly IMaterialProgressService materialProgressService;
+
+
+        public MaterialProgressScreenController(IMaterialProgressService materialProgressService)
+        {
+            this.materialProgressService = materialProgressService;
+        }
+
+        /// <summary>
+        /// 查看备料进度大屏
+        /// </summary>
+        /// <param name="dateTime"></param>
+        /// <returns></returns>
+        /// <exception cref="CustomException"></exception>
+        [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
new file mode 100644
index 0000000..abaa786
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs
@@ -0,0 +1,148 @@
+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
+{
+    /// <summary>
+    /// 生产大屏2 version 2
+    /// </summary>
+    [AllowAnonymous]
+    [Route("mes/bigscreen/product2")]
+    public class Product2Controller : BaseController
+    {
+        private readonly IProduct2BigScreenService productBigScreenService;
+
+        public Product2Controller(IProduct2BigScreenService _product2BigScreenService)
+        {
+            productBigScreenService = _product2BigScreenService;
+        }
+
+        /// <summary>
+        /// 数字牌
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle01")]
+        public IActionResult GetMoudle01()
+        {
+            var response = productBigScreenService.GetMoudle01();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 班组进度统计
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle02")]
+        public IActionResult GetMoudle02()
+        {
+            var response = productBigScreenService.GetMoudle02();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 昨天 班组报工数 和计划数对比
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle03")]
+        public IActionResult GetMoudle03()
+        {
+            var response = productBigScreenService.GetMoudle03();
+            return SUCCESS(response);
+            
+        }
+
+        /// <summary>
+        /// 昨天 班组报工数 和计划数对比 折线图 不完成TOP
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle09")]
+        public IActionResult GetMoudle09()
+        {
+            var response = productBigScreenService.GetMoudle09();
+            return SUCCESS(response);
+            
+        }
+
+
+        /// <summary>
+        /// 上周 班组报工数 和计划数对比
+        /// </summary>
+        /// <returns></returns>
+        
+        [HttpGet("getMoudle04")]
+        public IActionResult GetMoudle04()
+        {
+            var response = productBigScreenService.GetMoudle04();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 上周 班组报工数 和计划数对比 折线图 不完成TOP
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle10")]
+        public IActionResult GetMoudle10()
+        {
+            var response = productBigScreenService.GetMoudle10();
+            return SUCCESS(response);
+            
+        }
+
+
+        /// <summary>
+        /// 今天异常工单
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle05")]
+        public IActionResult GetMoudle05()
+        {
+            var response = productBigScreenService.GetMoudle05();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 本月 工单达成率
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getMoudle06")]
+        public IActionResult GetMoudle06()
+        {
+            var response = productBigScreenService.GetMoudle06();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+         /// 本月 生产产品  top10
+         /// </summary>
+         /// <returns></returns>
+        [HttpGet("getMoudle07")]
+        public IActionResult GetMoudle07()
+        {
+            var response = productBigScreenService.GetMoudle07();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 本月 报工不满原因  top10
+        /// </summary>
+        /// <returns></returns>
+        [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
new file mode 100644
index 0000000..8f2b457
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/ProductController.cs
@@ -0,0 +1,120 @@
+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
+{
+    /// <summary>
+    /// 生产大屏
+    /// </summary>
+    [AllowAnonymous]
+    [Route("mes/bigscreen/product")]
+    public class ProductController : BaseController
+    {
+        private readonly IProductBigScreenService  productBigScreenService;
+
+        public ProductController(IProductBigScreenService  _productBigScreenService)
+        {
+            productBigScreenService = _productBigScreenService;
+        }
+
+        // GET  ProductBigScreenMoudle01Dto
+        /// <summary>
+        /// 获取产量
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle01")]
+        public IActionResult GetMoudle01()
+        {
+            ProductBigScreenMoudle01Dto response = productBigScreenService.GetMoudle01();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 前7日产量趋势统计图 （折线图）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle02")]
+        public IActionResult GetMoudle02()
+        {
+            EchartsOptions  response= productBigScreenService.GetMoudle02();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 前7日工单趋势统计图 （直方图）
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle03")]
+        public IActionResult GetMoudle03()
+        {
+            EchartsOptions  response= productBigScreenService.GetMoudle03();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 今日超时工单占比
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle04")]
+        public IActionResult GetMoudle04()
+        {
+            EchartsOptions  response= productBigScreenService.GetMoudle04();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 前七日工单异常分布占比
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle05")]
+        public IActionResult GetMoudle05()
+        {
+            EchartsOptions  response= productBigScreenService.GetMoudle05();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取今日工单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle06")]
+        public IActionResult GetMoudle06()
+        {
+            var  response= productBigScreenService.GetMoudle06();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取今日异常工单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle07")]
+        public IActionResult GetMoudle07()
+        {
+            var  response= productBigScreenService.GetMoudle07();
+            
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取昨天工单报工数
+        /// </summary>
+        /// <returns></returns>
+        [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
new file mode 100644
index 0000000..c56d50d
--- /dev/null
+++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/quality/QualityController.cs
@@ -0,0 +1,141 @@
+using Microsoft.AspNetCore.Mvc;
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Service.MES.bigScreen.IService;
+using DOAN.Infrastructure;
+
+namespace DOAN.WebApi.Controllers.MES.BigScreen
+{
+    /// <summary>
+    /// 质量大屏
+    /// </summary>
+    [AllowAnonymous]
+    [Route("mes/bigscreen/quality")]
+    public class QualityController : BaseController
+    {
+        private readonly  IQualityBigScreenService bigScreenService;
+
+        public QualityController(IQualityBigScreenService bigScreenService)
+        {
+             this.bigScreenService=bigScreenService;
+        }
+
+        /// <summary>
+        /// 获取数字翻牌器
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet("get_moudle01")]
+        public IActionResult GetMoudle00()
+        {
+            var response = bigScreenService.GetMoudle00();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取昨天 IQC list
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle02")]
+        public IActionResult GetMoudle10()
+        {
+            var response = bigScreenService.GetMoudle10();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取昨日IQC 缺陷饼图
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle03")]
+        public IActionResult GetMoudle01()
+        {
+            var response = bigScreenService.GetMoudle01();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取本月   IQC 缺陷折线图
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet("get_moudle04")]
+        public IActionResult GetMoudle04()
+        {
+            var response = bigScreenService.GetMoudle04();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取昨天 IPQC list
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle05")]
+        public IActionResult GetMoudle11()
+        {
+            var response = bigScreenService.GetMoudle11();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取昨日IPQC 缺陷饼图
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet("get_moudle06")]
+        public IActionResult GetMoudle02()
+        {
+            var response = bigScreenService.GetMoudle02();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取本月  IPQC 缺陷折线图
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle07")]
+        public IActionResult GetMoudle05()
+        {
+            var response = bigScreenService.GetMoudle05();
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 获取昨天 FQC list
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("get_moudle08")]
+        public IActionResult GetMoudle12()
+        {
+            var response = bigScreenService.GetMoudle12();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取今日FQC 缺陷饼图
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet("get_moudle09")]
+        public IActionResult GetMoudle03()
+        {
+            var response = bigScreenService.GetMoudle03();
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 获取本月   FQC 缺陷折线图
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpGet("get_moudle10")]
+        public IActionResult GetMoudle06()
+        {
+            var response = bigScreenService.GetMoudle06();
+            return SUCCESS(response);
+        }
+    }
+}
\ No newline at end of file