更新首页统计数据

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Balance/StkBalanceDtlController.cs

@@ -58,7 +58,28 @@ namespace ZR.Admin.WebApi.Controllers.Balance
             var response = _StkBalanceDtlService.StatList(parm);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 获取库存关键件非关键件数量
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("KeyStatistics")]
+        [ActionPermissionFilter(Permission = "business:stkbalancedtl:keystatistics")]
+        public IActionResult KeyStatisticsStkBalanceDtl()
+        {
+            var response = _StkBalanceDtlService.GetKeyStatistics();
+            return SUCCESS(response);
+        }
+        /// <summary>
+        /// 获取库存物料类别分别数量
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("CategoryStatistics")]
+        [ActionPermissionFilter(Permission = "business:stkbalancedtl:categorystatistics")]
+        public IActionResult CategoryStatisticsStkBalanceDtl()
+        {
+            var response = _StkBalanceDtlService.GetCategoryStatistics();
+            return SUCCESS(response);
+        }
         /// <summary>
         /// 查询库存管理/库存明细表详情
         /// </summary>

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/InStore/InInstoreRecordController.cs

@@ -66,7 +66,17 @@ namespace ZR.Admin.WebApi.Controllers.InStore
             var response = _InInstoreRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 获取每日入库物料数
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("DailyStatistics")]
+        [ActionPermissionFilter(Permission = "business:ininstorerecord:dailystatistics")]
+        public IActionResult DailyStatistics()
+        {
+            var response = _InInstoreRecordService.GetDailyStatistics(DateTime.Today.AddDays(-30), DateTime.Today.AddDays(1));
+            return SUCCESS(response);
+        }
 
         /// <summary>
         /// 查询入库管理/入库记录表详情

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/QaInspectRecordController.cs

@@ -13,6 +13,7 @@ using ZR.Model.Models.Inspect;
 using ZR.Service.Business.Inspect;
 using UAParser;
 using System.Net.Security;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Admin.WebApi.Controllers.Inspect
 {
@@ -63,7 +64,17 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             var response = _QaInspectRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 获取每日质检物料数
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("DailyStatistics")]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:dailystatistics")]
+        public IActionResult DailyStatistics()
+        {
+            var response = _QaInspectRecordService.GetDailyStatistics(DateTime.Today.AddDays(-30),DateTime.Today.AddDays(1));
+            return SUCCESS(response);
+        }
 
         /// <summary>
         /// 查询质检管理/质检记录表详情

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/OutAssembleRecordController.cs

@@ -64,7 +64,17 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             var response = _OutAssembleRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 获取每日装配物料数
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("DailyStatistics")]
+        [ActionPermissionFilter(Permission = "business:outassemblerecord:dailystatistics")]
+        public IActionResult DailyStatistics()
+        {
+            var response = _OutAssembleRecordService.GetDailyStatistics(DateTime.Today.AddDays(-30), DateTime.Today.AddDays(1));
+            return SUCCESS(response);
+        }
 
         /// <summary>
         /// 查询出库管理/装配记录表详情

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/OutOutstoreRecordController.cs

@@ -15,6 +15,7 @@ using ZR.Model.Dto.Balance;
 using ZR.Model.Models.Balance;
 using ZR.Model.Models;
 using UAParser;
+using ZR.Service.Business.OutStore;
 
 namespace ZR.Admin.WebApi.Controllers.OutStore
 {
@@ -63,7 +64,17 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             var response = _OutOutstoreRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 获取每日出库物料数
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("DailyStatistics")]
+        [ActionPermissionFilter(Permission = "business:outoutstorerecord:dailystatistics")]
+        public IActionResult DailyStatistics()
+        {
+            var response = _OutOutstoreRecordService.GetDailyStatistics(DateTime.Today.AddDays(-30), DateTime.Today.AddDays(1));
+            return SUCCESS(response);
+        }
 
         /// <summary>
         /// 查询出库管理/出库记录表详情

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/ZRModel.xml

@@ -1166,6 +1166,26 @@
             单位 
             </summary>
         </member>
+        <member name="P:ZR.Model.Models.Statistics.GroupByCategory.Category">
+            <summary>
+            物料类别
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Statistics.GroupByCategory.SumQty">
+            <summary>
+            Sum数量
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Statistics.GroupByKey.KeyFlag">
+            <summary>
+            关键件标识（0非关键件，1关键件） 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.Statistics.GroupByKey.SumQty">
+            <summary>
+            Sum数量
+            </summary>
+        </member>
         <member name="T:ZR.Model.Models.CommonLang">
              <summary>
              多语言配置，数据实体对象

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/appsettings.json

@@ -9,6 +9,7 @@
   "ConnectionStrings": {
     //"conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn_db": "Data Source=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db_type": "0" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },
   "urls": "http://localhost:8888;http://192.168.137.1:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
@@ -46,6 +47,7 @@
   "gen": {
     //"conn": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn": "Data Source=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "dbType": 0, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "admin",

ZrAdminNetCore-net7.0/ZR.Model/Models/OutStore/OutOutstoreRecord.cs

@@ -57,7 +57,7 @@ namespace ZR.Model.Models.OutStore
         /// <summary>
         /// 出库数量 
         /// </summary>
-        public int? OutStoreQty { get; set; }
+        public int OutStoreQty { get; set; }
 
         /// <summary>
         /// 出库结果（0未出库，99出库完成） 

ZrAdminNetCore-net7.0/ZR.Model/Models/Statistics/GroupByCategory.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Models.Statistics
+{
+    public class GroupByCategory
+    {
+        /// <summary>
+        /// 物料类别
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// Sum数量
+        /// </summary>
+        public int SumQty { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Model/Models/Statistics/GroupByKey.cs

@@ -0,0 +1,22 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Models.Statistics
+{
+    public class GroupByKey
+    {
+        /// <summary>
+        /// 关键件标识（0非关键件，1关键件） 
+        /// </summary>
+        public bool KeyFlag { get; set; }
+
+        /// <summary>
+        /// Sum数量
+        /// </summary>
+        public int SumQty { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Service/Business/Balance/StkBalanceDtlService.cs

@@ -13,6 +13,8 @@ using ZR.Model.Dto.Balance;
 using ZR.Model.Models.BaseSet;
 using ZR.Model.Models.Balance;
 using Mapster;
+using ZR.Model.Models.InStore;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.Balance
 {
@@ -115,6 +117,44 @@ namespace ZR.Service.Business.Balance
 
             return response;
         }
+
+
+        public List<GroupByKey> GetKeyStatistics()
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<StkBalanceDtl>();
+            //predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.KeyFlag })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByKey
+                {
+                    KeyFlag = d.KeyFlag,
+                    SumQty = SqlFunc.AggregateSum(d.BalanceQty),
+                })
+                .ToList();
+
+            return response;
+        }
+        public List<GroupByCategory> GetCategoryStatistics()
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<StkBalanceDtl>();
+            //predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.Category })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByCategory
+                {
+                    Category = d.Category,
+                    SumQty = SqlFunc.AggregateSum(d.BalanceQty),
+                })
+                .ToList();
+
+            return response;
+        }
         /// <summary>
         /// 添加库存管理/库存明细表
         /// </summary>

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/Balance/IStkBalanceDtlService.cs

@@ -3,6 +3,7 @@ using ZR.Model;
 using System.Collections.Generic;
 using ZR.Model.Dto.Balance;
 using ZR.Model.Models.Balance;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.Balance
 {
@@ -16,6 +17,8 @@ namespace ZR.Service.Business.IBusinessService.Balance
     {
         PagedInfo<StkBalanceDtlDto> GetList(StkBalanceDtlQueryDto parm);
         PagedInfo<StkBalanceDtlDto> StatList(StkBalanceDtlQueryDto parm);
+        List<GroupByKey> GetKeyStatistics();
+        List<GroupByCategory> GetCategoryStatistics();
 
         int AddStkBalanceDtl(StkBalanceDtl parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/InStore/IInInstoreRecordService.cs

@@ -3,6 +3,7 @@ using ZR.Model;
 using System.Collections.Generic;
 using ZR.Model.Dto.InStore;
 using ZR.Model.Models.InStore;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.InStore
 {
@@ -15,7 +16,7 @@ namespace ZR.Service.Business.IBusinessService.InStore
     public interface IInInstoreRecordService : IBaseService<InInstoreRecord>
     {
         PagedInfo<InInstoreRecordDto> GetList(InInstoreRecordQueryDto parm, bool isPdaQuery = false);
-
+        List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime);
         int AddInInstoreRecord(InInstoreRecord parm);
 
         int UpdateInInstoreRecord(InInstoreRecord parm);

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/Inspect/IQaInspectRecordService.cs

@@ -3,6 +3,7 @@ using ZR.Model;
 using System.Collections.Generic;
 using ZR.Model.Dto.Inspect;
 using ZR.Model.Models.Inspect;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.Inspect
 {
@@ -15,6 +16,7 @@ namespace ZR.Service.Business.IBusinessService.Inspect
     public interface IQaInspectRecordService : IBaseService<QaInspectRecord>
     {
         PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm, bool isPdaQuery = false);
+        List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime);
 
         int AddQaInspectRecord(QaInspectRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/OutStore/IOutAssembleRecordService.cs

@@ -3,6 +3,7 @@ using ZR.Model;
 using System.Collections.Generic;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.OutStore
 {
@@ -15,6 +16,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
     public interface IOutAssembleRecordService : IBaseService<OutAssembleRecord>
     {
         PagedInfo<OutAssembleRecordDto> GetList(OutAssembleRecordQueryDto parm, bool isPdaQuery = false);
+        List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime);
 
         int AddOutAssembleRecord(OutAssembleRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/OutStore/IOutOutstoreRecordService.cs

@@ -3,6 +3,7 @@ using ZR.Model;
 using System.Collections.Generic;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.OutStore
 {
@@ -15,6 +16,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
     public interface IOutOutstoreRecordService : IBaseService<OutOutstoreRecord>
     {
         PagedInfo<OutOutstoreRecordDto> GetList(OutOutstoreRecordQueryDto parm, bool isPdaQuery = false);
+        List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime);
 
         int AddOutOutstoreRecord(OutOutstoreRecord parm);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/InStore/InInstoreRecordService.cs

@@ -9,6 +9,9 @@ using ZR.Model.System;
 using ZR.Service.Business.IBusinessService.InStore;
 using ZR.Model.Dto.InStore;
 using ZR.Model.Models.InStore;
+using System.Collections.Generic;
+using ZR.Model.Models.Inspect;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.InStore
 {
@@ -64,7 +67,24 @@ namespace ZR.Service.Business.InStore
             return response;
         }
 
+        public List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<InInstoreRecord>();
+            predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.KeyFlag })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByKey
+                {
+                    KeyFlag = d.KeyFlag,
+                    SumQty = SqlFunc.AggregateSum(d.InStoreQty),
+                })
+                .ToList();
 
+            return response;
+        }
         /// <summary>
         /// 添加入库管理/入库记录表
         /// </summary>

ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/QaInspectRecordService.cs

@@ -13,6 +13,7 @@ using ZR.Model.Dto.Inspect;
 using ZR.Model.Models.Inspect;
 using Mapster;
 using System.Collections.Generic;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.Inspect
 {
@@ -67,7 +68,24 @@ namespace ZR.Service.Business.Inspect
             return response;
         }
 
+        public List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<QaInspectRecord>();
+            predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.KeyFlag })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByKey
+                {
+                    KeyFlag=d.KeyFlag,
+                    SumQty = SqlFunc.AggregateSum(d.CheckQty),
+                })
+                .ToList();
 
+            return response;
+        }
         /// <summary>
         /// 添加质检管理/质检记录表
         /// </summary>

ZrAdminNetCore-net7.0/ZR.Service/Business/OutStore/OutAssembleRecordService.cs

@@ -8,6 +8,9 @@ using Infrastructure;
 using ZR.Service.Business.IBusinessService.OutStore;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
+using System.Collections.Generic;
+using ZR.Model.Models.InStore;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.OutStore
 {
@@ -61,7 +64,24 @@ namespace ZR.Service.Business.OutStore
 
             return response;
         }
+        public List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<OutAssembleRecord>();
+            predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.KeyFlag })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByKey
+                {
+                    KeyFlag = d.KeyFlag,
+                    SumQty = SqlFunc.AggregateSum(d.AssembleQty),
+                })
+                .ToList();
 
+            return response;
+        }
 
         /// <summary>
         /// 添加出库管理/装配记录表

ZrAdminNetCore-net7.0/ZR.Service/Business/OutStore/OutOutstoreRecordService.cs

@@ -8,6 +8,8 @@ using Infrastructure;
 using ZR.Service.Business.IBusinessService.OutStore;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
+using System.Collections.Generic;
+using ZR.Model.Models.Statistics;
 
 namespace ZR.Service.Business.OutStore
 {
@@ -63,7 +65,24 @@ namespace ZR.Service.Business.OutStore
 
             return response;
         }
+        public List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<OutOutstoreRecord>();
+            predicate.And(d => d.CreateTime >= BeginTime && d.CreateTime <= EndTime);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.KeyFlag })
+                .Where(predicate.ToExpression())
+                .Select(d => new GroupByKey
+                {
+                    KeyFlag = d.KeyFlag,
+                    SumQty = SqlFunc.AggregateSum(d.OutStoreQty),
+                })
+                .ToList();
 
+            return response;
+        }
 
         /// <summary>
         /// 添加出库管理/出库记录表