Browse Source

质检操作查询校验单数据时增加质检状态(全部、已质检、未质检)的筛选条件

SunYaLong 10 months ago
parent
commit
8fcb033c83

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

@@ -195,6 +195,14 @@
             BN/SN码 
             </summary>
         </member>
+        <member name="P:ZR.Model.Dto.Inspect.SapDeliverRecordSumQueryDto.CheckStatus">
+            <summary>
+            质检状态。
+            -1:查询所有;
+            0:查询已经质检完成的数据;
+            1:查询未质检完成的数据
+            </summary>
+        </member>
         <member name="T:ZR.Model.Dto.InStore.InInstoreRecordQueryDto">
             <summary>
             入库管理/入库记录表查询对象

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

@@ -152,8 +152,13 @@ namespace ZR.Model.Dto.Inspect
     {
         public string DeliverNo { get; set; }
         public string MaterialSpec { get; set; }
-
-        public bool? IsComplate { get; set; }
+        /// <summary>
+        /// 质检状态。
+        /// -1:查询所有;
+        /// 0:查询已经质检完成的数据;
+        /// 1:查询未质检完成的数据
+        /// </summary>
+        public int CheckStatus { get; set; }
     }
     public class PrintLabelQueryDto : PagerInfo
     {

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

@@ -240,9 +240,23 @@ namespace ZR.Service.Business.Inspect
                     KeyFlag = x.KeyFlag,
                     SumQty = SqlFunc.AggregateSum(x.Qty),
                     SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
-                })
-                .HavingIF(parm.IsComplate == true, x => x.SumQty > x.SumCheckQty).ToPage(parm);
-            return response;
+                });
+            if (parm.CheckStatus == -1)
+            {
+                return response.ToPage(parm);
+            }
+            else if (parm.CheckStatus == 0)
+            {
+                return response.Having(x => x.SumQty == x.SumCheckQty).ToPage(parm);
+            }
+            else if (parm.CheckStatus == 1)
+            {
+                return response.Having(x => x.SumQty > x.SumCheckQty).ToPage(parm);
+            }
+            else
+            {
+                return null;
+            }
         }
         public bool GetSapDeliverIsAllChecked(string deliverNo)
         {