diff --git a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
index 69f806f..6fcc7c3 100644
--- a/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
+++ b/src/Khd.Core.Wcs/Wcs/SystemTimer.cs
@@ -830,11 +830,14 @@ namespace Khd.Core.Wcs.Wcs
{
var AgvCardStatus = reponse.data.First(t => t.RobotCode == "2034");
AgvCardStatus.DateNow = DateTime.Now;
+ AgvCardStatus.AgvName = "5楼叉车";
dbContext.Update(AgvCardStatus);
var BearCardStatus = reponse.data.First(t => t.RobotCode == "6011");
+ BearCardStatus.AgvName = "5楼背负式";
BearCardStatus.DateNow = DateTime.Now;
dbContext.Update(BearCardStatus);
var CtuCardStatus = reponse.data.First(t => t.RobotCode == "8161");
+ CtuCardStatus.AgvName = "5楼CTU";
CtuCardStatus.DateNow = DateTime.Now;
dbContext.Update(CtuCardStatus);
dbContext.SaveChanges();
@@ -969,6 +972,7 @@ namespace Khd.Core.Wcs.Wcs
{
var cardStatus = reponse.data.First(t => t.RobotCode == "2032");
cardStatus.DateNow = DateTime.Now;
+ cardStatus.AgvName = "3楼叉车 ";
dbContext.Update(cardStatus);
dbContext.SaveChanges();
var quantityPlc = basePlcs.First(t => t.Name.Contains("电量"));
@@ -1033,6 +1037,7 @@ namespace Khd.Core.Wcs.Wcs
{
var cardStatus = reponse.data.First(t => t.RobotCode == "2033");
cardStatus.DateNow = DateTime.Now;
+ cardStatus.AgvName = "2楼叉车";
dbContext.Update(cardStatus);
dbContext.SaveChanges();
var quantityPlc = basePlcs.First(t => t.Name.Contains("电量"));
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 17f75f9..dc373f5 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -513,6 +513,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Khd.Core.Wpf/WindowPage/TaskHistoryWindow.xaml.cs b/src/Khd.Core.Wpf/WindowPage/TaskHistoryWindow.xaml.cs
new file mode 100644
index 0000000..954c3de
--- /dev/null
+++ b/src/Khd.Core.Wpf/WindowPage/TaskHistoryWindow.xaml.cs
@@ -0,0 +1,82 @@
+using Khd.Core.Domain.Models;
+using Khd.Core.EntityFramework;
+using Khd.Core.Library.Mapper;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System;
+using System.Collections.Generic;
+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.Shapes;
+using Khd.Core.Wpf.dto;
+namespace Khd.Core.Wpf.WindowPage
+{
+ ///
+ /// TaskHistoryWindow.xaml 的交互逻辑
+ ///
+ public partial class TaskHistoryWindow : Window
+ {
+ private IHost _host;
+ public TaskHistoryWindow(IHost host)
+ {
+ _host = host;
+ InitializeComponent();
+
+ GetTask();
+ }
+
+
+
+ ///
+ /// 显示序号事件
+ ///
+ ///
+ ///
+ private void dgData_LoadingRow(object sender, DataGridRowEventArgs e)
+ {
+ e.Row.Header = e.Row.GetIndex() + 1;
+ }
+
+
+
+ private void GetTask()
+ {
+ using var scope = _host.Services.CreateScope();
+ using var dbContext = scope.ServiceProvider.GetRequiredService();
+ Dispatcher.Invoke(() =>
+ {
+
+ long? nextPointId = 0;
+
+ var data = dbContext.WcsTaskLog.ToList();
+ List taskModel = CoreMapper.Map>(data);
+
+ //foreach (var item in taskModel)
+ //{
+ // SelectedItem.Add(item.objid, false);
+ // if (item.nextPointId == 6)
+ // {
+ // item.isShow = Visibility.Visible;
+ // }
+ // else
+ // {
+ // item.isShow = Visibility.Collapsed;
+ // }
+ //}
+ this.LoadMaterial0.ItemsSource = null;
+ this.LoadMaterial0.ItemsSource = taskModel;
+ this.LoadMaterial0.Items.Refresh();
+ });
+ }
+
+
+ }
+}