增加QaDto字段

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/DataProtection/key-61d96a2c-f382-4628-89cf-f8d4e4fac901.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="61d96a2c-f382-4628-89cf-f8d4e4fac901" version="1">
+  <creationDate>2023-05-22T01:18:01.356485Z</creationDate>
+  <activationDate>2023-05-23T15:41:37.8203495Z</activationDate>
+  <expirationDate>2023-08-20T01:18:01.3051803Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>nw5uATyvJw3uj6Gg9e0TaaHC9TKY+lJ+AtGYpmJEIx0Ki36TTEqdE6GWWORvv7oK1YbdiwIZVW/3JRpjrjx1FA==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>

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

@@ -12,6 +12,31 @@ namespace ZR.Model.Dto
     /// </summary>
     public class QaInspectRecordQueryDto : PagerInfo
     {
+        //交验单号
+        public string DeliverNo { get; set; }
+        //质检记录单号
+        public string InspectNo { get; set; }
+        //生产令号
+        public string BomNo { get; set; }
+        //BN/SN码
+        public string BnSnCode { get; set; }
+        //物料编码
+        public string MaterialCode { get; set; }
+        //物料名称
+        public string MaterialName { get; set; }
+        //物料类型
+        public string Category { get; set; }
+        //规格型号
+        public string MaterialSpec { get; set; }
+        //关键件标识
+        public bool? KeyFlag { get; set; }
+        //质检结果
+        public string Result { get; set; }
+        //创建时间
+
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
+
     }
 
     /// <summary>

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

@@ -7,6 +7,7 @@ using ZR.Model.Models;
 using ZR.Repository;
 using ZR.Service.Business.IBusinessService;
 using System.Linq;
+using Infrastructure;
 
 namespace ZR.Service.Business
 {
@@ -30,7 +31,22 @@ namespace ZR.Service.Business
         {
             //开始拼装查询条件
             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);
+                predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
+            }
+            predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), d => d.BomNo.Contains(parm.BomNo));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.InspectNo), d => d.InspectNo.Contains(parm.InspectNo));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            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.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
                 .Where(predicate.ToExpression())