Merge branch 'feature/智能货架'

货架标准上位机/ViewModels/InOutRecordViewModel.cs

@@ -243,7 +243,7 @@ namespace 货架标准上位机.ViewModel
                     UserName = LocalStatic.CurrentUser,
                     DeviceType = LocalFile.Config.DeviceType,
                     PageNumber = CurrentPage,
-                    PageSize = 10,
+                    PageSize = PageSize,
                 };
                 var Result = ApiHelp.GetDataFromHttp<PageQueryResponse<InOutRecordModel>>(LocalFile.Config.ApiIpHost + "inOutRecord/getInOutRecord", body, "POST");
                 if (Result != null && Result.Data != null && Result.Data.Lists != null)
@@ -293,7 +293,7 @@ namespace 货架标准上位机.ViewModel
                     UserName = LocalStatic.CurrentUser,
                     DeviceType = LocalFile.Config.DeviceType,
                     PageNumber = CurrentPage,
-                    PageSize = 10,
+                    PageSize = 65535,
                 };
                 await ApiHelp.PostDownloadFileAsync(path, System.Net.Http.HttpMethod.Post, LocalFile.Config.ApiIpHost + "inOutRecord/exportInOutRecord", body);
                 Growl.Success("导出成功！");
@@ -334,6 +334,14 @@ namespace 货架标准上位机.ViewModel
             set { SetProperty(ref totalCount, value); }
         }
 
+        private int pageSize = 10;
+        public int PageSize
+        {
+            get => pageSize;
+            set { SetProperty(ref pageSize, value); }
+        }
+
+
         public ICommand BtnFirstPageCommand { get => new DelegateCommand(BtnFirstPage); }
         public void BtnFirstPage()
         {