change - 集存库入库监控界面

Aucma.Scada.UI/Aucma.Scada.UI.csproj

@@ -50,6 +50,12 @@
     <Reference Include="Lierda.WPFHelper">
       <HintPath>..\HighWayIot.Library\Lierda.WPFHelper.dll</HintPath>
     </Reference>
+    <Reference Include="LiveCharts, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
+      <HintPath>..\packages\LiveCharts.0.9.7\lib\net45\LiveCharts.dll</HintPath>
+    </Reference>
+    <Reference Include="LiveCharts.Wpf, Version=0.9.7.0, Culture=neutral, PublicKeyToken=0bc1f845d1ebb8df, processorArchitecture=MSIL">
+      <HintPath>..\packages\LiveCharts.Wpf.0.9.7\lib\net45\LiveCharts.Wpf.dll</HintPath>
+    </Reference>
     <Reference Include="MySql.Data">
       <HintPath>..\HighWayIot.Library\MySql.Data.dll</HintPath>
     </Reference>

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -4,8 +4,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
+             xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
              mc:Ignorable="d" 
-             d:DesignHeight="750" d:DesignWidth="1920" Background="AliceBlue">
+             d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
     <Grid Margin="5,5">
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
@@ -85,7 +86,16 @@
 
         <!--库存统计-->
         <Border Grid.Row="0" Grid.Column="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
-            
+            <Grid Margin="10,10">
+                <lvc:CartesianChart Series="{Binding Achievement, UpdateSourceTrigger=PropertyChanged}">
+                    <lvc:CartesianChart.AxisX>
+                        <lvc:Axis Labels="{Binding MaterialNameList}" FontSize="15"/>
+                    </lvc:CartesianChart.AxisX>
+                    <lvc:CartesianChart.AxisY>
+                        <lvc:Axis FontSize="15"/>
+                    </lvc:CartesianChart.AxisY>
+                </lvc:CartesianChart>
+            </Grid>
         </Border>
 
         <!--入库任务-->
@@ -114,7 +124,7 @@
                 </Border>
                 <DataGrid Grid.Row="1" ItemsSource="{Binding ShellInstoreTask}" Background="Transparent" 
                       FontSize="15" ColumnHeaderHeight="35" 
-                      RowHeight="30" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                      RowHeight="31" AutoGenerateColumns="False" RowHeaderWidth="0" 
                       GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                       ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False"
                       Foreground="Black" >

Aucma.Scada.UI/bin/Debug/Log/2023-09-20/LogInfo.txt

@@ -226,4 +226,72 @@
 日志时间：2023-09-20 16:15:00,248 [1] 
 日志级别：INFO  
 日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:25:58,489 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:35:29,227 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:37:03,047 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:37:18,183 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:58:08,674 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:59:02,772 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 16:59:48,686 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:02:27,021 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:03:44,199 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:09:08,212 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:12:38,449 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:13:39,760 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:17:00,284 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:28:03,042 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:29:51,877 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:31:11,019 [1] 
+日志级别：INFO  
+日志内容：程序退出 
+ <-------------->
+日志时间：2023-09-20 17:34:22,281 [1] 
+日志级别：INFO  
+日志内容：程序退出 
  

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-709a750aeb126125de6abbe3419e83ff8882c96b
+f2a00c34321a7be9d7e4c65de29d80152f11353b

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt

@@ -58,3 +58,9 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InSt
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\InventoryInfo\InventoryInfoControl.baml
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\OutStoreInfo\OutStoreInfoControl.baml
 C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\obj\Debug\Page\TaskInfo\TaskInfoControl.baml
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.dll
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.dll
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.pdb
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.xml
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.pdb
+C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\bin\Debug\LiveCharts.Wpf.xml

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache

@@ -13,7 +13,7 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
 10-978130597
 
 17-2045347350
-129248000128
+1311654442540
 IndexControl.xaml;Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 False

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache

@@ -13,7 +13,7 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml
 10-978130597
 
 181495050162
-129248000128
+1311654442540
 IndexControl.xaml;Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml;
 
 True

Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref

@@ -1,4 +1,13 @@
 
-
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\App.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\IndexControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;;
 FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\LogInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\MainWindow.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\RecordControl.xaml;;
+FC:\项目代码\澳柯玛MES项目\HighWayIot\Aucma.Scada.UI\templates\style\resourceStyle.xaml;;
 

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "80C9C6F8D4977EAFAD3661921030F0E34138204EC3DF1FFF7CFB7A6024DA973F"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AADB0D42A92A7D7C367BE013A8C01CB6B10F7ABB76CC0D33FD59FA3A7DF3DF4C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -10,6 +10,7 @@
 //------------------------------------------------------------------------------
 
 using Aucma.Scada.UI.Page.InStoreInfo;
+using LiveCharts.Wpf;
 using System;
 using System.Diagnostics;
 using System.Windows;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 135 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 145 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

Aucma.Scada.UI/obj/Debug/Page/InStoreInfo/InStoreInfoControl.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "80C9C6F8D4977EAFAD3661921030F0E34138204EC3DF1FFF7CFB7A6024DA973F"
+#pragma checksum "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "AADB0D42A92A7D7C367BE013A8C01CB6B10F7ABB76CC0D33FD59FA3A7DF3DF4C"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -10,6 +10,7 @@
 //------------------------------------------------------------------------------
 
 using Aucma.Scada.UI.Page.InStoreInfo;
+using LiveCharts.Wpf;
 using System;
 using System.Diagnostics;
 using System.Windows;
@@ -41,7 +42,7 @@ namespace Aucma.Scada.UI.Page.InStoreInfo {
     public partial class InStoreInfoControl : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
         
         
-        #line 135 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
+        #line 145 "..\..\..\..\Page\InStoreInfo\InStoreInfoControl.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox listBox;
         

Aucma.Scada.UI/packages.config

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CommonServiceLocator" version="2.0.2" targetFramework="net48" />
+  <package id="LiveCharts" version="0.9.7" targetFramework="net48" />
+  <package id="LiveCharts.Wpf" version="0.9.7" targetFramework="net48" />
   <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net48" />
 </packages>

Aucma.Scada.UI/templates/style/resourceStyle.xaml

@@ -410,7 +410,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Border  BorderThickness="1" Width="auto" Height="auto"  BorderBrush="Black">
-                        <Grid x:Name="grid" Background="White">
+                        <Grid x:Name="grid" Background="Transparent">
                             <ScrollViewer x:Name="PART_ContentHost" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center"/>
                         </Grid>
                     </Border>

Aucma.Scada.UI/viewModel/InStoreInfoViewModel.cs

@@ -4,6 +4,8 @@ using HighWayIot.Log4net;
 using HighWayIot.Repository.domain;
 using HighWayIot.Repository.service;
 using HighWayIot.Repository.service.Impl;
+using LiveCharts;
+using LiveCharts.Wpf;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -27,6 +29,8 @@ namespace Aucma.Scada.UI.viewModel
             Query();
 
             materialTypeCombox = "所有";
+
+            Init();
         }
 
         #region 参数定义
@@ -152,6 +156,28 @@ namespace Aucma.Scada.UI.viewModel
                 }
             }
         }
+
+        /// <summary>
+        /// 库存统计柱状图
+        /// </summary>
+        private SeriesCollection achievement = new SeriesCollection();
+
+        public SeriesCollection Achievement
+        {
+            get { return achievement; }
+            set { achievement = value; }
+        }
+
+        /// <summary>
+        /// 库存统计柱状图X轴物料信息
+        /// </summary>
+        private List<string> materialNameList;
+
+        public List<string> MaterialNameList
+        {
+            get { return materialNameList; }
+            set { materialNameList = value; }
+        }
         #endregion
 
         #region 事件定义
@@ -246,5 +272,46 @@ namespace Aucma.Scada.UI.viewModel
             Search = String.Empty;
             this.Query();
         }
+
+        
+
+        /// <summary>
+        /// 成绩初始化
+        /// </summary>
+        public void Init()
+        {
+            MaterialNameList = new List<string>()
+            {
+                "SC232",
+                "SA124",
+                "SC387",
+                "SC211",
+                "DQ196",
+            };
+            ChartValues<double> achievement = new ChartValues<double>();
+            Random random = new Random();
+            for (int i = 0; i < 5; i++)
+            {
+                achievement.Add(random.Next(60, 100));
+            }
+            var column = new ColumnSeries();
+            column.DataLabels = true;
+            column.Title = "箱壳";
+            column.Values = achievement;
+
+            ChartValues<double> achievement2 = new ChartValues<double>();
+            Random random2 = new Random();
+            for (int i = 0; i < 5; i++)
+            {
+                achievement2.Add(random2.Next(60, 100));
+            }
+
+            var column2 = new ColumnSeries();
+            column2.DataLabels = true;
+            column2.Title = "内胆";
+            column2.Values = achievement2;
+            Achievement.Add(column);
+            Achievement.Add(column2);
+        }
     }
 }

HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.FileListAbsolute.txt

@@ -20,4 +20,3 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighW
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.pdb
-C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Log4net\obj\Debug\HighWayIot.Log4net.csproj.AssemblyReference.cache

HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.FileListAbsolute.txt

@@ -24,3 +24,4 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayI
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.pdb
+C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.Mqtt\obj\Debug\HighWayIot.Mqtt.csproj.AssemblyReference.cache

HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.FileListAbsolute.txt

@@ -21,4 +21,3 @@ C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\H
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.CopyComplete
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.dll
 C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.pdb
-C:\项目代码\澳柯玛MES项目\HighWayIot\HighWayIot.TouchSocket\obj\Debug\HighWayIot.TouchSocket.csproj.AssemblyReference.cache

packages/LiveCharts.0.9.7/readme.txt

@@ -0,0 +1,23 @@
+==================================
+<<<<<<<<<<< IMPORTANT >>>>>>>>>>>>
+==================================
+
+LiveCharts is now multipatform (at least the design).
+
+So this package contains nothing but the core of the library, 
+you might also need to install the desired platform.
+
+For example if using wpf you must also install the wpf package.
+
+------------------------------------
+> Install-Package LiveCharts.Wpf
+------------------------------------
+
+For future updates, you will only need to update LiveCharts.Wpf (or any other platform)
+forget about the core, all the platforms packages will have a dependency to core.
+
+------------------------------------
+> Update-Package LiveCharts.Wpf
+------------------------------------
+
+Happy coding!

packages/LiveCharts.Wpf.0.9.7/tools/install.ps1

@@ -0,0 +1,3 @@
+param($installPath, $toolsPath, $package, $project)
+
+$DTE.ItemOperations.Navigate("https://lvcharts.net/thanks/wpf")