修正时间搜索条件

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

@@ -16,6 +16,7 @@ using System.Net.Security;
 using ZR.Model.Models.Statistics;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
+using ZR.Model.Dto.Statistics;
 
 namespace ZR.Admin.WebApi.Controllers.Inspect
 {
@@ -66,6 +67,11 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             var response = _QaInspectRecordService.GetList(parm, isPDA);
             return SUCCESS(response);
         }
+        /// <summary>
+        /// 关键件追溯报表，质检作为业务流程的第一道，所以报表以质检表为基础，控制器代码也写在这里
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
         [HttpGet("report")]
         [ActionPermissionFilter(Permission = "business:qainspectrecord:report")]
         public IActionResult QaReport([FromQuery] QaInspectRecordQueryDto parm)
@@ -74,7 +80,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             return SUCCESS(response);
         }
         /// <summary>
-        /// 获取每日质检物料数
+        /// 获取当日质检物料数
         /// </summary>
         /// <returns></returns>
         [HttpGet("DailyStatistics")]
@@ -84,6 +90,10 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             var response = _QaInspectRecordService.GetDailyStatistics(DateTime.Today,DateTime.Today.AddDays(1));
             return SUCCESS(response);
         }
+        /// <summary>
+        /// 获取昨天质检物料数
+        /// </summary>
+        /// <returns></returns>
         [HttpGet("YesterdayDailyStatistics")]
         [ActionPermissionFilter(Permission = "business:qainspectrecord:dailystatistics")]
         public IActionResult YesterdayDailyStatistics()
@@ -92,6 +102,18 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             return SUCCESS(response);
         }
         /// <summary>
+        /// 获取合格率
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("PercentOfPass")]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:percentofpass")]
+        public IActionResult QueryPercentOfPass([FromQuery] PercentOfPassDto parm)
+        {
+            var response = _QaInspectRecordService.GetPercentOfPasses(parm);
+            return SUCCESS(response);
+        }
+        /// <summary>
         /// 查询质检管理/质检记录表详情
         /// </summary>
         /// <param name="InspectId"></param>

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

@@ -7,8 +7,8 @@
     }
   },
   "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=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
   },
@@ -45,8 +45,8 @@
     "SendUser": "@all"
   },
   "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=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, //自动去除表前缀

ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/QaInspectRecordDto.cs

@@ -1,9 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Newtonsoft.Json;
 using SqlSugar;
-using ZR.Model.Models;
 
 namespace ZR.Model.Dto.Inspect
 {
@@ -32,6 +30,8 @@ namespace ZR.Model.Dto.Inspect
         public bool? KeyFlag { get; set; }
         //质检结果
         public string Result { get; set; }
+        //入库结果。0：未入库；99：入库完成。 
+        public int? InstoreResult { get; set; }
         //创建时间
 
         public DateTime? BeginTime { get; set; }

ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/SapDeliverRecordDto.cs

@@ -23,6 +23,8 @@ namespace ZR.Model.Dto.Inspect
         public string MaterialSpec { get; set; }
         //关键件标识
         public bool? KeyFlag { get; set; }
+        //Bn / SN码
+        public string BnSnCode { get; set; }
         //交验单号
         public string DeliverNo { get; set; }
         //生产令号
@@ -79,6 +81,8 @@ namespace ZR.Model.Dto.Inspect
         [Required(ErrorMessage = "关键件标识（0非关键件，1关键件）不能为空")]
         public bool KeyFlag { get; set; }
 
+        public string BnSnCode { get; set; }
+
         [Required(ErrorMessage = "交验单数量不能为空")]
         public int Qty { get; set; }
 

ZrAdminNetCore-net7.0/ZR.Model/Dto/Statistics/PercentOfPassDto.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Dto.Statistics
+{
+    public class PercentOfPassDto
+    {
+        //物料类型
+        public string Category { get; set; }
+        //关键件
+        public bool? KeyFlag { get; set; }
+        //质检结果
+        public string CheckResult { get; set; }
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+    }
+}

ZrAdminNetCore-net7.0/ZR.Model/Models/Inspect/SapDeliverRecord.cs

@@ -104,6 +104,12 @@ namespace ZR.Model.Models.Inspect
         [SugarColumn(ColumnName = "submit_inspect_result")]
         public bool SubmitInspectResult { get; set; }
 
+        #region 表外字段
+        [SugarColumn(IsIgnore = true)]
+        //Bn / SN码
+        public string BnSnCode { get; set; }
+
+        #endregion
 
     }
 

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

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.Models.Statistics
+{
+    public class PercentOfPass
+    {
+        //物料类型
+        public string Category { get; set; }
+        //关键件
+        public bool KeyFlag { get; set; }
+        //质检结果
+        public string CheckResult { get; set; }
+        //数量
+        public int Qty { get; set; }
+    }
+}

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

@@ -41,8 +41,8 @@ namespace ZR.Service.Business.Balance
 
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(parm.RegionId > 0, d => d.RegionId == parm.RegionId);

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

@@ -6,6 +6,7 @@ using ZR.Model.Models.Inspect;
 using ZR.Model.Models.Statistics;
 using ZR.Model.Dto.InStore;
 using ZR.Model.Models.InStore;
+using ZR.Model.Dto.Statistics;
 
 namespace ZR.Service.Business.IBusinessService.Inspect
 {
@@ -27,6 +28,7 @@ namespace ZR.Service.Business.IBusinessService.Inspect
 
         void TruncateQaInspectRecord();
         List<QaInspectRecord> GetSelect(QaInspectRecordQueryDto parm);
+        public List<PercentOfPass> GetPercentOfPasses(PercentOfPassDto parm);
 
         #region 2023 0524 孙亚龙 新增
         List<SapDeliverDto> GetCheckedDeliverData(QaInspectRecordQueryNoPageDto parm);

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

@@ -37,8 +37,8 @@ namespace ZR.Service.Business.InStore
             var predicate = Expressionable.Create<InInstoreRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), it => it.DeliverNo.Contains(parm.DeliverNo));
@@ -92,8 +92,8 @@ namespace ZR.Service.Business.InStore
             var predicate = Expressionable.Create<InInstoreRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), it => it.DeliverNo.Contains(parm.DeliverNo));

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

@@ -34,8 +34,8 @@ namespace ZR.Service.Business.InStore
             var predicate = Expressionable.Create<InRetreatRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode));
@@ -58,8 +58,8 @@ namespace ZR.Service.Business.InStore
             var predicate = Expressionable.Create<InRetreatRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), it => it.MaterialCode.Contains(parm.MaterialCode));

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

@@ -17,6 +17,7 @@ using ZR.Model.Models.Statistics;
 using ZR.Model.Models.BaseSet;
 using ZR.Model.Models.InStore;
 using ZR.Model.Models.OutStore;
+using ZR.Model.Dto.Statistics;
 
 namespace ZR.Service.Business.Inspect
 {
@@ -42,8 +43,8 @@ namespace ZR.Service.Business.Inspect
             var predicate = Expressionable.Create<QaInspectRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
@@ -62,6 +63,7 @@ namespace ZR.Service.Business.Inspect
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
             predicate.AndIF(!string.IsNullOrEmpty(parm.Result), d => d.Result == parm.Result);
+            predicate.AndIF(parm.InstoreResult != null, d => d.InstoreResult == parm.InstoreResult);
             predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
@@ -70,15 +72,19 @@ namespace ZR.Service.Business.Inspect
 
             return response;
         }
-
+        /// <summary>
+        /// 质检记录导出
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
         public List<QaInspectRecord> GetSelect(QaInspectRecordQueryDto parm)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<QaInspectRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
@@ -159,7 +165,12 @@ namespace ZR.Service.Business.Inspect
 
             return response;
         }
-
+        /// <summary>
+        /// 获取时间段内质检的关键件数和非关键件数
+        /// </summary>
+        /// <param name="BeginTime"></param>
+        /// <param name="EndTime"></param>
+        /// <returns></returns>
         public List<GroupByKey> GetDailyStatistics(DateTime BeginTime, DateTime EndTime)
         {
             //开始拼装查询条件
@@ -178,6 +189,28 @@ namespace ZR.Service.Business.Inspect
 
             return response;
         }
+        public List<PercentOfPass> GetPercentOfPasses(PercentOfPassDto parm)
+        {
+            var predicate = Expressionable.Create<QaInspectRecord>();
+            if (parm.BeginTime != null && parm.EndTime != null)
+            {
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
+                predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
+            }
+            predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
+            var response = Queryable()
+                .GroupBy(d => new { d.Result })
+                .Where(predicate.ToExpression())
+                .Select(d => new PercentOfPass
+                {
+                    Qty = SqlFunc.AggregateSumNoNull(d.CheckQty),
+                    CheckResult = d.Result
+                }, true)
+                .ToList();
+            return response;
+        }
         /// <summary>
         /// 添加质检管理/质检记录表
         /// </summary>

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

@@ -25,7 +25,7 @@ namespace ZR.Service.Business.Inspect
     {
         #region 依赖注入
         private IQaInspectRecordService QaInspectRecordService { get; set; }
-        public SapDeliverRecordService(IQaInspectRecordService qaInspectRecordService) 
+        public SapDeliverRecordService(IQaInspectRecordService qaInspectRecordService)
         {
             QaInspectRecordService = qaInspectRecordService;
         }
@@ -45,8 +45,8 @@ namespace ZR.Service.Business.Inspect
 
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
@@ -59,7 +59,15 @@ namespace ZR.Service.Business.Inspect
             predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
+                .LeftJoin<QaInspectRecord>((d, qa) => d.DeliverNo == qa.DeliverNo
+                                                   && d.BomNo == qa.BomNo
+                                                   && d.MaterialCode == qa.MaterialCode)
                 .Where(predicate.ToExpression())
+                .GroupBy((d, qa) => new { d.Id })
+                .Select((d, qa) => new SapDeliverRecord
+                {
+                    BnSnCode = qa.BnSnCode
+                }, true)
                 .ToPage<SapDeliverRecord, SapDeliverRecordDto>(parm);
 
             return response;
@@ -191,7 +199,8 @@ namespace ZR.Service.Business.Inspect
             var response = Queryable()
                 .GroupBy(x => new { x.MaterialCode, x.MaterialName, x.MaterialSpec })
                 .Where(predicate.ToExpression())
-                .Select(x => new {
+                .Select(x => new
+                {
                     x.MaterialCode,
                     x.MaterialName,
                     x.MaterialSpec,
@@ -203,7 +212,7 @@ namespace ZR.Service.Business.Inspect
                 return response[0].Adapt<SapDeliverRecordSumDto>();
             }
             else
-            { 
+            {
                 return null;
             }
         }
@@ -225,7 +234,7 @@ namespace ZR.Service.Business.Inspect
                     SumQty = SqlFunc.AggregateSum(x.Qty),
                     SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
                 }).ToPage(parm);
-                return response;
+            return response;
         }
         public bool GetSapDeliverIsAllChecked(string deliverNo)
         {
@@ -260,7 +269,7 @@ namespace ZR.Service.Business.Inspect
             {
                 return false;
             }
-            int rows = Update(new SapDeliverRecord { SubmitInspectResult = true }, it => new { it.SubmitInspectResult},f => f.DeliverNo == deliverNo);
+            int rows = Update(new SapDeliverRecord { SubmitInspectResult = true }, it => new { it.SubmitInspectResult }, f => f.DeliverNo == deliverNo);
             int rows1 = QaInspectRecordService.Update(new QaInspectRecord { AllowInstore = true }, it => new { it.AllowInstore }, f => f.DeliverNo == deliverNo);
             if (rows > 0 && rows1 > 0)
             {

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

@@ -36,8 +36,8 @@ namespace ZR.Service.Business.OutStore
             var predicate = Expressionable.Create<OutAssembleRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), it => it.BomNo.Contains(parm.BomNo));
@@ -71,8 +71,8 @@ namespace ZR.Service.Business.OutStore
             var predicate = Expressionable.Create<OutAssembleRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), it => it.BomNo.Contains(parm.BomNo));

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

@@ -35,8 +35,8 @@ namespace ZR.Service.Business.OutStore
             var predicate = Expressionable.Create<OutOutstoreRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.OutSotreNo), it => it.OutSotreNo.Contains(parm.OutSotreNo));
@@ -72,8 +72,8 @@ namespace ZR.Service.Business.OutStore
             var predicate = Expressionable.Create<OutOutstoreRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(it => it.CreateTime >= parm.BeginTime && it.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.OutSotreNo), it => it.OutSotreNo.Contains(parm.OutSotreNo));

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

@@ -35,8 +35,8 @@ namespace ZR.Service.Business.OutStore
             var predicate = Expressionable.Create<SapBomRecord>();
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), d => d.BomNo.Contains(parm.BomNo));

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

@@ -40,8 +40,8 @@ namespace ZR.Service.Business.OutStore
 
             if (parm.BeginTime != null && parm.EndTime != null)
             {
-                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
-                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                parm.BeginTime = parm.BeginTime.Value.ToLocalTime();
+                parm.EndTime = parm.EndTime.Value.ToLocalTime();
                 predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
             }
             predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.OutTaskNo), d => d.OutTaskNo.Contains(parm.OutTaskNo));