From 410414b10e595fad7dd070e561361adb2519ea3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Thu, 7 Nov 2024 09:40:23 +0800
Subject: [PATCH] 1
---
src/Khd.Core.Wpf/CSS/PageControl.xaml | 27 ++++++
src/Khd.Core.Wpf/CSS/PageControl.xaml.cs | 101 ++++++++++++++++++++++
src/Khd.Core.Wpf/Form/FormBoardT.xaml | 16 +++-
src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs | 102 ++++++++++++++++++-----
src/Khd.Core.Wpf/appsettings.json | 4 +-
5 files changed, 224 insertions(+), 26 deletions(-)
create mode 100644 src/Khd.Core.Wpf/CSS/PageControl.xaml
create mode 100644 src/Khd.Core.Wpf/CSS/PageControl.xaml.cs
diff --git a/src/Khd.Core.Wpf/CSS/PageControl.xaml b/src/Khd.Core.Wpf/CSS/PageControl.xaml
new file mode 100644
index 0000000..7916800
--- /dev/null
+++ b/src/Khd.Core.Wpf/CSS/PageControl.xaml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Khd.Core.Wpf/CSS/PageControl.xaml.cs b/src/Khd.Core.Wpf/CSS/PageControl.xaml.cs
new file mode 100644
index 0000000..1fd9466
--- /dev/null
+++ b/src/Khd.Core.Wpf/CSS/PageControl.xaml.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Khd.Core.Wpf.CSS
+{
+ ///
+ /// PageControl.xaml 的交互逻辑
+ ///
+ public partial class PageControl : UserControl
+ {
+ public event RoutedEventHandler? PreviousPageClicked;
+ public event RoutedEventHandler? NextPageClicked;
+ public event SelectionChangedEventHandler? PageSizeComboBoxSelectionChanged;
+ public readonly PageInfo PageInfo = new();
+
+ public PageControl()
+ {
+ InitializeComponent();
+ this.PageControlGrid.DataContext = PageInfo;
+ }
+
+ private void PreviousPageButton_Click(object sender, RoutedEventArgs e)
+ {
+ PreviousPageClicked?.Invoke(this, e);
+ }
+
+ private void NextPageButton_Click(object sender, RoutedEventArgs e)
+ {
+ NextPageClicked?.Invoke(this, e);
+ }
+ }
+
+
+ #region PageInfo
+ public class PageInfo : INotifyPropertyChanged
+ {
+ private int _pageSize = 10;
+ private int _currentPage = 1;
+ private int _totalPage = 0;
+
+ public int PageSize
+ {
+ get => _pageSize;
+ set
+ {
+ if (_pageSize != value)
+ {
+ _pageSize = value;
+ OnPropertyChanged(nameof(PageSize));
+ }
+ }
+ }
+
+ public int CurrentPage
+ {
+ get => _currentPage;
+ set
+ {
+ if (_currentPage != value)
+ {
+ _currentPage = value;
+ OnPropertyChanged(nameof(CurrentPage));
+ }
+ }
+ }
+
+ public int TotalPage
+ {
+ get => _totalPage;
+ set
+ {
+ if (_totalPage != value)
+ {
+ _totalPage = value;
+ OnPropertyChanged(nameof(TotalPage));
+ }
+ }
+ }
+
+ public event PropertyChangedEventHandler? PropertyChanged;
+
+ protected void OnPropertyChanged(string propertyName)
+ {
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ #endregion
+}
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index dc373f5..7120b0c 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -4,6 +4,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Khd.Core.Wpf.myConverter"
+ xmlns:pg="clr-namespace:Khd.Core.Wpf.CSS"
mc:Ignorable="d"
WindowStyle="None"
Closing="Window_Closing"
@@ -1260,7 +1261,8 @@
-
+
+
@@ -1774,7 +1776,7 @@
-
+
@@ -1966,7 +1968,9 @@
-
+
+
+
@@ -2130,7 +2134,11 @@
-
+
+
+
+
+
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index 18ff12b..02f5a92 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
@@ -630,7 +630,7 @@ namespace Khd.Core.Wpf.Form
}).ToList();
//本次所有任务出来的托盘号
- List wcsTasks = dbContext.WcsTask.Where(t => t.taskType == 30&& targetRawOutstocks.Select(d=>d.materialId).Contains(t.materialId)).ToList();
+ List wcsTasks = dbContext.WcsTask.Where(t => t.taskType == 30 && targetRawOutstocks.Select(d => d.materialId).Contains(t.materialId)).ToList();
List containerNos = wcsTasks.Select(t => t.containerNo).ToList();
//本次所有托盘携带的物料
List wmsRawStocks = dbContext.WmsRawStock.Where(t => containerNos.Contains(t.palletInfoCode)).ToList();
@@ -1112,7 +1112,8 @@ namespace Khd.Core.Wpf.Form
///
private void btnGetStocK_Click(object sender, RoutedEventArgs e)
{
- Pagination1.PageIndex = 1;
+ //Pagination1.PageIndex = 1;
+ this.PageControl1.PageInfo.CurrentPage = 1;
this.EquipListSelectDy.SelectedIndex = -1;
locationDtos.Clear();
GetBaseLocations();
@@ -1169,12 +1170,12 @@ namespace Khd.Core.Wpf.Form
}
var data = dbContext.ExecuteSqlQuery(sql);
int sum = data.Count;
- data = data.Skip((this.Pagination1.PageIndex - 1) * this.pageCount).Take(this.pageCount).ToList();
+ data = data.Skip((this.PageControl1.PageInfo.CurrentPage - 1) * this.pageCount).Take(this.pageCount).ToList();
data.ForEach(t =>
{
t.LocationStatus = SystemData.LocationStatusDic.GetValueOrDefault(t.LocationStatus, "未知");
});
- Pagination1.MaxPageCount = (sum / pageCount) + (sum % pageCount == 0 ? 0 : 1);
+ this.PageControl1.PageInfo.TotalPage = (sum / pageCount) + (sum % pageCount == 0 ? 0 : 1);
this.LoadMaterial1.ItemsSource = null;
this.LoadMaterial1.ItemsSource = data;
this.LoadMaterial1.Items.Refresh();
@@ -1832,8 +1833,8 @@ namespace Khd.Core.Wpf.Form
{
TaskHistoryWindow taskHistoryWindow = new TaskHistoryWindow(_host);
taskHistoryWindow.ShowDialog();
-
-
+
+
}
catch (Exception ex)
{
@@ -2820,8 +2821,8 @@ namespace Khd.Core.Wpf.Form
}
if (wmsRawOutstocks.Count > 0)
{
-
- wmsRawOutstocks = wmsRawOutstocks.OrderBy(t => list[0]==t.endStationCode?0:99).ToList();
+
+ wmsRawOutstocks = wmsRawOutstocks.OrderBy(t => list[0] == t.endStationCode ? 0 : 99).ToList();
decimal? sum = wmsRawOutstocks.Sum(t => (t.outstockAmount - t.realOutstockAmount));
if (outScan > sum)
{
@@ -2832,7 +2833,7 @@ namespace Khd.Core.Wpf.Form
{
if (outScan <= 0)
{
- break;
+ break;
}
decimal outAmount = 0;
if (item.outstockAmount - item.realOutstockAmount > outScan)
@@ -3186,7 +3187,7 @@ namespace Khd.Core.Wpf.Form
}
catch (Exception ex)
{
- scanOutMsg.Text = "出库失败"+ex;
+ scanOutMsg.Text = "出库失败" + ex;
}
}
///
@@ -3194,19 +3195,20 @@ namespace Khd.Core.Wpf.Form
///
///
///
- private async void SelectButton_Click(object sender, RoutedEventArgs e)
+ private void SelectButton_Click(object sender, RoutedEventArgs e)
{
+ this.PageControl2.PageInfo.CurrentPage = 1;
CallSelectedItem.Clear();
- await GetPersonCallMaterialData();
+ GetPersonCallMaterialData();
}
///
/// 获取人员呼叫的物料数据
///
- private async Task GetPersonCallMaterialData()
+ private void GetPersonCallMaterialData()
{
try
{
- int pageNumber = this.Pagination2.PageIndex;
+ int pageNumber = this.PageControl2.PageInfo.CurrentPage;
// 计算跳过的记录数
int skip = (pageNumber - 1) * pageCount;
@@ -3237,7 +3239,7 @@ namespace Khd.Core.Wpf.Form
});
int totalRecords = groupWmsRawStock.Count();
- Pagination2.MaxPageCount = (totalRecords / pageCount) + (totalRecords % pageCount == 0 ? 0 : 1);
+ this.PageControl2.PageInfo.TotalPage = (totalRecords / pageCount) + (totalRecords % pageCount == 0 ? 0 : 1);
groupWmsRawStock = groupWmsRawStock.Skip(skip).Take(pageCount);
//.GroupBy(t => t.palletInfoCode)
//.Select(t => new
@@ -3248,14 +3250,14 @@ namespace Khd.Core.Wpf.Form
// materialId = string.Join("\n", t.Select(x => x.materialId)),
//}).ToList();
var palletInfoCodes = groupWmsRawStock.Select(t => t.palletInfoCode).Distinct().ToList();
- var wmsBaseLocations = await dbContext.WmsBaseLocation
+ var wmsBaseLocations = dbContext.WmsBaseLocation
.Where(t => t.ContainerStatus == "1")
.Where(t => t.warehouseId == 512)
- .Where(t => palletInfoCodes.Contains(t.containerCode)).ToListAsync();
+ .Where(t => palletInfoCodes.Contains(t.containerCode)).ToList();
if (string.IsNullOrEmpty(MaterialName.Text))
{
var tempMaterialIds = groupWmsRawStock.Select(x => x.materialId).Distinct().ToList();
- materialInfos = await dbContext.MesBaseMaterialInfo.Where(x => tempMaterialIds.Contains(x.MaterialId)).ToListAsync();
+ materialInfos = dbContext.MesBaseMaterialInfo.Where(x => tempMaterialIds.Contains(x.MaterialId)).ToList();
}
var bill = from a in wmsBaseLocations
from b in groupWmsRawStock
@@ -3318,7 +3320,7 @@ namespace Khd.Core.Wpf.Form
///
private async void Pagination2_PageUpdated(object sender, HandyControl.Data.FunctionEventArgs e)
{
- await GetPersonCallMaterialData();
+ GetPersonCallMaterialData();
}
///
/// 页码改变时
@@ -4808,6 +4810,7 @@ namespace Khd.Core.Wpf.Form
private void SelectInventoryButton_Click(object sender, RoutedEventArgs e)
{
+ this.PageControl3.PageInfo.CurrentPage = 1;
GetInvertoryData();
}
@@ -4831,7 +4834,7 @@ namespace Khd.Core.Wpf.Form
{
var list = dbContext.WmsInventoryCheck
.Where(t => t.WarehouseId == 512)
- .OrderByDescending(t => t.CreateTime).Skip((this.Pagination3.PageIndex - 1) * this.pageCount).Take(this.pageCount).ToList();
+ .OrderByDescending(t => t.CreateTime).Skip((this.PageControl3.PageInfo.CurrentPage - 1) * this.pageCount).Take(this.pageCount).ToList();
this.InventoryMaterial.ItemsSource = list.Select(t =>
new
{
@@ -5699,6 +5702,65 @@ namespace Khd.Core.Wpf.Form
}
}
+ private void PageControl1_PreviousPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl1.PageInfo.CurrentPage--;
+ if (this.PageControl1.PageInfo.CurrentPage < 1)
+ {
+ this.PageControl1.PageInfo.CurrentPage = 1;
+ }
+ GetLocations();
+ }
+
+ private void PageControl1_NextPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl1.PageInfo.CurrentPage++;
+ if (this.PageControl1.PageInfo.CurrentPage > this.PageControl1.PageInfo.TotalPage)
+ {
+ this.PageControl1.PageInfo.CurrentPage = this.PageControl1.PageInfo.TotalPage;
+ }
+ GetLocations();
+ }
+
+ private void PageControl2_PreviousPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl2.PageInfo.CurrentPage--;
+ if (this.PageControl2.PageInfo.CurrentPage < 1)
+ {
+ this.PageControl2.PageInfo.CurrentPage = 1;
+ }
+ GetPersonCallMaterialData();
+ }
+
+ private void PageControl2_NextPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl2.PageInfo.CurrentPage++;
+ if (this.PageControl2.PageInfo.CurrentPage > this.PageControl2.PageInfo.TotalPage)
+ {
+ this.PageControl2.PageInfo.CurrentPage = this.PageControl2.PageInfo.TotalPage;
+ }
+ GetPersonCallMaterialData();
+ }
+
+ private void PageControl3_PreviousPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl3.PageInfo.CurrentPage--;
+ if (this.PageControl3.PageInfo.CurrentPage < 1)
+ {
+ this.PageControl3.PageInfo.CurrentPage = 1;
+ }
+ GetInvertoryData();
+ }
+
+ private void PageControl3_NextPageClicked(object sender, RoutedEventArgs e)
+ {
+ this.PageControl3.PageInfo.CurrentPage++;
+ if (this.PageControl3.PageInfo.CurrentPage > this.PageControl3.PageInfo.TotalPage)
+ {
+ this.PageControl3.PageInfo.CurrentPage = this.PageControl3.PageInfo.TotalPage;
+ }
+ GetInvertoryData();
+ }
}
}
diff --git a/src/Khd.Core.Wpf/appsettings.json b/src/Khd.Core.Wpf/appsettings.json
index aea06c3..0ef48a3 100644
--- a/src/Khd.Core.Wpf/appsettings.json
+++ b/src/Khd.Core.Wpf/appsettings.json
@@ -3,8 +3,8 @@
//mysql 本地
//"DefaultConnection": "server=106.12.13.113;port=3306;database=khd_jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
//khd服务器
- "DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
- //"DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
+ //"DefaultConnection": "server=172.16.12.100;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khdrkjy2024...;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
+ "DefaultConnection": "server=175.27.215.92;port=3306;database=hwjy-cloud;uid=kehaida;pwd=khd2024;charset='utf8';persistsecurityinfo=True;SslMode=none;Allow User Variables=True"
// "DefaultConnection": "server=localhost;port=3306;database=jyhb;uid=root;pwd=root;charset='utf8';persistsecurityinfo=True;SslMode=None;Allow User Variables=True"
},
"PlcConfigs": [