上一次修改

.gitignore

@@ -110,3 +110,4 @@ Backup*/
 UpgradeLog*.XML
 
 /ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/export
+/ZrAdminNetCore-net7.0/ZR.Admin.WebApi/DataProtection

ZrAdminNetCore-net7.0/ZR.Model/Dto/Balance/StkBalanceDtlDto.cs

@@ -27,6 +27,7 @@ namespace ZR.Model.Dto.Balance
         public string MaterialName { get; set; }
         ///规格型号/图号
         public string MaterialSpec { get; set; }
+        public string Category { get; set; }
         ///库存状态
         public int? Status { get; set; }
         ///关键件标识

ZrAdminNetCore-net7.0/ZR.Model/Dto/InStore/InInstoreRecordDto.cs

@@ -18,6 +18,7 @@ namespace ZR.Model.Dto.InStore
         public string MaterialName { get; set; }
         public string MaterialSpec { get; set; }
         public string Category { get; set; }
+        public bool? KeyFlag { get; set; }
         public int? Result { get; set; }
         public DateTime? BeginTime { get; set; }
         public DateTime? EndTime { get; set; }

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

@@ -54,6 +54,7 @@ namespace ZR.Service.Business.Balance
             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(parm.Status != null, d => d.Status == parm.Status);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
             predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.MaterialSpec.Contains(parm.BnSnCode));
             //先判断搜索条件中有没有bincode
@@ -100,6 +101,7 @@ namespace ZR.Service.Business.Balance
             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(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.MaterialSpec.Contains(parm.BnSnCode));
 
             //搜索条件查询语法参考Sqlsugar

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

@@ -58,6 +58,7 @@ namespace ZR.Service.Business.InStore
 
             predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), it => it.BnSnCode.Contains(parm.BnSnCode));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), it => it.Category == parm.Category);
+            predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             predicate.AndIF(parm.Result != null, it => it.Result == parm.Result);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()