sc/SunlightAggregationTerminal
1
0 Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

查询页面相关的信息

Browse Source
This commit is contained in:
Administrator committed 2026-05-20 01:49:40 +08:00
2 parents 321e7d84c2 7675362ff5
commit 7aad6f8d1a
8 files changed
+161 -141
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Class/TcpServer.cs
+4
View File
@@ -141,6 +141,10 @@ namespace SunlightAggregationTerminal.Class
{
QueryPage.Query_data(val.ToString()!);
}
if (data.TryGetValue("QueryDetail", out val) && val != null)//查询接受
{
QueryDetail.Query_data(val.ToString()!);
}
if (data.TryGetValue("Notification", out val) && val != null)//信息通知接受
{
var dataNotification = JsonSerializer.Deserialize<Dictionary<string, object>>(val.ToString()!);
InfoDetail.xaml.cs
+1 -38
View File
@@ -20,44 +20,7 @@ public partial class InfoDetail : ContentPage
InfoProbuctItems.Add(new ProbuctItem { ProductName = "afars", ProductCode = "cs", ProductState = "", ProductInf = "" });
InfoDyelotDetailsItems.Add(new DyelotDetailsItem
{ Dyelot = "2134566", Machine = "g01", CreationTime = "", CallTime = "" ,
ReDye=0,
Information = "yyjjy\nfxfxdsdg\n",
});
InfoDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "231423134566",
Machine = "g01",
CreationTime = "",
CallTime = "",
Information = "yyjjy\nfxfxdsdg\n",
});
InfoDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2131324354566",
Machine = "g01",
CreationTime = "",
CallTime = "",
Information = "yyjjy\nfxfxdsdg\n",
});
InfoDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2134123243566",
Machine = "g01",
CreationTime = "",
CallTime = "",
Information = "yyjjy\nfxfxdsdg\n",
});
InfoDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2134566",
Machine = "g01",
CreationTime = "",
Information = "yyjjy\nfxfxdsdg\n",
});
CardCollectionView_machine.ItemsSource = InfoProbuctItems;
CardCollectionView_history.ItemsSource = InfoDyelotDetailsItems;
InfoPage.xaml
+1 -2
View File
@@ -11,8 +11,7 @@
</ResourceDictionary>
</ContentPage.Resources>
<RefreshView x:Name="myRefreshView_" >
<CollectionView x:Name="CardCollectionView"
RemainingItemsThreshold="5">
<CollectionView x:Name="CardCollectionView">
<!-- 保持滚动条 -->
<CollectionView.ItemTemplate>
<DataTemplate>
Models/DataSource.cs
+16 -12
View File
@@ -52,30 +52,34 @@ namespace SunlightAggregationTerminal.Models
{
public string? Dyelot { get; set; }
public int? ReDye { get; set; }
public int? Color { get; set; }
public string? Machine { get; set; }
public string? Program { get; set; }
public string? CreationTime { get; set; }
public string? FabricName { get; set; }
public string? ColorName { get; set; }
public string? CustomerName { get; set; }
public string? Information { get; set; }
public string? Notes { get; set; }
}
public class DyelotDetailsItem
{
public string? Dyelot { get; set; }
public int? ReDye { get; set; }
public string? Step { get; set; }
public int? StepNumber { get; set; }
public string? ProductName { get; set; }
public string? ProductCode { get; set; }
public string? ProductType { get; set; }
public string? ProductProgram { get; set; }
public string? DispenserGram { get; set; }
public string? Gram { get; set; }
public string? Machine { get; set; }
public string? CreationTime { get; set; }
public string? CallTime { get; set; }
public string? EndTime { get; set; }
public string? StartTime { get; set; }
public string? Information { get; set; }
public int? ProductType { get; set; }
public string? Process { get; set; }
public double? Grams { get; set; }
public string GramsDisplay => Grams?.ToString("F2") ?? "";
public string? Created { get; set; }
public string? DispenseStartTime { get; set; }
public string? DispenseEndTime { get; set; }
public string? DispenseTime { get; set; }
public double? DispenseGrams { get; set; }
public string DispenseGramsDisplay => DispenseGrams?.ToString("F2") ?? "";
public int? DispenseResult { get; set; }
public string? Notes { get; set; }
}
public static class DataService
QueryDetail.xaml
+22 -9
View File
@@ -2,7 +2,7 @@
<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="SunlightAggregationTerminal.QueryDetail"
Title="细节">
Title="细节" >
<Grid RowDefinitions="Auto, *" >
<Grid BackgroundColor="#CCCCCC" Padding="10" Grid.Row="0" Grid.Column="0">
<VerticalStackLayout>
@@ -36,8 +36,8 @@
<Label Text="颜色: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label FontSize="22" BackgroundColor="Black"/>
<Label x:Name="_ColorName" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
<BoxView HeightRequest="25" Color="#E0E0E0" Margin="0,0" />
</HorizontalStackLayout>
<BoxView x:Name="_Color" HeightRequest="25" />
</VerticalStackLayout>
</Grid>
@@ -52,19 +52,19 @@
<HorizontalStackLayout>
<Label Text="步骤: " FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
<Label Text="{Binding Step}" FontAttributes="Bold"
<Label Text="{Binding StepNumber}" FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="呼叫: " FontAttributes="Bold"
<Label Text="开始时间: " FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
<Label Text="{Binding Machine}" FontAttributes="Bold"
<Label Text="{Binding DispenseStartTime}" FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="时间: " FontAttributes="Bold"
<Label Text="完成时间: " FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
<Label Text="{Binding EndTime}" FontAttributes="Bold"
<Label Text="{Binding DispenseEndTime}" FontAttributes="Bold"
FontSize="22" TextColor="Black"/>
</HorizontalStackLayout>
<BoxView HeightRequest="3" Color="#CCCCCC" />
@@ -78,6 +78,19 @@
</CollectionView.ItemTemplate>
</CollectionView>
</Grid>
<Grid x:Name="LoadingIndicator" Grid.Row="1" Grid.Column="0"
BackgroundColor="Gray" IsVisible="False" Opacity="0.9">
<VerticalStackLayout Padding="30" Spacing="10"
VerticalOptions="Center"
HorizontalOptions="Center">
<ActivityIndicator IsRunning="True"
Color="#512BD4"
HorizontalOptions="Center"
VerticalOptions="Center" />
<Label Text="查询中..." FontAttributes="Bold"
FontSize="24" TextColor="Black"/>
</VerticalStackLayout>
</Grid>
</Grid>
</ContentPage>
QueryDetail.xaml.cs
+73 -56
View File
@@ -1,12 +1,14 @@
using SunlightAggregationTerminal.Class;
using SunlightAggregationTerminal.Models;
using System.Collections.ObjectModel;
using System.Text.Json;
using TouchSocket.Core;
namespace SunlightAggregationTerminal;
public partial class QueryDetail : ContentPage
{
public static ObservableCollection<DyelotDetailsItem> QueryDetailDyelotDetailsItems { get; set; } = new();
public static ObservableCollection<DyelotDetailsItem> QueryDetailDyelotDetailsItemst { get; set; } = new();
public QueryDetail(DyelotItem item)
{
InitializeComponent();
@@ -18,73 +20,37 @@ public partial class QueryDetail : ContentPage
_FabricName.Text = item.FabricName;
_CustomerName.Text = item.CustomerName;
_ColorName.Text = item.ColorName;
// 如果 item.Color 为 null，则默认为透明色
_Color.Color = item.Color.HasValue ? Color.FromInt(item.Color.Value) : Colors.Gray;
QueryDetailDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2134566",
Machine = "g01",
Step="3",
CreationTime = "",
DispenserGram="32434",
Gram = "3212",
ReDye = 0,
ProductName="sdvsf1",
Information = "yyjjy\nfxfxdsdg\n",
});
QueryDetailDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2134566",
Machine = "g01",
Step = "3",
CreationTime = "",
DispenserGram = "32423434",
Gram = "3212434",
ReDye = 0,
ProductName = "sdvsf2",
Information = "yyjjy\nfxfxdsdg\n",
});
QueryDetailDyelotDetailsItems.Add(new DyelotDetailsItem
{
Dyelot = "2134566",
Machine = "g01",
CreationTime = "",
DispenserGram = "3212434",
Gram= "3212434",
Step = "4",
ReDye = 0,
ProductName = "sdvsf3",
Information = "yyjjy\nfxfxdsdg\n",
});
Data_();
Dictionary<string, object> QueryDictionary = new Dictionary<string, object>();
QueryDictionary.Add("Command", "QueryDetail");
QueryDictionary.Add("Field", "[Dyelot],[ReDye],[StepNumber],[ProductCode],[ProductName]," +
"[ProductType],[Grams],[Created],[DispenseStartTime],[DispenseEndTime],[DispenseTime]," +
"[DispenseGrams],[DispenseResult],[Process],[Notes]");
QueryDictionary.Add("Dyelot", item.Dyelot?.ToString() ?? "");
QueryDictionary.Add("ReDye", item.ReDye?.ToString()??"");
Query_Command(QueryDictionary.ToJsonString());
}
private void Data_()
{
var processedList = QueryDetailDyelotDetailsItems
.GroupBy(item => new
{
// 建议加上 ?.Trim() 防止空格和 null 导致的分组偏差
// ?.Trim() 防止空格和 null 导致的分组偏差
Dyelot = item.Dyelot?.Trim(),
Step = item.Step?.Trim()
Step = item.StepNumber
})
.Select(g =>
{
var firstItem = g.First();
// 提取该组内所有的 ProductName 并转为字符串
// 提取该组内所有的 Gram，安全地转为字符串（防止 null 报错）
// 将两者用 Zip 方法一一配对，拼接成 "ProductName(Gram)" 的格式
// 如果只想简单的全部堆在一起，也可以直接用 string.Join(",", productNames.Concat(grams))
var productNames = g.Select(x => x.ProductName);
var grams = g.Select(x => x.Gram?.ToString());
var dispenserGrams = g.Select(x => x.DispenserGram?.ToString());
// 使用 Zip 将三者一一配对，拼接成 "名称(Gram/dispenserGram)" 的格式
var combinedInfo = string.Join("\n",productNames.Zip(grams, (name, gram) => (name, gram)) // 先把前两个拼成元组
.Zip(dispenserGrams, (pair, dispGram) => $"原料:{pair.name}\n目标用量:{pair.gram}g\n实际用量:{dispGram}g"));
var list = g.ToList();
var firstItem = list.First();
// 直接使用 Select 的重载，获取当前元素的索引 i，然后通过 list[i] 访问对应的其他字段
var combinedInfo = string.Join("\n",
list.Select((x, i) => $"原料: {list[i].ProductName} ({list[i].ProductCode})\n" +
$"目标/实际: {list[i].GramsDisplay}g / {list[i].DispenseGramsDisplay}g")
);
// 赋值给最终展示的 ProductName
firstItem.ProductName = combinedInfo;
return firstItem;
@@ -99,4 +65,55 @@ public partial class QueryDetail : ContentPage
}
CardCollectionView_data.ItemsSource = QueryDetailDyelotDetailsItems;
}
public async void Query_Command(string dat)
{
LoadingIndicator.IsVisible = true;
QueryDetailDyelotDetailsItems.Clear();
TcpServer.TcpTransmit(dat);
// 创建一个 秒的延时任务
Task delayTask = Task.Delay(10000);
// 创建一个监测任务，不断检查变量
Task monitorTask = Task.Run(async () =>
{
while (QueryDetailDyelotDetailsItems.Count == 0)
{
// 每隔 100 毫秒检查一次，避免 CPU 占用过高
await Task.Delay(1000);
}
});
// 使用 Task.WhenAny 等待任意一个任务完成
await Task.WhenAny(delayTask, monitorTask);
Data_();
LoadingIndicator.IsVisible = false;
}
public static void Query_data(string dat)
{
try
{
var data = JsonSerializer.Deserialize<List<DyelotDetailsItem>>(dat);
if (data != null)
{
//添加入显示信息
foreach (var item in data)
{
QueryDetailDyelotDetailsItems.Add(item);
}
if (data.Count == 0)
{//如果无信息添加空白行
QueryDetailDyelotDetailsItems.Add(new DyelotDetailsItem { });
}
}
}
catch (Exception)
{
}
}
}
QueryPage.xaml
+14 -16
View File
@@ -18,25 +18,23 @@
</Border>
<!--扫码按钮-->
<Button Grid.Row="0" Grid.Column="1" Clicked="OnScanButtonClicked"
BackgroundColor="Transparent" WidthRequest="60"
BackgroundColor="Transparent" WidthRequest="80"
HeightRequest="60" Margin="10">
<Button.ImageSource>
<!-- 设置图标 -->
<FileImageSource File="lucidescanline.png" />
</Button.ImageSource>
</Button>
<StackLayout Grid.Row="1" Grid.Column="0" >
<HorizontalStackLayout>
<DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"/>
<Label Text="~" FontSize="32"/>
<DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"/>
<Button Text="搜索" Clicked="Button_Clicked" Padding="25,0,25,0"/>
</HorizontalStackLayout>
</StackLayout>
<HorizontalStackLayout Grid.Row="1" Grid.Column="0">
<DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"/>
<Label Text="~" FontSize="28"/>
<DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"/>
</HorizontalStackLayout>
<Button Grid.Row="1" Grid.Column="1" Text="搜索" Clicked="Button_Clicked" Padding="30,0,30,0" Margin="5" />
</Grid>
<Grid Grid.Row="1" Grid.Column="0">
<CollectionView x:Name="CardCollectionView" RemainingItemsThreshold="5">
<CollectionView x:Name="CardCollectionView">
<!-- 保持滚动条 -->
<CollectionView.ItemTemplate>
<DataTemplate>
@@ -61,20 +59,20 @@
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="工艺: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label Text="{Binding FabricName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
<Label Text="{Binding Program}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="面料: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label Text="{Binding FabricName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="客户: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label Text="{Binding CustomerName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="颜色: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label Text="{Binding ColorName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
<HorizontalStackLayout>
<Label Text="客户: " FontAttributes="Bold" FontSize="22" TextColor="Black"/>
<Label Text="{Binding CustomerName}" FontAttributes="Bold" FontSize="22" TextColor="Gray"/>
</HorizontalStackLayout>
</VerticalStackLayout>
<Border.GestureRecognizers>
<TapGestureRecognizer Tapped="TapGestureRecognizer_Tapped"/>
QueryPage.xaml.cs
+30 -8
View File
@@ -20,13 +20,8 @@ public partial class QueryPage : ContentPage
ResultEntry.Text = scannedValue;
});
Dictionary<string, object> QueryDictionary = new Dictionary<string, object>();
QueryDictionary.Add("Command", "Query");
QueryDictionary.Add("StartTime", StartTime.Date.ToString()!);
DateTime EndTime_ = (DateTime)EndTime.Date!;
QueryDictionary.Add("EndTime", EndTime_.AddDays(1).ToString());
Query_Command(QueryDictionary.ToJsonString());
Query_data();
CardCollectionView.ItemsSource = DyelotItems;
}
private async void OnScanButtonClicked(object sender, EventArgs e)
@@ -61,7 +56,12 @@ public partial class QueryPage : ContentPage
{
DyelotItems.Add(item);
}
}
if (data.Count == 0)
{//如果无信息添加空白行
DyelotItems.Add(new DyelotItem { });
}
}
}
catch (Exception ex) {
}
@@ -92,14 +92,36 @@ public partial class QueryPage : ContentPage
}
private void Button_Clicked(object sender, EventArgs e)
{
if (ResultEntry.Text != null)
{
Dictionary<string, object> QueryDictionary = new Dictionary<string, object>();
QueryDictionary.Add("Command", "QueryDyelot");
QueryDictionary.Add("Field", "[Dyelot],[ReDye],[Program],[Color],[CreationTime]," +
"[Batch],[OrderNo],[TotalWeight],[LiquidRatio],[TotalVolume],[Final],[UserAccount]," +
"[FabricName],[ColorName],[CustomerName],[Notes]");
QueryDictionary.Add("DyelotName", ResultEntry.Text);
Query_Command(QueryDictionary.ToJsonString());
}
else
{
Query_data();
}
}
private void Query_data()
{
Dictionary<string, object> QueryDictionary = new Dictionary<string, object>();
QueryDictionary.Add("Command", "Query");
QueryDictionary.Add("Field", "[Dyelot],[ReDye],[Program],[Color],[CreationTime]," +
"[Batch],[OrderNo],[TotalWeight],[LiquidRatio],[TotalVolume],[Final],[UserAccount]," +
"[FabricName],[ColorName],[CustomerName],[Notes]");
QueryDictionary.Add("StartTime", StartTime.Date.ToString()!);
DateTime EndTime_ = (DateTime)EndTime.Date!;
QueryDictionary.Add("EndTime", EndTime_.AddDays(1).ToString());
Query_Command(QueryDictionary.ToJsonString());
}
// 处理“回车/完成”按钮点击
/* private void OnEntryCompleted()
{