门体发泡

Admin.Core.Model/Model_New/DoorFoamRecord.cs

@@ -17,9 +17,9 @@ namespace Admin.Core.Model
         /// <summary>
         /// 主键
         /// </summary>
-        [SugarColumn(IsIdentity = true, IsPrimaryKey = true)]
+        [SugarColumn(ColumnName = "OBJ_ID", IsIdentity = true, IsPrimaryKey = true)]
         public int ObjId { get; set; }
-
+        
         /// <summary>
         /// 计划编码
         /// </summary>
@@ -47,13 +47,13 @@ namespace Admin.Core.Model
         /// 门体计划数
         /// </summary>
         [SugarColumn(ColumnName = "PLAN_AMOUNT")]
-        public float PlanAmount { get; set; }
+        public int PlanAmount { get; set; }
 
         /// <summary>
         /// 完成数
         /// </summary>
         [SugarColumn(ColumnName = "COMPLETE_AMOUNT")]
-        public string CompleteAmount { get; set; }
+        public int CompleteAmount { get; set; }
 
         /// <summary>
         /// 开始时间

Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.runtimeconfig.json

@@ -0,0 +1,26 @@
+{
+  "runtimeOptions": {
+    "tfm": "net6.0",
+    "frameworks": [
+      {
+        "name": "Microsoft.NETCore.App",
+        "version": "6.0.0"
+      },
+      {
+        "name": "Microsoft.WindowsDesktop.App",
+        "version": "6.0.0"
+      },
+      {
+        "name": "Microsoft.AspNetCore.App",
+        "version": "6.0.0"
+      }
+    ],
+    "additionalProbingPaths": [
+      "C:\\Users\\Robin\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Robin\\.nuget\\packages"
+    ],
+    "configProperties": {
+      "Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true
+    }
+  }
+}

Aucma.Core.DoorFoam/Models/DoorFoamRecordModel.cs

@@ -0,0 +1,60 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+    public class DoorFoamRecordModel
+    {
+        /// <summary>
+        /// 计划编码
+        /// </summary>
+        public string? PlanCode { get; set; }
+
+        /// <summary>
+        /// 订单编码
+        /// </summary>
+        public string? OrderCode { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string? MaterialCode { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string? MaterialName { get; set; }
+
+        /// <summary>
+        /// 门体计划数
+        /// </summary>
+        public int PlanAmount { get; set; }
+
+        /// <summary>
+        /// 完成数
+        /// </summary>
+        public int CompleteAmount { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime BeginTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime UpdateTime { get; set; }
+    }
+}

Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs

@@ -8,28 +8,40 @@ using System.Collections.Generic;
 using Admin.Core.Model;
 using Admin.Core.Service;
 using LiveCharts.Wpf;
+using Admin.Core.IService;
+using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
 /*
- * 首页信息
- */
+* 首页信息
+*/
 namespace Aucma.Core.DoorFoam.ViewModels
 {
     public partial class IndexPageViewModel : ObservableObject
     {
         private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel));
         private ObservableCollection<dynamic> listItems = new ObservableCollection<dynamic>();
-       
+        private readonly IDoorFoamRecordServices? _doorFoamRecordServices;
         public IndexPageViewModel()
         {
+            _doorFoamRecordServices = App.ServiceProvider.GetService<IDoorFoamRecordServices>();
             StationName = "门体发泡";
             MaterialName = "SC-AUCMA-农夫山泉，SC 门体";
             OrderNo = "8512365486";
             BeginTime = DateTime.Now.ToString("yyyy-mm-dd HH:mm:ss");
-            InitEveryDayMethod();
+            _=InitEveryDayMethodAsync();
         }
 
-
-        private void InitEveryDayMethod()
+        /// <summary>
+        /// 获取今天的数据
+        /// </summary>
+        /// <returns></returns>
+        private async Task InitEveryDayMethodAsync()
         {
+            DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
+
+            //var list = await _doorFoamRecordServices.QueryAsync(d => d.BeginTime >= startTime && d.EndTime <= endTime);
+
             ChartValues<double> achievement = new ChartValues<double>();
             Random random = new Random();
             for (int i = 0; i < 5; i++)

Aucma.Core.DoorFoam/ViewModels/StatisticsPageViewModel.cs

@@ -1,6 +1,10 @@
-using Aucma.Core.DoorFoam.Models;
+using Admin.Core.IService;
+using Admin.Core.Service;
+using Aucma.Core.DoorFoam.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using log4net;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -13,36 +17,47 @@ namespace Aucma.Core.DoorFoam.ViewModels
 {
     public partial class StatisticsPageViewModel : ObservableObject
     {
-        public StatisticsPageViewModel() { LoadData(); }
+        private static readonly log4net.ILog log = LogManager.GetLogger(typeof(StatisticsPageViewModel));
+        private readonly IDoorFoamRecordServices? _doorFoamRecordServices;
+        public StatisticsPageViewModel() {
+            _doorFoamRecordServices = App.ServiceProvider.GetService<IDoorFoamRecordServices>();
+            LoadData();
+        }
 
         List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>();
 
         #region 加载DataGrid数据
-        private void LoadData()
+        private async 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});
+            DateTime startTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
+            DateTime endTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 23:59:59"));
 
+           var list=await _doorFoamRecordServices.QueryAsync(d=>d.BeginTime>= startTime&&d.EndTime<= endTime);
+            foreach (var item in list)
+            {
+                DoorDataGrid.Add(new DoorFoamRecordModel()
+                {
+                    PlanCode = item.PlanCode,
+                    MaterialCode = item.MaterialCode,
+                    MaterialName = item.MaterialName,
+                    PlanAmount = item.PlanAmount,
+                    CompleteAmount = item.CompleteAmount,
+                    BeginTime= item.BeginTime, 
+                    EndTime= item.EndTime
+                });
+            }
         }
 
         #endregion
 
         #region 初始化datagrid
-        private ObservableCollection<MaterialComplateInfo> materialDataGrid = new ObservableCollection<MaterialComplateInfo>();
-        public ObservableCollection<MaterialComplateInfo> MaterialDataGrid
+        private ObservableCollection<DoorFoamRecordModel> doorDataGrid = new ObservableCollection<DoorFoamRecordModel>();
+        public ObservableCollection<DoorFoamRecordModel> DoorDataGrid
         {
-            get { return materialDataGrid; }
+            get { return doorDataGrid; }
             set
             {
-                materialDataGrid = value;
+                doorDataGrid = value;
                 OnPropertyChanged();//属性通知
             }
         }
@@ -56,6 +71,11 @@ namespace Aucma.Core.DoorFoam.ViewModels
         private void ExecQuery(object obj)
         {
             var result = (StatisticModel)obj;
+            if (result == null)
+            {
+                MessageBox.Show("查询参数不能为空！");
+                return;
+            }
             if (string.IsNullOrEmpty(result.BeginTime))
             {
                 MessageBox.Show("开始时间不能为空！");
@@ -66,21 +86,33 @@ namespace Aucma.Core.DoorFoam.ViewModels
                 MessageBox.Show("结束时间不能为空！");
                 return;
             }
-            var beginTime = result.BeginTime;
-            var endTime = result.EndTime;
-
-            System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
+            DateTime theBeginTime = Convert.ToDateTime(result.BeginTime);
+            DateTime theEndTime = Convert.ToDateTime(result.EndTime);
+            if (theBeginTime > theEndTime)
             {
-                if (!string.IsNullOrEmpty(beginTime))
-                {
-                    MaterialDataGrid.Clear();
-                    MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-可口可乐，SC", PlanAmount = 50, CompleteAmount = 10 });
-                }
-                else
+                MessageBox.Show("结束时间要大于开始时间！");
+                return;
+            }
+            DateTime startTime = Convert.ToDateTime(theBeginTime.ToString("yyyy-MM-dd 00:00:00"));
+            DateTime endTime = Convert.ToDateTime(theEndTime.ToString("yyyy-MM-dd 23:59:59"));
+            System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+            {
+                DoorDataGrid.Clear();
+                var list = await _doorFoamRecordServices.QueryAsync(d => d.BeginTime >= startTime && d.EndTime <= endTime);
+                foreach (var item in list)
                 {
-                    MaterialDataGrid.Clear();
-                    LoadData();
+                    DoorDataGrid.Add(new DoorFoamRecordModel()
+                    {
+                        PlanCode = item.PlanCode,
+                        MaterialCode = item.MaterialCode,
+                        MaterialName = item.MaterialName,
+                        PlanAmount = item.PlanAmount,
+                        CompleteAmount = item.CompleteAmount,
+                        BeginTime = item.BeginTime,
+                        EndTime = item.EndTime
+                    });
                 }
+
                 //Datalist.Insert(0, Datalist[Datalist.Count - 1]);
                 //Datalist.RemoveAt(Datalist.Count - 1);
             }));

Aucma.Core.DoorFoam/Views/StatisticsPageView.xaml

@@ -175,12 +175,14 @@
                       ScrollViewer.VerticalScrollBarVisibility="Auto"  BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
                       Foreground="Gray"  >
                             <DataGrid.Columns>
-                                <DataGridTextColumn Binding="{Binding No}" Header="序号" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding PlanCode}" Header="计划编号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="1*"    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="3*"    ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding PlanAmount}" Header="计划数量" Width="*"       ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
-                                <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="完成数量" Width="*"   ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding No}"              Header="序号"                 ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <DataGridTextColumn Binding="{Binding PlanCode}"        Header="计划编号" Width="1*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding MaterialCode}"    Header="物料编号" Width="1*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding MaterialName}"    Header="物料名称" Width="3*"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding PlanAmount}"      Header="计划数量" Width="*"   ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding CompleteAmount}"  Header="完成数量" Width="*"   ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                                <DataGridTextColumn Binding="{Binding BeginTime, StringFormat=\{0:yyyy-MM-dd HH:mm\}}"  Header="开始时间" Width="*"   ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <DataGridTextColumn Binding="{Binding EndTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}"  Header="结束时间" Width="*"   ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                             </DataGrid.Columns>
                         </DataGrid>