123

ZR.Service/mes/wms/WmOneTimeInventoryService.cs

@@ -294,7 +294,7 @@ namespace ZR.Service.mes.wms
 				//.Where(it => it.Code == "自动")
 				.Where(it => it.ActionTime >= minDateTime)
 				.ToList();
-			foreach (WmOneTimeInventoryDto item in list)
+            foreach (WmOneTimeInventoryDto item in list)
 			{
 				int? runum = wmOneTimeRecords
 				   .Where(o =>
@@ -314,10 +314,10 @@ namespace ZR.Service.mes.wms
 					.Sum();
 				item.RealQuantity = item.Quantity.Value + (runum.Value - chunum.Value);
 			}
-
 			list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0)
 				.Where(it => !string.IsNullOrEmpty(it.Partnumber))
 				.DistinctBy(it => it.Partnumber)
+                .OrderBy(it => it.RealQuantity)
 				.ToList();
 
 			int total = list.Count;
@@ -335,7 +335,8 @@ namespace ZR.Service.mes.wms
 					StocktakingTotal = StocktakingTotal,
 					QuantitySum = QuantitySum,
 					RealQuantitySum = RealQuantitySum,
-					Result = list.Skip((parm.PageNum - 1) * parm.PageSize)
+                    MinStocktakingTime = minDateTime,
+                    Result = list.Skip((parm.PageNum - 1) * parm.PageSize)
 						.Take(parm.PageSize)
 						.ToList(),
 				};