diff --git a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderController.cs b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderController.cs deleted file mode 100644 index 27e5c5a..0000000 --- a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderController.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Order -{ - public class OrderController - { - } -} diff --git a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderSmartController.cs b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderSmartController.cs new file mode 100644 index 0000000..96a7a43 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Order/OrderSmartController.cs @@ -0,0 +1,42 @@ +using DOAN.Admin.WebApi.Filters; +using DOAN.Model.MES.order.Dto; +using DOAN.Service.MES.order; +using DOAN.Service.MES.order.IService; +using DOAN.Service.MES.SmartScreen.Order.IService; +using Infrastructure.Converter; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Mvc; +using RouteAttribute = Microsoft.AspNetCore.Mvc.RouteAttribute; + +namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Order +{ + /// + /// 采购订单 + /// + [Verify] + [Route("mes/orderManagement/OrderSmart")] + public class OrderSmartController : BaseController + { + /// + /// 采购订单接口 + /// + private readonly IOrderSmartService _OrderSmartService; + + public OrderSmartController(IOrderSmartService OrderSmartService) + { + _OrderSmartService = OrderSmartService; + } + + /// + /// 查询订单大屏头信息 + /// + /// + [HttpGet("GetLargeScreenOrder")] + public IActionResult GetLargeScreenOrder() + { + + var response = _OrderSmartService.GetLargeScreenOrder(); + return SUCCESS(response); + } + } +} diff --git a/DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj b/DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj index 7cceccf..e0720ac 100644 --- a/DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj +++ b/DOAN.Admin.WebApi/DOAN.Admin.WebApi.csproj @@ -27,10 +27,6 @@ - - - - diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 01bb70f..ab79f5a 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -2,8 +2,8 @@ "dbConfigs": [ { // 远程测试服务器 - "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=bzfm_mes;Port=3306", - //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=bzfm_mes;Port=3308", + // "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=bzfm_mes;Port=3306", + "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=bzfm_mes;Port=3308", // "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=bzfm_mes;Port=3306", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 diff --git a/DOAN.Model/DOAN.Model.csproj b/DOAN.Model/DOAN.Model.csproj index df4b7e7..7f2c2ac 100644 --- a/DOAN.Model/DOAN.Model.csproj +++ b/DOAN.Model/DOAN.Model.csproj @@ -12,11 +12,4 @@ - - - - - - - diff --git a/DOAN.Model/MES/SmartScreen/Order/LargeScreenOrderDto.cs b/DOAN.Model/MES/SmartScreen/Order/LargeScreenOrderDto.cs new file mode 100644 index 0000000..aaa7ce0 --- /dev/null +++ b/DOAN.Model/MES/SmartScreen/Order/LargeScreenOrderDto.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.SmartScreen.Order +{ + public class LargeScreenOrderDto + { + /// + /// 订单总数 + /// + public int OrderTotalNum { get; set; } + + /// + /// 未完成订单总数 + /// + public int IncompleteOrderNum { get; set; } + + /// + /// 已完成订单总数 + /// + public int CompletedOrderNum { get; set; } + + /// + /// 本月订单总数 + /// + public int MonthOrderTotalNum { get; set; } + + /// + /// 本月已完成订单总数 + /// + public int MonthIncompleteOrderNum { get; set; } + + /// + /// 本月未完成订单总数 + /// + public int MonthCompletedOrderNum { get; set; } + + } +} diff --git a/DOAN.Model/MES/SmartScreen/Order/Order.cs b/DOAN.Model/MES/SmartScreen/Order/Order.cs deleted file mode 100644 index 2c7cde0..0000000 --- a/DOAN.Model/MES/SmartScreen/Order/Order.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DOAN.Model.MES.SmartScreen.Order -{ - internal class Order - { - } -} diff --git a/DOAN.Service/DOAN.Service.csproj b/DOAN.Service/DOAN.Service.csproj index 5090ff3..0bea15a 100644 --- a/DOAN.Service/DOAN.Service.csproj +++ b/DOAN.Service/DOAN.Service.csproj @@ -15,11 +15,5 @@ - - - - - - diff --git a/DOAN.Service/MES/SmartScreen/Order/IService/IOrderService.cs b/DOAN.Service/MES/SmartScreen/Order/IService/IOrderService.cs deleted file mode 100644 index 94ce908..0000000 --- a/DOAN.Service/MES/SmartScreen/Order/IService/IOrderService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DOAN.Service.MES.SmartScreen.Order.IService -{ - internal class IOrderService - { - } -} diff --git a/DOAN.Service/MES/SmartScreen/Order/IService/IOrderSmartService.cs b/DOAN.Service/MES/SmartScreen/Order/IService/IOrderSmartService.cs new file mode 100644 index 0000000..9a37829 --- /dev/null +++ b/DOAN.Service/MES/SmartScreen/Order/IService/IOrderSmartService.cs @@ -0,0 +1,22 @@ +using DOAN.Model.MES.order; +using DOAN.Model.MES.order.Dto; +using DOAN.Model.MES.SmartScreen.Order; +using Infrastructure.Attribute; +using Microsoft.AspNetCore.Http; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.SmartScreen.Order.IService +{ + /// + /// 采购订单service接口 + /// + public interface IOrderSmartService : IBaseService + { + + LargeScreenOrderDto GetLargeScreenOrder(); + } +} diff --git a/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs new file mode 100644 index 0000000..8d97879 --- /dev/null +++ b/DOAN.Service/MES/SmartScreen/Order/OrderSmartService.cs @@ -0,0 +1,45 @@ + +using DOAN.Model.MES.order; +using Infrastructure.Attribute; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DOAN.Service.MES.SmartScreen.Order.IService; +using DOAN.Model.MES.order.Dto; +using DOAN.Model.MES.SmartScreen.Order; +using MathNet.Numerics.Distributions; +using NPOI.SS.Formula.Functions; + +namespace DOAN.Service.MES.SmartScreen.Order +{ + /// + /// 采购订单Service业务层处理 + /// + [AppService(ServiceType = typeof(IOrderSmartService), ServiceLifetime = LifeTime.Transient)] + + public class OrderSmartService : BaseService, IOrderSmartService + { + public LargeScreenOrderDto GetLargeScreenOrder() + { + // 当前日期 + DateTime now = DateTime.Now; + // 当前月份的第一天 00:00:00 + DateTime firstDayOfMonth = new DateTime(now.Year, now.Month, 1); + // 当前月份的最后一天 23:59:59 + DateTime lastDayOfMonth = new DateTime(now.Year, now.Month, 1) + .AddMonths(1) + .AddSeconds(-1); + var response = Queryable().ToList(); + LargeScreenOrderDto largeScreenOrderDto = new LargeScreenOrderDto(); + largeScreenOrderDto.OrderTotalNum = response.Count; + largeScreenOrderDto.IncompleteOrderNum = response.Where(o=>o.Orderindicator==0).Count(); + largeScreenOrderDto.CompletedOrderNum = response.Where(o => o.Orderindicator == 1).Count(); + largeScreenOrderDto.MonthOrderTotalNum = response.Where(o=>o.DocumentDate>= firstDayOfMonth&&o.DocumentDate<= lastDayOfMonth).Count(); + largeScreenOrderDto.MonthIncompleteOrderNum = response.Where(o => o.DocumentDate >= firstDayOfMonth && o.DocumentDate <= lastDayOfMonth && o.Orderindicator == 0).Count(); + largeScreenOrderDto.MonthCompletedOrderNum = response.Where(o => o.DocumentDate >= firstDayOfMonth && o.DocumentDate <= lastDayOfMonth && o.Orderindicator == 1).Count(); + return largeScreenOrderDto; + } + } +}