diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml
index 89d0705c..695093aa 100644
--- a/Admin.Core.Api/Admin.Core.Model.xml
+++ b/Admin.Core.Api/Admin.Core.Model.xml
@@ -501,6 +501,46 @@
是否标识
+
+
+ 灌注设备状态表
+
+
+
+
+ 主键
+
+
+
+
+ 设备名称;Perfusion:灌注
+
+
+
+
+ 设备状态1运行、2停机、3故障
+
+
+
+
+ 创建人
+
+
+
+
+ 创建时间
+
+
+
+
+ 更新人
+
+
+
+
+ 更新时间
+
+
打印条码信息
@@ -1076,6 +1116,131 @@
创建时间
+
+
+ 灌注告警
+
+
+
+
+ 灌注
+
+
+
+
+ 箱体码
+
+
+
+
+ 报警状态码
+
+
+
+
+ 报警信息
+
+
+
+
+ 异常是否取消
+
+
+
+
+ 创建人
+
+
+
+
+ 创建时间
+
+
+
+
+ 更新人
+
+
+
+
+ 更新时间
+
+
+
+
+ 灌注记录表
+
+
+
+
+ 主键
+
+
+
+
+ 箱体吗
+
+
+
+
+ 冷媒类型;左侧冷媒型号
+
+
+
+
+ 冷媒类型;右侧侧冷媒型号
+
+
+
+
+ 设置灌注量
+
+
+
+
+ 实际灌注量
+
+
+
+
+ 灌注压力_R
+
+
+
+
+ 灌注压力_L
+
+
+
+
+ 灌注时长
+
+
+
+
+ 系统;0,右系统 1，左系统
+
+
+
+
+ 创建人
+
+
+
+
+ 创建时间
+
+
+
+
+ 更新人
+
+
+
+
+ 更新时间
+
+
订单执行表
diff --git a/Aucma.Core.ProductOffLine/Aucma.Core.ProductOffLine.csproj b/Aucma.Core.ProductOffLine/Aucma.Core.ProductOffLine.csproj
index a4376349..b44ac54a 100644
--- a/Aucma.Core.ProductOffLine/Aucma.Core.ProductOffLine.csproj
+++ b/Aucma.Core.ProductOffLine/Aucma.Core.ProductOffLine.csproj
@@ -80,6 +80,9 @@
+
+ Code
+
Code
diff --git a/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs b/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
index 7a14de12..87b0d44e 100644
--- a/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.ProductOffLine/ViewModels/MainWindowViewModel.cs
@@ -21,7 +21,8 @@ namespace Aucma.Core.ProductOffLine.ViewModels
#endregion
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel));
private IndexPageView firstPage = new IndexPageView();//首页
- private StatisticsPageView recordPage = new StatisticsPageView();
+ private StatisticsPageView recordPage = new StatisticsPageView(); // 统计页面
+ private QualityPageView qualityPage = new QualityPageView(); // 质检页面
public MainWindowViewModel()
{
@@ -163,6 +164,9 @@ namespace Aucma.Core.ProductOffLine.ViewModels
case "RecordPage":
UserContent = recordPage;
break;
+ case "QualityPage":
+ UserContent = qualityPage;
+ break;
default:
break;
}
diff --git a/Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs b/Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs
new file mode 100644
index 00000000..00dcd7b5
--- /dev/null
+++ b/Aucma.Core.ProductOffLine/ViewModels/QualityPageViewModel.cs
@@ -0,0 +1,101 @@
+using Admin.Core.Model;
+using Aucma.Core.ProductOffLine.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Documents;
+
+namespace Aucma.Core.ProductOffLine.ViewModels
+{
+ public partial class QualityPageViewModel : ObservableObject
+ {
+ public QualityPageViewModel() { LoadData(); }
+
+ List materialComplateInfos = new List();
+
+ #region 加载DataGrid数据
+ private void LoadData()
+ {
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 2, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 60, CompleteAmount = 40 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 3, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 4, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 40, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 5, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 30, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 6, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 20 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 7, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 10, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 8, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 9, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 80, CompleteAmount = 10 });
+ MaterialDataGrid.Add(new MaterialComplateInfo() { No = 10, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10});
+
+ }
+ #endregion
+
+ #region 初始化datagrid
+ private ObservableCollection materialDataGrid = new ObservableCollection();
+ public ObservableCollection MaterialDataGrid
+ {
+ get { return materialDataGrid; }
+ set
+ {
+ materialDataGrid = value;
+ OnPropertyChanged();//属性通知
+ }
+ }
+ #endregion
+
+ #region 查询
+ ///
+ /// 查询
+ ///
+ [RelayCommand]
+ private void ExecQuery(object obj)
+ {
+ //List list;
+ //var result = (StatisticModel)obj;
+ //if (string.IsNullOrEmpty(result.BeginTime) && string.IsNullOrEmpty(result.EndTime))
+ //{
+ // list = await _codeBindingRecordServices.QueryAllByTime(null, null);
+ //}
+ //else if (string.IsNullOrEmpty(result.BeginTime))
+ //{
+ // list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, null);
+ //}
+ //else if (string.IsNullOrEmpty(result.EndTime))
+ //{
+ // list = await _codeBindingRecordServices.QueryAllByTime(null, result.EndTime);
+ //}
+ //else
+ //{
+ // DateTime theBeginTime = Convert.ToDateTime(result.BeginTime);
+ // DateTime theEndTime = Convert.ToDateTime(result.EndTime);
+ // if (theBeginTime > theEndTime)
+ // {
+ // MessageBox.Show("结束时间要大于开始时间！");
+ // return;
+ // }
+ // list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, result.EndTime);
+ //}
+
+
+ //if (list != null)
+ //{
+ // System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+ // {
+ // MaterialDataGrid.Clear();
+ // foreach (CodeBindingRecord item in list)
+ // {
+ // MaterialDataGrid.Add(new ReaderInfo() { No = item.ObjId, BoxCode = item.BoxCode, BoxName = item.BoxName, ProductCode = item.ProductCode, BindingResult = item.BindingResult, RecordTime = item.RecordTime1.ToString() });
+ // }
+
+ // }));
+ //}
+ }
+ #endregion
+ }
+}
diff --git a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml
index 7591d393..dbcef982 100644
--- a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml
+++ b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml
@@ -64,6 +64,7 @@
+
diff --git a/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml b/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml
new file mode 100644
index 00000000..3c4abe60
--- /dev/null
+++ b/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml.cs b/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml.cs
new file mode 100644
index 00000000..e65a4fd1
--- /dev/null
+++ b/Aucma.Core.ProductOffLine/Views/QualityPageView.xaml.cs
@@ -0,0 +1,31 @@
+using Aucma.Core.ProductOffLine.ViewModels;
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace Aucma.Core.ProductOffLine.Views
+{
+ ///
+ /// StatisticsPageView.xaml 的交互逻辑
+ ///
+ public partial class QualityPageView : UserControl
+ {
+ public QualityPageView()
+ {
+ InitializeComponent();
+ this.DataContext = new QualityPageViewModel();
+ }
+
+ }
+}