From 5085acdc9356f8b1c0ee1c89145d160e942923cb Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 14 Oct 2022 10:19:19 +0800
Subject: [PATCH 01/19] 1

---
 BPASmart.MenuLoad/App.xaml.cs                 |   5 +-
 BeDesignerSCADA/BeDesignerSCADA.csproj        |  15 +--
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml  |   3 +-
 BeDesignerSCADA/Controls/MainCanvasPanel.xaml |   2 +-
 BeDesignerSCADA/Helper/SystemHelper.cs        |  97 +++++++++---------
 BeDesignerSCADA/Images/配置.ico             | Bin 0 -> 2686 bytes
 BeDesignerSCADA/View/ChildEditWindow.xaml     |   2 +-
 BeDesignerSCADA/View/RunWindows.xaml          |   2 +-
 BeDesignerSCADA/View/RunWindowsLao.xaml       |   2 +-
 9 files changed, 65 insertions(+), 63 deletions(-)
 create mode 100644 BeDesignerSCADA/Images/配置.ico

diff --git a/BPASmart.MenuLoad/App.xaml.cs b/BPASmart.MenuLoad/App.xaml.cs
index 27f00a03..8f138296 100644
--- a/BPASmart.MenuLoad/App.xaml.cs
+++ b/BPASmart.MenuLoad/App.xaml.cs
@@ -47,8 +47,9 @@ namespace BPASmart.MenuLoad
                             this.Dispatcher.Invoke(() => {
                                 if (File.Exists(_path))
                                 {
-                                    SystemHelperNew.GetInstance.CreateDesktopShortcut("BeDesignerSCADA.exe");
-                                    SystemHelperNew.GetInstance.CreateDesktopShortcut();
+                                    SystemHelperNew.GetInstance.CreateShortcutOnDesktop();
+                                    SystemHelperNew.GetInstance.CreateShortcutOnDesktop("可视化配置工具");
+                                    //SystemHelperNew.GetInstance.CreateDesktopShortcut();
                                     run.LoadingData(_path);
                                     run.Show();
                                     isShow = true;
diff --git a/BeDesignerSCADA/BeDesignerSCADA.csproj b/BeDesignerSCADA/BeDesignerSCADA.csproj
index 3b2ea24f..59a1df02 100644
--- a/BeDesignerSCADA/BeDesignerSCADA.csproj
+++ b/BeDesignerSCADA/BeDesignerSCADA.csproj
@@ -5,7 +5,8 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>Images\fyf.ico</ApplicationIcon>
+    <ApplicationIcon>Images\配置.ico</ApplicationIcon>
+    <AssemblyName>可视化配置工具</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
@@ -74,10 +75,7 @@
     <None Remove="Images\wx.jpg" />
     <None Remove="Images\zfb.jpg" />
     <None Remove="Images\光柱.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Include="Images\fyf.ico" />
+    <None Remove="Images\配置.ico" />
   </ItemGroup>
 
   <ItemGroup>
@@ -109,7 +107,12 @@
     <Resource Include="Images\win.png" />
     <Resource Include="Images\wx.jpg" />
     <Resource Include="Images\zfb.jpg" />
-    <Resource Include="Images\光柱.png" />
+    <Resource Include="Images\光柱.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Images\配置.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index 39d4fdf2..acfceaa1 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -15,7 +15,8 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
+                <!--<ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />-->
+                <ResourceDictionary  Source="/可视化配置工具;component/Themes/Styles.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
index b40e5ee4..7eaf2de9 100644
--- a/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
+++ b/BeDesignerSCADA/Controls/MainCanvasPanel.xaml
@@ -16,7 +16,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
+                <ResourceDictionary  Source="/可视化配置工具;component/Themes/Styles.xaml"/>
                 <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/BeDesignerSCADA/Helper/SystemHelper.cs b/BeDesignerSCADA/Helper/SystemHelper.cs
index f643c342..f48189fb 100644
--- a/BeDesignerSCADA/Helper/SystemHelper.cs
+++ b/BeDesignerSCADA/Helper/SystemHelper.cs
@@ -3,6 +3,7 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -33,67 +34,63 @@ namespace BeDesignerSCADA.Helper
         /// 创建桌面快捷方式
         /// </summary>
         /// <returns>成功或失败</returns>
-        public bool CreateDesktopShortcut()
+        public void CreateShortcutOnDesktop()
         {
-            //1、在COM对象中找到 Windows Script Host Object Model 
-            //2、添加引用 using IWshRuntimeLibrary;
-            string deskTop = string.Empty;
-            try
+            //添加引用 (com->Windows Script Host Object Model)，using IWshRuntimeLibrary;
+            String shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), $"{AppDomain.CurrentDomain.FriendlyName}.lnk");
+            if (!System.IO.File.Exists(shortcutPath))
             {
-                deskTop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\";
-                if (System.IO.File.Exists(deskTop + GetApplicationName + ".lnk"))  //
+                // 获取当前应用程序目录地址
+                String exePath = Process.GetCurrentProcess().MainModule.FileName;
+                IWshShell shell = new WshShell();
+                // 确定是否已经创建的快捷键被改名了
+                foreach (var item in Directory.GetFiles(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), "*.lnk"))
                 {
-                    return true;
+                    WshShortcut tempShortcut = (WshShortcut)shell.CreateShortcut(item);
+                    if (tempShortcut.TargetPath == exePath)
+                    {
+                        return;
+                    }
                 }
-                WshShell shell = new WshShell();
-                //快捷键方式创建的位置、名称
-                IWshShortcut shortcut = shell.CreateShortcut(deskTop + GetApplicationName + ".lnk") as IWshShortcut;
-                shortcut.TargetPath = GetApplicationPath; //目标文件
-                                                          //该属性指定应用程序的工作目录，当用户没有指定一个具体的目录时，快捷方式的目标应用程序将使用该属性所指定的目录来装载或保存文件。
-                shortcut.WorkingDirectory = System.Environment.CurrentDirectory;
-                shortcut.WindowStyle = 1; //目标应用程序的窗口状态分为普通、最大化、最小化【1,3,7】
-                shortcut.Description = GetApplicationName; //描述
-                //shortcut.IconLocation = exePath + "\\logo.ico";  //快捷方式图标
-                shortcut.Arguments = "";
-                //shortcut.Hotkey = "CTRL+ALT+F11"; // 快捷键
-                shortcut.Save(); //必须调用保存快捷才成创建成功
-                return true;
-            }
-            catch (Exception ex)
-            {
-                return false;
+                WshShortcut shortcut = (WshShortcut)shell.CreateShortcut(shortcutPath);
+                shortcut.TargetPath = exePath;
+                shortcut.Arguments = "";// 参数  
+                shortcut.Description = AppDomain.CurrentDomain.FriendlyName;
+                shortcut.WorkingDirectory = Environment.CurrentDirectory;//程序所在文件夹，在快捷方式图标点击右键可以看到此属性  
+                shortcut.IconLocation = exePath;//图标，该图标是应用程序的资源文件  
+                //shortcut.Hotkey = "CTRL+SHIFT+W";//热键，发现没作用，大概需要注册一下  
+                shortcut.WindowStyle = 1;
+                shortcut.Save();
             }
         }
 
-        public bool CreateDesktopShortcut(string Name)
+        public void CreateShortcutOnDesktop(string Name)
         {
-            //1、在COM对象中找到 Windows Script Host Object Model 
-            //2、添加引用 using IWshRuntimeLibrary;
-            string deskTop = string.Empty;
-            try
+            //添加引用 (com->Windows Script Host Object Model)，using IWshRuntimeLibrary;
+            String shortcutPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), $"{Name}.lnk");
+            if (!System.IO.File.Exists(shortcutPath))
             {
-                deskTop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\";
-                if (System.IO.File.Exists(deskTop + Name + ".lnk"))  //
+                // 获取当前应用程序目录地址
+                String exePath = $"{AppDomain.CurrentDomain.BaseDirectory}{Name}.exe";// Process.GetCurrentProcess().MainModule.FileName;
+                IWshShell shell = new WshShell();
+                // 确定是否已经创建的快捷键被改名了
+                foreach (var item in Directory.GetFiles(Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory), "*.lnk"))
                 {
-                    return true;
+                    WshShortcut tempShortcut = (WshShortcut)shell.CreateShortcut(item);
+                    if (tempShortcut.TargetPath == exePath)
+                    {
+                        return;
+                    }
                 }
-                WshShell shell = new WshShell();
-                //快捷键方式创建的位置、名称
-                IWshShortcut shortcut = shell.CreateShortcut(deskTop + Name + ".lnk") as IWshShortcut;
-                shortcut.TargetPath = GetApplicationPath; //目标文件
-                                                          //该属性指定应用程序的工作目录，当用户没有指定一个具体的目录时，快捷方式的目标应用程序将使用该属性所指定的目录来装载或保存文件。
-                shortcut.WorkingDirectory = System.Environment.CurrentDirectory;
-                shortcut.WindowStyle = 1; //目标应用程序的窗口状态分为普通、最大化、最小化【1,3,7】
-                shortcut.Description = Name; //描述
-                //shortcut.IconLocation = exePath + "\\logo.ico";  //快捷方式图标
-                shortcut.Arguments = "";
-                //shortcut.Hotkey = "CTRL+ALT+F11"; // 快捷键
-                shortcut.Save(); //必须调用保存快捷才成创建成功
-                return true;
-            }
-            catch (Exception ex)
-            {
-                return false;
+                WshShortcut shortcut = (WshShortcut)shell.CreateShortcut(shortcutPath);
+                shortcut.TargetPath = exePath;
+                shortcut.Arguments = "";// 参数  
+                shortcut.Description = AppDomain.CurrentDomain.FriendlyName;
+                shortcut.WorkingDirectory = Environment.CurrentDirectory;//程序所在文件夹，在快捷方式图标点击右键可以看到此属性  
+                shortcut.IconLocation = exePath;//图标，该图标是应用程序的资源文件  
+                //shortcut.Hotkey = "CTRL+SHIFT+W";//热键，发现没作用，大概需要注册一下  
+                shortcut.WindowStyle = 1;
+                shortcut.Save();
             }
         }
 
diff --git a/BeDesignerSCADA/Images/配置.ico b/BeDesignerSCADA/Images/配置.ico
new file mode 100644
index 0000000000000000000000000000000000000000..0c00208f299b96d10b5c04dd44d68d303eb1258b
GIT binary patch
literal 2686
zcmbVOv5w<55FNvZjP4MCCKkxSP28r;;;O5>pK~R*BDazbDacM|TygN<IDg_#P%0CM
zW9AJhS+ZA~B3w(u<?y|E9CBzAE%5jBwE9A5Up^510{a`DCp-<F1--)?4Ziu-l!;A~
z=gS*iJPjQV2S8H(P)gFngFhLP*Z*!D3e=ieiYl~T9PImfceA1=79_hcN1zh5DGDZp
zxd^eVQw$yaRq$5k-89v53L&%@WIIC;n>yOiW@*;>dj$gbrb;m@1i=kCQHFD<v!7lO
zsFnb)O~I4BCy1Sjmc2?jLqs;*C@63Tcpn!znkpFKgKnM@yn;jgG|2@X5Pg6nNuifQ
zq=JFRHSG{RuYDwlClMd2DSSep+Bx{BU>+_x$V+?+j&qXbhS}&MF%wj?;`0hJLGW|p
zvtJ0RAX{PY)?VDA!1_8^c6V#<{X$?ucndB^-MeVbTX3pCU`^$no$mI)j!HN|0Xw|L
zjT^lv1Y_~>AeoGgU99~CYWDW`ad7PQsq@cz{b?K>dwuGH*82Ml0Vmma>%QvsD*|@u
zWM$(}3R<sscLa<|Md|?O?peR+y<Xo0@Xi1z@S30Xez(?oHR>XjOpU87!|O-A-|O9a
z;-=6kapS_NIUzg<zD@k>IJ*O)*YQyc!D?l$Gc4F+z-`h1?mvUz$Br#e{0QyjvXMLG
zVF!Yh<&nTD)UlE!dPrP=K(nFeD*^mC*%5y55IyYHAF+W~0=BIbA_$-osurJD)=UVv
z5jd`-w)km9*3(G9zSOZ2d?TtWc2fd>Dr*&j>?a&^A^2Fv`6M7HKnk1Ot86AP<(NTB
zZWjK&+Y>N77MHx)+BDqs0|9?uT_-p@sj5uC=KXjMIHD-8cT^^@W~aXm_!<||<dQ4|
zyX!eA@LnD;&N@ptXhVE=3&*!sWqGf4PtU<%7p7(9$gE!`evWtFLgq#PxYCnp?~8Vg
zb1=|nLBmRV`w0hWP<Q9b|1NQm=EkpM5C84%=gHB3-MVeegNMzrmQJI(tyto?fw>T$
zrD)EyJTGA*EiYm_S|+ha*srh$*ao&CPWZmYuMO0~R_rF7@gdr#3x<f`#FYG#<PX3X
z0R5S1Kn5BK*42%iK@bQW!G9Gv#QdD$`L_)Im1qJl(Tf$hj0?O(hq)9QQL&L>sK|b(
zkoo@{3F?IfH3ysXl~L%`f<oK&b|YxCyq1ON?S7)Aq@h#99SFKjqcA6R+k*nO?&_n0
zf^C;NmVEq`kWnc7J4IC%j9W_x(orEXP;d}(*hUfu3)L6cizET_&XU81F-Jsm${Pc0
NZe{ndM$EZw{{maO;!^+s

literal 0
HcmV?d00001

diff --git a/BeDesignerSCADA/View/ChildEditWindow.xaml b/BeDesignerSCADA/View/ChildEditWindow.xaml
index 5f50bd14..3e90c316 100644
--- a/BeDesignerSCADA/View/ChildEditWindow.xaml
+++ b/BeDesignerSCADA/View/ChildEditWindow.xaml
@@ -14,7 +14,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
+                <ResourceDictionary  Source="/可视化配置工具;component/Themes/Styles.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/BeDesignerSCADA/View/RunWindows.xaml b/BeDesignerSCADA/View/RunWindows.xaml
index 611c1d3d..1866a3fb 100644
--- a/BeDesignerSCADA/View/RunWindows.xaml
+++ b/BeDesignerSCADA/View/RunWindows.xaml
@@ -12,7 +12,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
+                <ResourceDictionary  Source="/可视化配置工具;component/Themes/Styles.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/BeDesignerSCADA/View/RunWindowsLao.xaml b/BeDesignerSCADA/View/RunWindowsLao.xaml
index 247d4663..76b99164 100644
--- a/BeDesignerSCADA/View/RunWindowsLao.xaml
+++ b/BeDesignerSCADA/View/RunWindowsLao.xaml
@@ -11,7 +11,7 @@
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/BeDesignerSCADA;component/Themes/Styles.xaml" />
+                <ResourceDictionary  Source="/可视化配置工具;component/Themes/Styles.xaml"></ResourceDictionary>
                 <ResourceDictionary Source="/BPASmartClient.SCADAControl;component/Themes/Generic.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>

From 5d1bb5aaadc1f6d3ad6107b6b67e1ed01c6247cc Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 14 Oct 2022 10:25:37 +0800
Subject: [PATCH 02/19] 1

---
 BPASmart.PageLoad/MainWindow.xaml             |   4 ++--
 .../DLL/BPASmartClient.Compiler.dll           | Bin 55808 -> 55808 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BPASmart.PageLoad/MainWindow.xaml b/BPASmart.PageLoad/MainWindow.xaml
index 943a6d58..31f9ff63 100644
--- a/BPASmart.PageLoad/MainWindow.xaml
+++ b/BPASmart.PageLoad/MainWindow.xaml
@@ -2,7 +2,7 @@
     x:Class="BPASmart.PageLoad.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:ctrl="clr-namespace:BeDesignerSCADA.Controls;assembly=BeDesignerSCADA"
+    xmlns:ctrl="clr-namespace:BeDesignerSCADA.Controls;assembly=可视化配置工具"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BPASmart.PageLoad"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,7 +13,7 @@
     mc:Ignorable="d">
     <Grid>
         <Grid.Background>
-            <ImageBrush ImageSource="/BeDesignerSCADA;component/Images/bj.png" />
+            <ImageBrush ImageSource="/可视化配置工具;component/Images/bj.png" />
         </Grid.Background>
         <ctrl:RunCanvas x:Name="runCanvas" />
     </Grid>
diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll
index 3331c0b18cfedf496661f09e63c8ec8bc13716c3..c77b1d4f276535ff435161f578c5df3ff460a01d 100644
GIT binary patch
delta 294
zcmZqJ!rZWhc|r$ERZ`TVi9Irm`zEdoXUv++$f(Ym@t%PpWU?ZY&g4i&b;cu;8yV{v
z=S^m05@vl;#=yWh`Qat=%>hiioEZ;q=62gFBKd-qfk8PmnBhwz1A_nqknJAo=>nu#
zHb0C~OBD3hXLuictWzx5cVb@s)7bLB$r^jC7#Sxg?@<+4sjJw_DirG2wJ`mo$~~5~
zn`i8KA|m=_bI=<GM&AG?pdsx*ya(u@J(DM16lZn*z`)=<dF@4If!RGrO)EQhdhFZ6
z+IVKBhV<kI7psh*f*CMDkU>9o%x9{4`A6JZ@z>f(K<zNF2E<mFs3^ubZ}Z|y*^HAN
X7zH--UHQe#biiP<;Enf;6Ajn_oJ?%C

delta 306
zcmZqJ!rZWhc|r$EUdQTX6MJMB&rMtz&R8{>kx`ws;ynXH$Yez(oyn1m>Wo(=H!{{U
zuA9urB+UAyjDdl1^2JN$n**43IWu0~%<Z;UMDhnK1A}sCFat{x1A_nqknJAo=>nuh
zHb0C~OH_>3XK-RjWpDxFVunnHbcQ@2tB4_(!I{AkDC)>CSz?bBBg5q2J*om5!Zuv-
zWl8j&BlqpjEX9`A%^iE5h={iT{d$Oj(KmnzXlOeSp8-1X%;d(4;;g|R7#M;l&%LND
z;AXa=;%@VI=QXlBdY-hq7)`!#vC0T4*bEZ{8ssFDz9qwJ!HTGVWt<U<fZAbT4~VTW
fQBjO>-R8-cvKcq?UHQe#birV=;Enf;6Ajn_P2FpL


From c69ce1adaad17f34632205e819a052fff298376c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 14 Oct 2022 10:41:20 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Fonts/iconfont.ttf                        | Bin 8156 -> 10276 bytes
 .../Pages/View/LoginView.xaml.cs              |   4 +-
 .../Pages/View/PromptView.xaml                |  52 ++++
 .../Pages/View/PromptView.xaml.cs             |  33 +++
 .../UserControls/NumberTextBox.xaml           | 230 ++++++++++++++++++
 .../UserControls/NumberTextBox.xaml.cs        |  81 ++++++
 .../Fonts/iconfont.ttf                        | Bin 9412 -> 10276 bytes
 .../Models/BaseModel.cs                       |   3 +
 .../ViewModels/NewOutletViewModel.cs          |  31 ++-
 .../ViewModels/NewRecipeViewModel.cs          |  14 ++
 .../ViewModels/NewSiloViewModel.cs            |  45 ++--
 .../Views/NewOutletView.xaml                  |   8 +
 .../Views/NewRecipeView.xaml                  |  10 +-
 .../Views/PromptView.xaml                     |  22 ++
 .../Views/PromptView.xaml.cs                  |  27 ++
 WPFDemo/App.xaml                              |   2 +-
 WPFDemo/Window2.xaml                          |  89 +++++++
 WPFDemo/Window2.xaml.cs                       |  32 +++
 18 files changed, 659 insertions(+), 24 deletions(-)
 create mode 100644 BPASmartClient.CustomResource/Pages/View/PromptView.xaml
 create mode 100644 BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
 create mode 100644 BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml
 create mode 100644 BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml.cs
 create mode 100644 BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml
 create mode 100644 BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml.cs
 create mode 100644 WPFDemo/Window2.xaml
 create mode 100644 WPFDemo/Window2.xaml.cs

diff --git a/BPASmartClient.CustomResource/Fonts/iconfont.ttf b/BPASmartClient.CustomResource/Fonts/iconfont.ttf
index 3fa0ee4cc0364857bbc20c64d2e4d64c0f7685e8..d6a19d36c377479389afc3dd0ba2c05baeb156f1 100644
GIT binary patch
delta 3038
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
JuSA>4e*iQKi8BBI

delta 941
zcmZ{i%}Z2K7{;G-@15(+IDXV*O-|G(IrzCS#z9GH7l8;71QJROjylAQ3b}AH8pUXn
zh;X;<Y?Unpp<4I{v@=@NrpPw$41Iu*(LluQIUbTWp386UdCxufywCI8d3x=`<+aw*
z&`UtA0JuF~$jok^`7s1oBY-_Ul`l?4F0Ql#E+04T<t8%OmOJq;EOtpc$Ay}Y_7l#x
z$@yGiZaxp+=Xu{)=kqh;nJcNGDiC<hy1$T_pH;o8i_c@M6VsW(L}O`va1)5{vFX(8
z%-y;6KkwP?ECr|~D9Tv$7cuG_9P4nAFaAH`2P<4HZ$AEht6}gbYPpN!Q`^^H|L(r;
zKX70#u@1u0s~q~IxH{)0)Qp0+rY>2PviC-{c_HhDH)*w$lBStTz&@CD^B$(mBpmGX
z<!&T6i-;`|iAt*^rBiw&Edw$vW0IAe6r?E2vML+0Q(mZ)buxm(-5uQBcl2({_q|@b
zYeKQng~Ka_6w*gtpuk$x-~<9VMbV9DMm?J7*+CRB9K&&(M2O!rhz3Mx=rrmWg}eUQ
zRwa6h5U8vAm!nzhHE8F;$TVyLVT>9!gV+YPr8@%!K%xdpfwUTQl9Dt~9;Cy-UL{B;
z3qsA19s|`w`V9KpN!mb1kO2d|L52-<2^llcFC=TAb4bp>3?Kyq(|{B;+CTq#vTR^P
zkW~Z2f@~OcMzUjIfG95*7$quYgAP>>1vR4HSuyLO^}=@T`*y{yI$>u&P#;JIUb!hZ
o@7{Bt2m3?8(A#j$_3)$cvv755x2_mdaqng_t+4ew*`a9rFCV+!&;S4c

diff --git a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
index ee02bb0e..c3acb29d 100644
--- a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
@@ -28,7 +28,7 @@ namespace BPASmartClient.CustomResource.Pages.View
         {
             InitializeComponent();
             //grid.Visibility = Visibility.Collapsed;
-            Username.Focus();
+            //Username.Focus();
             Username.SelectionStart = Username.Text.Trim().Length;
             this.Loaded += LoginView_Loaded;
             ActionManage.GetInstance.Register(new Action(() =>
@@ -55,6 +55,8 @@ namespace BPASmartClient.CustomResource.Pages.View
                 //player.Unloaded += new RoutedEventHandler(media_Unloaded);// 添加元素卸载完成事件 -- 停止播放
                 //player.MediaOpened += Player_MediaOpened;//已播放事件
             }
+            grid.Visibility = Visibility.Visible;
+            Username.Focus();
         }
 
         private void Player_MediaOpened(object sender, RoutedEventArgs e)
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
new file mode 100644
index 00000000..917ceb69
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
@@ -0,0 +1,52 @@
+<Window
+    x:Class="BPASmartClient.CustomResource.Pages.View.PromptView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.Pages.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="PromptView"
+    Width="400"
+    Height="200"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" Stretch="Fill" />
+        </Grid.Background>
+
+        <Grid Margin="18,16">
+            <Button
+                Width="30"
+                Height="20"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Background="Transparent"
+                BorderThickness="0"
+                Click="Button_Click" />
+
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="0.2*" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="&#xe657;" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Red" FontFamily="../../Fonts/#iconfont"/>
+
+            </Grid>
+
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="0.7*" />
+            </Grid.RowDefinitions>
+        </Grid>
+
+
+
+
+
+    </Grid>
+</Window>
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
new file mode 100644
index 00000000..d1961c58
--- /dev/null
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
@@ -0,0 +1,33 @@
+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;
+
+namespace BPASmartClient.CustomResource.Pages.View
+{
+    /// <summary>
+    /// PromptView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PromptView : Window
+    {
+        public PromptView()
+        {
+            InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+    }
+}
diff --git a/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml b/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml
new file mode 100644
index 00000000..6f37399b
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml
@@ -0,0 +1,230 @@
+<UserControl
+    x:Class="BPASmartClient.CustomResource.UserControls.NumberTextBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="35"
+    d:DesignWidth="150"
+    mc:Ignorable="d">
+
+
+    <UserControl.Resources>
+
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/RecDictionarys/RecButtonStyle.xaml" />
+
+                <ResourceDictionary>
+                    <Style x:Key="TextBoxStyle" TargetType="TextBox">
+                        <Setter Property="FontFamily" Value="楷体" />
+                        <Setter Property="FontSize" Value="22" />
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                        <Setter Property="Width" Value="188" />
+                        <Setter Property="Padding" Value="6,0,0,0" />
+                        <Setter Property="Height" Value="37" />
+                        <Setter Property="BorderThickness" Value="0" />
+                        <Setter Property="Foreground" Value="#009dff" />
+                        <Setter Property="BorderBrush" Value="#009dff" />
+                        <Setter Property="CaretBrush" Value="#009dff" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="Background">
+                            <Setter.Value>
+                                <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/textBox.png" Stretch="Fill" />
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ResourceDictionary>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+
+
+    </UserControl.Resources>
+
+    <Grid>
+        <Viewbox>
+            <Grid>
+                <TextBox
+                    Name="outLoc"
+                    Width="180"
+                    Height="35"
+                    FontSize="20"
+                    GotFocus="outLoc_GotFocus"
+                    Style="{StaticResource TextBoxStyle}" />
+
+                <Popup
+                    Name="pp"
+                    AllowsTransparency="True"
+                    Focusable="False"
+                    Placement="Bottom"
+                    PlacementTarget="{Binding ElementName=outLoc}"
+                    StaysOpen="True">
+                    <Border
+                        Width="260"
+                        Height="300"
+                        Background="#081424"
+                        ClipToBounds="True">
+                        <Grid Margin="0">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="35" />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+
+                            <TextBox
+                                Name="input"
+                                Width="267"
+                                Height="36"
+                                Margin="-4,0,0,0"
+                                VerticalContentAlignment="Center"
+                                FontSize="18"
+                                GotFocus="input_GotFocus"
+                                Style="{StaticResource TextBoxStyle}" />
+
+                            <Grid Grid.Row="1">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <Button
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="1"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="2"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="0"
+                                    Grid.Column="2"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="3"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="0"
+                                    Grid.Column="3"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="ESC"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="4"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="5"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="6"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="1"
+                                    Grid.Column="3"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="BR"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="7"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="8"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="2"
+                                    Grid.Column="2"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="9"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="2"
+                                    Grid.Column="3"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="Clear"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="0"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="."
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                                <Button
+                                    Grid.Row="3"
+                                    Grid.Column="2"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2"
+                                    Click="Button_Click"
+                                    Content="Deter"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+                            </Grid>
+
+
+                        </Grid>
+                    </Border>
+                </Popup>
+
+            </Grid>
+        </Viewbox>
+    </Grid>
+</UserControl>
diff --git a/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml.cs b/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml.cs
new file mode 100644
index 00000000..44379cb1
--- /dev/null
+++ b/BPASmartClient.CustomResource/UserControls/NumberTextBox.xaml.cs
@@ -0,0 +1,81 @@
+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 BPASmartClient.CustomResource.UserControls
+{
+    /// <summary>
+    /// NumberTextBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class NumberTextBox : UserControl
+    {
+        public NumberTextBox()
+        {
+            InitializeComponent();
+        }
+
+
+        private void outLoc_GotFocus(object sender, RoutedEventArgs e)
+        {
+            this.pp.IsOpen = outLoc.Focusable;
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            var obj = (Button)sender;
+            switch (obj.Content)
+            {
+                case "0":
+                case "1":
+                case "2":
+                case "3":
+                case "4":
+                case "5":
+                case "6":
+                case "7":
+                case "8":
+                case "9":
+                    input.Text = input.Text.Trim() + obj.Content.ToString();
+                    break;
+                case ".":
+                    if (!string.IsNullOrEmpty(input.Text) && input.Text.Length > 0)
+                        input.Text = input.Text.Trim() + obj.Content.ToString();
+                    break;
+                case "ESC":
+                    this.pp.IsOpen = false;
+                    break;
+                case "BR":
+                    if (!string.IsNullOrEmpty(input.Text) && input.Text.Length > 0)
+                        input.Text = input.Text.Remove(input.Text.Length - 1);
+                    break;
+                case "Clear":
+                    input.Text = string.Empty;
+                    break;
+                case "Deter":
+                    outLoc.Text = input.Text;
+                    this.pp.IsOpen = false;
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private void input_GotFocus(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+
+    }
+}
diff --git a/BPASmartClient.SmallBatchingSystem/Fonts/iconfont.ttf b/BPASmartClient.SmallBatchingSystem/Fonts/iconfont.ttf
index 22181b32edae9e2409cc835768530c82031f988a..d6a19d36c377479389afc3dd0ba2c05baeb156f1 100644
GIT binary patch
delta 1828
zcmai!Uu;uV7{I@C@9n+qz3pB9+}^vE(zSQp?S?W!>3Y|(b;~3W4aCJ5i3zgRG1kGl
z%`gx|=`tenU>1@Z;{#D-#Dr*wafuJa2Oz{J6M6Ja^x>f5jK;_Vfz|KyIB`$j+h5PW
z?>pb0^PPM9*()O#?Ar6c0+4qBU~Ifvo_ntK)*k@EJb>h#oIZ8<+SJua0Qok+W`AX(
ze8?Uiq9}V8DO7O6+a>;q{jZQrr8<A|{79pL`{AB&etLGiyqJ08Mbv*2$GfZLlXIk(
zJcaA6I8M!!s}sT6a{uQ5?RU`V<lOAB`Sat)ivUh93f%_+ATBf(;DFTJR@%#EHavE7
z24|z!&%HC+(*GA|Qd8jjqiYxh0BakK#u;g^cov6V5Sq)lJ+?M!tEb2;5$YF6Nmz~7
z?~o2MQvZ!i*IyDko|)$6$YBthy{EBN(a~v;NFS>AK?)>@Q<3^<gqpOC+SH+2=vKOo
z7HE;~qx<W>3vqij&XPi5gIHHntmlcC#Kh`1#bS-%&O;mCVPNmB|9t^M5C$DKfgh6S
zn}7jZkcKEEzym(eAP#L9ODn`+GXx<3Eg*vl5sWJZ1}GRItb8GAq;~P2Jf)fE9NZiz
z=8b`7fMPBgXb>nWGSD=}$w4Q8MmXpWP?Lj>0d3>3^Pn~dodxP}YUnr6E)GTjbPES#
z0lJlgQ32h?!T5moa4=G!1rEjx6ibSM(F5Jb!8`!n&ta!aU*TYGfF6Px`vXi9&<Y0=
z2DHk-)B!!k!6X93+G1cjfxgYb!~$L7V2Xi$%E4p<{g%VZ>E3A$qyT=p#{r`T@bfVa
zo(im@=L~i}_*^Fma)LY%dWG-AC22{bo<p8b<gmO;eos-A6UsT|1Mi~uqW6|>x9^tk
zq3Tupw6Fc|2gU+-bwlsf&*2_;2#o~^FBnF=6{;99c<gL9$vSzrL~3p!XC;Yc8j4O7
zS+o^dkqyhV%$!?r3;C>*b(AED8nR+2atpy#*1>W6cH43DZlR|zNJ^w9@8F*8Hm<L)
zp}Jexk+V!ONerfHcMJKFkTV6Sj2>9Zc6Mf$4%9~P{M#R`oUTml92nR+QF*Z5i5d~V
zuF6qeQDsq(qFRgTkpy2U;8RtfnlNHXUjQeglB9Y9+1(wji9wH|c+@~RtSO2X4u=+)
zng3eh2E`jqJGFH~O^XjBTM{t`Z7D&`8}JFD?DGa9F<sHUVr)mi7gt+0`E<Wu55)9v
zJQ9s)5l8l}EqTz6jCQq9(=0nWmiDvwH9CX0DFfT_s)HwOcawsP*~*y~NfMn9yCy5x
zCdrO;u0)(H=_aD>^n~(-oEZ&a(sPBpW6Opq-hA{;*HBtA$cIMXP#<fg^x#^*YN~6m
zs**oph<RhPCb5yJ1}!UPS;1H)lgnh@YAf!^2=_Ccotekc%${PK_*o?U*bFBPO*3lA
zu<%Pb^7u<LM8-m<8Cts(GH)=oTn3}SGHiS#{vej|qtOL;?XYyPB7*E_Q>;pYtX{HD
zYUN4&L@Xt%WZkT5xt0KnbJfA&;lb)0k=A>QuaytFFBFUJ!SavTYj&=E+<*CU|K%$K
z%gX~}8^zZiF~y+`;!Qnr2{rJy%#_gQl{xupg4p$Vd&wqgVv~08%ugMwOesgEW+o@g
Yv;Ohpv#%dNIy*CYa%yJf<@O`wZ}vKb9{>OV

delta 999
zcmaKq&r4KM6vw~!z305qdFGU6(=_Qg)PR;Kl!74|1yP`bZ6nFaUxPR~G%l2+5wcB4
zn6G6-keg~F2ra^uNDCKbe?U~5V`j7~+P%JaE`qD><-<GYzVptH?|mx+o7a|7rM}C6
zS_CjOoX-}Pi%&9ul>_Ye<CC*vcdrk<1wsWNp3IGAN1FB)A2IeT>CExK{cOLWy-rT$
z^3yYO2m<E&Nq=r~YB)QbnW*CT?es6^voi(Nq0aDqjDGS?Ha{9Iz3g74y~Lv9g{k87
zmiu}LNd0Bd78Ki<59V>xDW`RK$PW*$#_|bIKP{|Zx>eKt8xclveHmN1vi}T%;JyR<
z0sSy6eafXXHL6BGsiqYCCDmi?7X58?+OM<*{X<sRAG4ZzGp3-r3cGBb<&*PR88|Az
z1m}^2gF3OrlUk{ll%%CaTBS`orAzw#Ei0bTf(Q--G?xQ9_5-XS@W0vTN{ZPo9N68^
zyXU_fID{HR5JM$Su)_+}p#ev5oMVPK>@g&86!nOsntglhz7|oqIElmT8!DugFw5Vw
z|CDHY+Ep{=kjdD)fu$f+O~axPDyd<4h;3jaoYcUUAhiZI2dOt`AthyC!;rLrt(PFp
zbV#{y3vI%AAgu;Y25B?stCS7{r-gJHI5(urKm{QE25JErG*A`Dh=KY*_{U35&mX6e
zH&8UltU+J9@DI{xjpU($l0qIEC@$oUfigor8Ynn+?inaOzV8@#3D_+f^mU+@U>+Ol
zwiUBucESGTv^&q74;2j+PeTYrLn+sD({7);9qtP+gqOpcRRfV^<cBxmJ@+=Mqid^`
SuM+&HZ=`z^*50Kjl)^t%+0xPg

diff --git a/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs b/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs
index b4ebc6d9..c18c63e7 100644
--- a/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs
+++ b/BPASmartClient.SmallBatchingSystem/Models/BaseModel.cs
@@ -16,5 +16,8 @@ namespace BPASmartClient.SmallBatchingSystem
         public RelayCommand SaveCommand { get; set; }
         public RelayCommand<object> RemoveCommand { get; set; }
         public RelayCommand<object> DetailsCommand { get; set; }
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo;
+
     }
 }
diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs
index 02ea9380..e14513e2 100644
--- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs
+++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewOutletViewModel.cs
@@ -38,18 +38,41 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
                 SiloInfos.ToList()?.ForEach(item => { SileNames.Add(item.RawMaterialName); });
                 if (Index >= 0 && Index < Json<ConfigInfoModel>.Data.OutletInfoModels.Count)
                 {
+                    var array = Json<ConfigInfoModel>.Data.OutletInfoModels.ToArray();
+                    var res = Array.FindIndex(array, p => p.OutletName == OutletName);
+                    if (res >= 0 && res != Index)
+                    {
+                        ErrorInfo = "出料口名称已经存在！";
+                        return;
+                    }
+
+                    var temp = Array.FindIndex(array, p => p.OutletLoc == OutletLoc);
+                    if (temp >= 0 && temp != Index)
+                    {
+                        ErrorInfo = "出料口位置已存在！";
+                        return;
+                    }
                     Json<ConfigInfoModel>.Data.OutletInfoModels.ElementAt(Index).OutletName = OutletName;
                     Json<ConfigInfoModel>.Data.OutletInfoModels.ElementAt(Index).OutletLoc = OutletLoc;
                     Json<ConfigInfoModel>.Data.OutletInfoModels.ElementAt(Index).SiloInfos.Clear();
-                    //SileNames.ToList()?.ForEach(temp =>
-                    //{
-                    //    Json<ConfigInfoModel>.Data.OutletInfoModels.ElementAt(Index).SiloInfos.Add(temp);
-                    //});
                     Json<ConfigInfoModel>.Data.OutletInfoModels.ElementAt(Index).SiloInfos = SileNames;
                     Control.GetInstance.OperationLog($"{OutletName} 编辑完成");
                 }
                 else
                 {
+                    var res = Json<ConfigInfoModel>.Data.OutletInfoModels.FirstOrDefault(p => p.OutletName == OutletName);
+                    if (res != null)
+                    {
+                        ErrorInfo = "出料口名称已经存在！";
+                        return;
+                    }
+
+                    var temp = Json<ConfigInfoModel>.Data.OutletInfoModels.FirstOrDefault(p => p.OutletLoc == OutletLoc);
+                    if (temp != null)
+                    {
+                        ErrorInfo = "出料口位置已存在！";
+                        return;
+                    }
                     Json<ConfigInfoModel>.Data.OutletInfoModels.Add(new OutletInfoModel()
                     {
                         OutletLoc = OutletLoc,
diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
index f8701567..5764539e 100644
--- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
+++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
@@ -34,6 +34,13 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
             {
                 if (Index >= 0 && Index < Json<ConfigInfoModel>.Data.OutletInfoModels.Count)
                 {
+                    var res = Array.FindIndex(Json<ConfigInfoModel>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+                    if (res >= 0 && res != Index)
+                    {
+                        ErrorInfo = "配方名称已经存在！";
+                        return;
+                    }
+
                     Json<ConfigInfoModel>.Data.Recipes.ElementAt(Index).RecipeName = RecipeName;
                     Json<ConfigInfoModel>.Data.Recipes.ElementAt(Index).SiloInfoModels.Clear();
                     SiloInfos.ToList()?.ForEach(item =>
@@ -44,6 +51,13 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
                 }
                 else
                 {
+                    var res = Json<ConfigInfoModel>.Data.Recipes.FirstOrDefault(p => p.RecipeName == RecipeName);
+                    if (res != null)
+                    {
+                        ErrorInfo = "配方名称已经存在！";
+                        return;
+                    }
+
                     Json<ConfigInfoModel>.Data.Recipes.Add(new RecipeInfo()
                     {
                         RecipeName = RecipeName,
diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs
index 2e4d735e..7dffab8c 100644
--- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs
+++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewSiloViewModel.cs
@@ -16,28 +16,43 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
             CancelCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("SiloClose"); });
             SaveCommand = new RelayCommand(() =>
             {
-                var res = Json<ConfigInfoModel>.Data.SiloInfoModels.FirstOrDefault(p => p.SiloName == SiloInfoModelObj.SiloName);
-                if (res != null)
+                if (Index >= 0 && Index < Json<ConfigInfoModel>.Data.SiloInfoModels.Count)
                 {
-                    ErrorInfo = "料仓名称已经存在！";
-                    return;
-                }
+                    var array = Json<ConfigInfoModel>.Data.SiloInfoModels.ToArray();
+                    var res = Array.FindIndex(array, p => p.SiloName == SiloInfoModelObj.SiloName);
+                    if (res >= 0 && res != Index)
+                    {
+                        ErrorInfo = "料仓名称已经存在！";
+                        return;
+                    }
 
-                var temp = Json<ConfigInfoModel>.Data.SiloInfoModels.FirstOrDefault(p => p.SiloLoc == SiloInfoModelObj.SiloLoc);
-                if (temp != null)
-                {
-                    ErrorInfo = "料仓位置已存在！";
-                    return;
-                }
+                    var temp = Array.FindIndex(array, p => p.SiloLoc == SiloInfoModelObj.SiloLoc);
+                    if (temp >= 0 && temp != Index)
+                    {
+                        ErrorInfo = "料仓位置已存在！";
+                        return;
+                    }
 
-                if (Index >= 0 && Index < Json<ConfigInfoModel>.Data.SiloInfoModels.Count)
-                {
                     Json<ConfigInfoModel>.Data.SiloInfoModels.ElementAt(Index).SiloName = SiloInfoModelObj.SiloName;
                     Json<ConfigInfoModel>.Data.SiloInfoModels.ElementAt(Index).SiloLoc = SiloInfoModelObj.SiloLoc;
                     Control.GetInstance.OperationLog($"{SiloInfoModelObj.SiloName} 编辑完成");
                 }
                 else
                 {
+                    var res = Json<ConfigInfoModel>.Data.SiloInfoModels.FirstOrDefault(p => p.SiloName == SiloInfoModelObj.SiloName);
+                    if (res != null)
+                    {
+                        ErrorInfo = "料仓名称已经存在！";
+                        return;
+                    }
+
+                    var temp = Json<ConfigInfoModel>.Data.SiloInfoModels.FirstOrDefault(p => p.SiloLoc == SiloInfoModelObj.SiloLoc);
+                    if (temp != null)
+                    {
+                        ErrorInfo = "料仓位置已存在！";
+                        return;
+                    }
+
                     Json<ConfigInfoModel>.Data.SiloInfoModels.Add(new SiloInfoModel()
                     {
                         SiloLoc = SiloInfoModelObj.SiloLoc,
@@ -62,9 +77,5 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
         public SiloInfoModel SiloInfoModelObj { get { return _mSiloInfoModelObj; } set { _mSiloInfoModelObj = value; OnPropertyChanged(); } }
         private SiloInfoModel _mSiloInfoModelObj = new SiloInfoModel();
 
-
-        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
-        private string _mErrorInfo;
-
     }
 }
diff --git a/BPASmartClient.SmallBatchingSystem/Views/NewOutletView.xaml b/BPASmartClient.SmallBatchingSystem/Views/NewOutletView.xaml
index 61cbc039..5fa45d27 100644
--- a/BPASmartClient.SmallBatchingSystem/Views/NewOutletView.xaml
+++ b/BPASmartClient.SmallBatchingSystem/Views/NewOutletView.xaml
@@ -95,6 +95,14 @@
                     FontSize="20"
                     Style="{StaticResource TextBoxStyle}" />-->
 
+                <TextBlock
+                    Margin="0,0,5,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="20"
+                    Foreground="#FFF53F62"
+                    Text="{Binding ErrorInfo}" />
+
                 <Button
                     Width="90"
                     Height="30"
diff --git a/BPASmartClient.SmallBatchingSystem/Views/NewRecipeView.xaml b/BPASmartClient.SmallBatchingSystem/Views/NewRecipeView.xaml
index 29ce86e4..b80f102f 100644
--- a/BPASmartClient.SmallBatchingSystem/Views/NewRecipeView.xaml
+++ b/BPASmartClient.SmallBatchingSystem/Views/NewRecipeView.xaml
@@ -10,9 +10,9 @@
     Title="NewPfView"
     Width="500"
     Height="300"
-    Topmost="True"
     AllowsTransparency="True"
     Background="{x:Null}"
+    Topmost="True"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
@@ -51,6 +51,14 @@
                 Style="{StaticResource TextBlockStyle}"
                 Text="配方名称：" />
 
+            <TextBlock
+                Margin="0,0,10,0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Center"
+                FontSize="20"
+                Foreground="#FFF53F62"
+                Text="{Binding ErrorInfo}" />
+
             <StackPanel
                 Grid.Row="1"
                 Margin="10,0,0,0"
diff --git a/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml b/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml
new file mode 100644
index 00000000..70a31f48
--- /dev/null
+++ b/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml
@@ -0,0 +1,22 @@
+<Window
+    x:Class="BPASmartClient.SmallBatchingSystem.Views.PromptView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.SmallBatchingSystem.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="PromptView"
+    Width="400"
+    Height="200"
+    AllowsTransparency="True"
+    Background="{x:Null}"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.Background>
+            <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" Stretch="Fill" />
+        </Grid.Background>
+
+    </Grid>
+</Window>
diff --git a/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml.cs b/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml.cs
new file mode 100644
index 00000000..96e59938
--- /dev/null
+++ b/BPASmartClient.SmallBatchingSystem/Views/PromptView.xaml.cs
@@ -0,0 +1,27 @@
+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;
+
+namespace BPASmartClient.SmallBatchingSystem.Views
+{
+    /// <summary>
+    /// PromptView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PromptView : Window
+    {
+        public PromptView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/WPFDemo/App.xaml b/WPFDemo/App.xaml
index d5f0b6e2..44fb039c 100644
--- a/WPFDemo/App.xaml
+++ b/WPFDemo/App.xaml
@@ -3,6 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:WPFDemo"
-    StartupUri="Window1.xaml">
+    StartupUri="Window2.xaml">
     <Application.Resources />
 </Application>
diff --git a/WPFDemo/Window2.xaml b/WPFDemo/Window2.xaml
new file mode 100644
index 00000000..7cf340ba
--- /dev/null
+++ b/WPFDemo/Window2.xaml
@@ -0,0 +1,89 @@
+<Window
+    x:Class="WPFDemo.Window2"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:WPFDemo"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:pru="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    Title="Window2"
+    Width="800"
+    Height="450"
+    Topmost="True"
+    mc:Ignorable="d">
+    <Grid>
+        <pru:NumberTextBox Width="150" Height="30" />
+
+        <!--<Grid>
+            <TextBox
+                    Name="outLoc"
+                    Width="180"
+                    Height="35"
+                    Margin="5,0,0,0"
+                    GotFocus="outLoc_GotFocus"
+                    FontSize="20"
+                    Text="{Binding OutletLoc}" />
+
+            <Popup
+                    Name="pp"
+                    AllowsTransparency="True"
+                    Focusable="False"
+                    Placement="Left"
+                    PlacementTarget="{Binding ElementName=outLoc}"
+                    StaysOpen="True">
+                <Border Background="#081424" ClipToBounds="True">
+                    <Grid Margin="0" >
+                        <Grid.RowDefinitions>
+                            <RowDefinition/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+
+                        <TextBox Text="125"/>
+
+                        <Grid Grid.Row="1">
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
+
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock Foreground="White" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Text="1"/>
+                            <TextBlock Foreground="White" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Text="2"/>
+                            <TextBlock Foreground="White" Grid.Row="0" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="3"/>
+                            <TextBlock Foreground="White" Grid.Row="0" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" Text="4"/>
+
+                            <TextBlock Foreground="White" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Text="5"/>
+                            <TextBlock Foreground="White" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Text="6"/>
+                            <TextBlock Foreground="White" Grid.Row="1" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="7"/>
+                            <TextBlock Foreground="White" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" Text="8"/>
+
+                            <TextBlock Foreground="White" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Text="9"/>
+                            <TextBlock Foreground="White" Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Text="0"/>
+                            <TextBlock Foreground="White" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="."/>
+                            <TextBlock Foreground="White" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" Text="br"/>
+
+                            <TextBlock Foreground="White" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Text="enter"/>
+                            <TextBlock Foreground="White" Grid.Row="3" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Text="a"/>
+                            <TextBlock Foreground="White" Grid.Row="3" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Text="b"/>
+                            <TextBlock Foreground="White" Grid.Row="3" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" Text="c"/>
+
+                        </Grid>
+
+
+                    </Grid>
+                </Border>
+            </Popup>
+
+        </Grid>-->
+
+
+    </Grid>
+</Window>
diff --git a/WPFDemo/Window2.xaml.cs b/WPFDemo/Window2.xaml.cs
new file mode 100644
index 00000000..15c9fa1e
--- /dev/null
+++ b/WPFDemo/Window2.xaml.cs
@@ -0,0 +1,32 @@
+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;
+
+namespace WPFDemo
+{
+    /// <summary>
+    /// Window2.xaml 的交互逻辑
+    /// </summary>
+    public partial class Window2 : Window
+    {
+        public Window2()
+        {
+            InitializeComponent();
+        }
+
+        private void outLoc_GotFocus(object sender, RoutedEventArgs e)
+        {
+            //this.pp.IsOpen = this.outLoc.Focusable;
+        }
+    }
+}

From d51112cd57aafdd31657e2d8f6869940634dce82 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 14 Oct 2022 10:59:55 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E5=90=89=E4=B9=A1=E5=B1=85=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |   7 +
 .../Model/ProcessControl.cs                   | 243 ++++++++++++++++--
 .../Model/Recipes/RemoteRecipeData.cs         |   6 -
 .../Model/Recipes/RemoteRecipeRawMaterial.cs  |   3 +
 .../App.xaml.cs                               |   4 +-
 .../Model/HK_PLC/HKDeviceStatus.cs            |   7 +-
 .../Model/ProcessControl.cs                   |  28 +-
 .../ViewModel/RecipeReceiveViewModel.cs       |   9 +-
 .../SiemensRecipeReceiveViewModel.cs          |   4 +
 BPASmartClient.S7Net/SiemensHelper.cs         |   5 +-
 10 files changed, 286 insertions(+), 30 deletions(-)

diff --git a/BPASmartClient.DosingProject/Model/GVL_SmallStation.cs b/BPASmartClient.DosingProject/Model/GVL_SmallStation.cs
index 4b847ef7..715382b8 100644
--- a/BPASmartClient.DosingProject/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.DosingProject/Model/GVL_SmallStation.cs
@@ -78,6 +78,13 @@ namespace BPASmartClient.DosingHKProject.Model
 
         public HKPlcCommRead plcRead = new HKPlcCommRead();
         public HKPlcCommWrite plcWrite = new HKPlcCommWrite();
+        /// <summary>
+        /// 0:无意义，1=load位，2=1号位，3=2号位，4=3号位，5=4号位，6=5号位，7=6号位，8=unload位
+        /// </summary>
+        public int[] Barrel_Location = new int[MaxBarrelNum];
+        public bool[] AllowDosing_Pos = new bool[MaxBarrelNum];
+        public bool[] AllowDosing_Sign = new bool[MaxBarrelNum];
+        public const int MaxBarrelNum = 6;
         #region 本地模拟配方
         /// <summary>
         /// 是否使用本地模拟配方
diff --git a/BPASmartClient.DosingProject/Model/ProcessControl.cs b/BPASmartClient.DosingProject/Model/ProcessControl.cs
index a07f634f..125670fa 100644
--- a/BPASmartClient.DosingProject/Model/ProcessControl.cs
+++ b/BPASmartClient.DosingProject/Model/ProcessControl.cs
@@ -188,6 +188,16 @@ namespace BPASmartClient.DosingHKProject.Model
                 GVL_SmallStation.GetInstance.RecipeStatusID = 0;
             }
         }
+
+        int cnt_sensor1 = 0;
+        int cnt_sensor2 = 0;
+        int cnt_sensor3 = 0;
+        int cnt_sensor4 = 0;
+        int cnt_sensor5 = 0;
+        int cnt_sensor6 = 0;
+        int cnt_sensor7 = 0;
+        int cnt_sensor8 = 0;
+        int barrel1 = 0;
         /// <summary>
         /// 执行配方队列中的第一个配方
         /// </summary>
@@ -199,12 +209,214 @@ namespace BPASmartClient.DosingHKProject.Model
                 if (index >= 0 && index < RemoteRecipes.Count)
                 {
                     string code = RemoteRecipes.ElementAt(index).RecipeCode;
-                    int trayCode = RemoteRecipes.ElementAt(index).TrayCode;
                     string recipeName = RemoteRecipes.ElementAt(index).RecipeName;
-                    string windSend = RemoteRecipes.ElementAt(index).ToString();
+                    #region sensor处理
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Load)
+                    {
+                        cnt_sensor1++;
+                    }
+                    else 
+                    {
+                        if (cnt_sensor1 >= 50)
+                        {
+                            if (barrel1 >= 0 && barrel1 < GVL_SmallStation.MaxBarrelNum)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[barrel1] == 0)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[barrel1] = 1;
+                                    barrel1++;
+                                }
+                            }
+                            else 
+                            {
+                                //报错，超过最大的桶号数
+                            }
+                        }
+                        cnt_sensor1 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station1)
+                    {
+                        cnt_sensor2++;
+                    }
+                    else 
+                    {
+                        if (cnt_sensor2 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 1)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 2;
+                                }
+                            }
+                        }
+                        cnt_sensor2 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station2)
+                    {
+                        cnt_sensor3++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor3 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 2)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 3;
+                                }
+                            }
+                        }
+                        cnt_sensor3 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station3)
+                    {
+                        cnt_sensor4++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor4 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 3)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 4;
+                                }
+                            }
+                        }
+                        cnt_sensor4 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station4)
+                    {
+                        cnt_sensor5++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor5 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 4)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 5;
+                                }
+                            }
+                        }
+                        cnt_sensor5 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station5)
+                    {
+                        cnt_sensor6++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor6 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 5)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 6;
+                                }
+                            }
+                        }
+                        cnt_sensor6 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station6)
+                    {
+                        cnt_sensor7++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor7 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 6)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 7;
+                                }
+                            }
+                        }
+                        cnt_sensor7 = 0;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Unload)
+                    {
+                        HKDevice.HK_PLC_S7.Write<bool>("DB2.DBX3.0", false);
+                        HKDevice.HK_PLC_S7.Write<bool>("DB2.DBX3.1", false);
+                        MessageLog.GetInstance.ShowRunLog($"下料桶堵料，线体不运行");
+                        cnt_sensor8++;
+                    }
+                    else
+                    {
+                        if (cnt_sensor8 >= 50)
+                        {
+                            for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                            {
+                                if (GVL_SmallStation.GetInstance.Barrel_Location[i] == 7)
+                                {
+                                    GVL_SmallStation.GetInstance.Barrel_Location[i] = 0;
+                                }
+                            }
+                        }
+                        cnt_sensor8 = 0;
+                    }
+                    #endregion
+                    for (int i = 0; i < GVL_SmallStation.GetInstance.Barrel_Location.Length; i++)
+                    {
+                        if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station1 && GVL_SmallStation.GetInstance.Barrel_Location[i] == 1)
+                        {
+                            foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+                            {
+                                if ((item.RawMaterialLocation == i+1 || item.RawMaterialLocation == i+7) && item.IsDosingFinish == false && item.RawMaterialBarrelNum == i+1)
+                                {
+                                    GVL_SmallStation.GetInstance.AllowDosing_Pos[i] = true;
+                                }
+                            }
+                        }
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station1 && GVL_SmallStation.GetInstance.Barrel_Location[0] == 1) 
+                    {
+                        foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+                        {
+                            if ((item.RawMaterialLocation == 1 || item.RawMaterialLocation == 7) && item.IsDosingFinish == false && item.RawMaterialBarrelNum == 1)
+                            {
+                                GVL_SmallStation.GetInstance.AllowDosing_Pos[0] = true;
+                            }
+                        }
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station2 && GVL_SmallStation.GetInstance.Barrel_Location[1] == 1)
+                    {
+                        GVL_SmallStation.GetInstance.AllowDosing_Pos[1] = true;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station3 && GVL_SmallStation.GetInstance.Barrel_Location[2] == 1)
+                    {
+                        GVL_SmallStation.GetInstance.AllowDosing_Pos[2] = true;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station4 && GVL_SmallStation.GetInstance.Barrel_Location[3] == 1)
+                    {
+                        GVL_SmallStation.GetInstance.AllowDosing_Pos[3] = true;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station5 && GVL_SmallStation.GetInstance.Barrel_Location[4] == 1)
+                    {
+                        GVL_SmallStation.GetInstance.AllowDosing_Pos[4] = true;
+                    }
+                    if (GVL_SmallStation.GetInstance.plcRead.Sensor_Station6 && GVL_SmallStation.GetInstance.Barrel_Location[5] == 1)
+                    {
+                        GVL_SmallStation.GetInstance.AllowDosing_Pos[5] = true;
+                    }
+                    foreach (var item in RemoteRecipes.ElementAt(index).RawMaterial)
+                    {
+                        
+                    }
                     if (GVL_SmallStation.GetInstance.RecipeStatusID == 0) 
                     {
-                        RunInit();
+                        if (RunInit() == 1)
+                        {
+                            GVL_SmallStation.GetInstance.RecipeStatusID = 1;
+                        }
                     }
                     if (GVL_SmallStation.GetInstance.RecipeStatusID == 1)
                     {
@@ -214,28 +426,29 @@ namespace BPASmartClient.DosingHKProject.Model
                     }
                     if (HKDevice.HK_PLC_S7.Read<bool>("DB2.DBX3.0") && HKDevice.HK_PLC_S7.Read<bool>("DB2.DBX3.1") && GVL_SmallStation.GetInstance.RecipeStatusID == 2) 
                     {
-                        if (GVL_SmallStation.GetInstance.plcRead.Sensor_Load) 
-                        {
-                            
-                        }
+                        GVL_SmallStation.GetInstance.RecipeStatusID = 3;
                     }
                     if (GVL_SmallStation.GetInstance.RecipeStatusID == 3) 
                     {
-                        if (RTrig.GetInstance("DB3.DBX50.0").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.0")))
+                        for (int i = 0; i < 6; i++)
                         {
-                            var res = HKDevice.HK_PLC_S7.Read<float>("DB3.DBD10");
-                            MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{res}料仓，允许配料");
-                            if (res > 0 && res is float loc)
+
+                        }
+                        if (GVL_SmallStation.GetInstance.AllowDosing_Pos[0])
+                        {
+                            int res = 1;
+                            MessageLog.GetInstance.ShowRunLog($"配方：{recipeName}，1号桶，{res}料仓，允许配料");
+                            if (res > 0 )
                             {
-                                int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
+                                int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == res);
                                 float weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
                                 if (loc_index >= 0)
                                 {
-                                    DeviceInquire.GetInstance.GetDevice((int)loc)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
-                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)loc;
+                                    DeviceInquire.GetInstance.GetDevice((int)res)?.Start(weight);//根据料仓编号 启动并写入每个原料重量
+                                    GVL_SmallStation.GetInstance.StockInIsWork = (int)res;
                                 }
                                 GVL_SmallStation.GetInstance.DosingTray1 = true;
-                                MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
+                                MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)res}号仓，配料完成");
                             }
                         }
                         else if(RTrig.GetInstance("DB3.DBX50.1").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.1")))
diff --git a/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeData.cs b/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeData.cs
index ebb4a152..e389b9ea 100644
--- a/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeData.cs
+++ b/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeData.cs
@@ -21,12 +21,6 @@ namespace BPASmartClient.DosingHKProject.Model
         /// </summary>
         public string RecipeCode { get { return _mRecipeCode; } set { _mRecipeCode = value;OnPropertyChanged(); } }
         private string _mRecipeCode;
- 
-        /// <summary>
-        /// 托盘编号
-        /// </summary>
-        public int TrayCode { get { return _mTrayCode; } set { _mTrayCode = value; OnPropertyChanged(); } }
-        private int _mTrayCode;
 
         /// <summary>
         /// 原料数据
diff --git a/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeRawMaterial.cs b/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeRawMaterial.cs
index 413e2f4c..27d29cd3 100644
--- a/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeRawMaterial.cs
+++ b/BPASmartClient.DosingProject/Model/Recipes/RemoteRecipeRawMaterial.cs
@@ -44,5 +44,8 @@ namespace BPASmartClient.DosingHKProject.Model
         /// </summary>
         public int RawMaterialLocation { get { return _mRawMaterialLocation; } set { _mRawMaterialLocation = value;OnPropertyChanged(); } }
         private int _mRawMaterialLocation;
+
+        public bool IsDosingFinish { get { return _mDosingFinish; } set { _mDosingFinish = value; } }
+        private bool _mDosingFinish;
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
index 0d9ebe11..93bb59d2 100644
--- a/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
+++ b/BPASmartClient.JXJFoodSmallStation/App.xaml.cs
@@ -29,7 +29,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             MenuInit();
             DataInit();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
-          //  ProcessControl.GetInstance.Init();
+            ProcessControl.GetInstance.Init();
             MainView mv = new MainView();
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
@@ -47,6 +47,7 @@ namespace BPASmartClient.JXJFoodSmallStation
         {
             base.OnExit(e);
             Json<LocaPar>.Save();
+            Json<LocalRecipeDataColl>.Save();
             MessageLog.GetInstance.LogSave();
             ThreadManage.GetInstance().Dispose();
         }
@@ -258,6 +259,7 @@ namespace BPASmartClient.JXJFoodSmallStation
             Json<LocaPar>.Read();
             Json<DevicePar>.Read();
             Json<WindSendDevicePar>.Read();
+            Json<LocalRecipeDataColl>.Read();
         }
 
     }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
index ac5f51d3..084aab3c 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/HK_PLC/HKDeviceStatus.cs
@@ -7,6 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using BPASmartClient.S7Net;
 using BPASmartClient.CustomResource.Pages.Model;
+using System.Threading;
 
 namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
 {
@@ -20,7 +21,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model.HK_PLC
             {
                 ThreadManage.GetInstance().StartLong(new Action(() => 
                 {
-                    
+                    if (!IsConnected)
+                    {
+                        MessageLog.GetInstance.ShowRunLog("海科PLC断开连接");
+                    }
+                    Thread.Sleep(10);
                 }),"信号收发处理");
             }
         }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 019b0da1..dd6c403d 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -752,7 +752,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             {
                                 for (int i = 1; i < 16; i++)
                                 {
-                                    if (RTrig.GetInstance("GetDeviceRunStatus").Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+                                    if (RTrig.GetInstance("Tray1StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
                                     {
                                         MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
                                         int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
@@ -884,7 +884,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray2 = true;
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
-
                                 }
                             }
                             else if (RTrig.GetInstance("DB3.DBX50.7").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX50.7")))
@@ -905,11 +904,11 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
-                            if (GVL_SmallStation.GetInstance.DosingTray2 == true) 
+                            if (GVL_SmallStation.GetInstance.DosingTray2 == true)
                             {
                                 for (int i = 1; i < 16; i++)
                                 {
-                                    if (RTrig.GetInstance("柔性味魔方配料完成").Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+                                    if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
                                     {
                                         MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
                                         int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
@@ -930,7 +929,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                             if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
                             {
                                 var res = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == code);
-                                MessageLog.GetInstance.ShowRunLog($"托盘2配方{res.RecipeName}配料完成");
+                                MessageLog.GetInstance.ShowRunLog($"托盘2,配方{res.RecipeName},配料完成");
                                 RecipeFinishInfo.Order_No = RemoteRecipes.ElementAt(index).RecipeCode;
                                 RecipeFinishInfo.Product_Code = RemoteRecipes.ElementAt(index).RecipeName;
                                 for (int i = 0; i < RemoteRecipes.ElementAt(index).RawMaterial.Count; i++)
@@ -958,5 +957,24 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
+
+        private void DosingDevice(int Index,int DeviceID) 
+        {
+            if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
+            {
+                MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{RemoteRecipes.ElementAt(Index).RecipeName},{DeviceID}号仓，配料完成");
+                int res = Array.FindIndex(RemoteRecipes.ElementAt(Index).RawMaterial.ToArray(), p => p.RawMaterialLocation == DeviceID);
+                RemoteRecipes.ElementAt(Index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.CutWeightFeedback;
+                DeviceInquire.GetInstance.GetDevice(DeviceID).StatusReset();
+                if (DeviceID >= 1 && DeviceID <= 8)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (DeviceID - 1), true);
+                }
+                else if (DeviceID >= 9 && DeviceID <= 15)
+                {
+                    HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (DeviceID - 9), true);
+                }
+            }
+        }
     }
 }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
index 95058eb8..c8ecb76a 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/RecipeReceiveViewModel.cs
@@ -76,9 +76,16 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     if (o != null && o is string cnt)
                     {
                         var res = Json<LocalRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
-                        if (res != null)
+                        var res1 = Json<RemoteRecipeDataColl>.Data.Recipes.FirstOrDefault(p => p.RecipeCode == cnt);
+                        if (res1 != null) 
+                        {
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Error, App.MainWindow, "错误", $"远程已经存在该配方!");
+                            return;
+                        }
+                        if (res != null && res1 ==null)
                         {
                             ActionManage.GetInstance.Send("LocalSimulationRecipeIssue", res);
+                            NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{res.RecipeName}配方下发成功!");
                             MessageLog.GetInstance.ShowUserLog($"下发本地模拟配方——{res.RecipeName}");
                         }
                     }
diff --git a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
index 3a3a4022..b549895f 100644
--- a/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
+++ b/BPASmartClient.JXJFoodSmallStation/ViewModel/SiemensRecipeReceiveViewModel.cs
@@ -44,6 +44,10 @@ namespace BPASmartClient.JXJFoodSmallStation.ViewModel
                     }
                 }
             });
+            ClearAllRecipe = new RelayCommand(() =>
+            {
+                Json<RemoteRecipeDataColl>.Data.Recipes.Clear();
+            });
         } 
         public RelayCommand<object> DetailsCommand { get; set; }
         public RelayCommand ClearAllRecipe { get; set; }
diff --git a/BPASmartClient.S7Net/SiemensHelper.cs b/BPASmartClient.S7Net/SiemensHelper.cs
index 18e1c347..0a2a1ccb 100644
--- a/BPASmartClient.S7Net/SiemensHelper.cs
+++ b/BPASmartClient.S7Net/SiemensHelper.cs
@@ -60,7 +60,10 @@ namespace BPASmartClient.S7Net
 
         public void Write<TValue>(string address, TValue value)
         {
-            if (IsConnected) myPlc?.Write(address, value);
+            if (IsConnected)
+            {
+                myPlc?.Write(address, value);
+            }
         }
 
         public TResult ReadClass<TResult>(int db, int startByteAdr = 0) where TResult : class, new()

From db0b114984cdda9371890556d1da486ca0d5e5a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 14 Oct 2022 11:39:37 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/View/LoginView.xaml.cs                         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
index c3acb29d..a3c65c3f 100644
--- a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
@@ -55,8 +55,13 @@ namespace BPASmartClient.CustomResource.Pages.View
                 //player.Unloaded += new RoutedEventHandler(media_Unloaded);// 添加元素卸载完成事件 -- 停止播放
                 //player.MediaOpened += Player_MediaOpened;//已播放事件
             }
-            grid.Visibility = Visibility.Visible;
-            Username.Focus();
+            Task.Factory.StartNew(() =>
+            {
+                Thread.Sleep(500);
+                Application.Current.Dispatcher.Invoke(() => { Username.Focus(); });
+                //grid.Visibility = Visibility.Visible;
+            });
+
         }
 
         private void Player_MediaOpened(object sender, RoutedEventArgs e)

From 135cbbe1dad0b10ba60d9cb2394078e4d19056f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 14 Oct 2022 11:52:32 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
index a3c65c3f..a6cfb8cb 100644
--- a/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/LoginView.xaml.cs
@@ -57,7 +57,7 @@ namespace BPASmartClient.CustomResource.Pages.View
             }
             Task.Factory.StartNew(() =>
             {
-                Thread.Sleep(500);
+                Thread.Sleep(100);
                 Application.Current.Dispatcher.Invoke(() => { Username.Focus(); });
                 //grid.Visibility = Visibility.Visible;
             });

From 102276affaad075485ad4217a057349aa3e83fe3 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 14 Oct 2022 13:10:57 +0800
Subject: [PATCH 07/19] 1

---
 .../CustomerControls/TheImage.xaml.cs         | 10 ++--
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml  | 12 +++--
 .../Controls/CanvasPanelNew.xaml.cs           | 28 +++++++++++
 BeDesignerSCADA/Helper/SystemHelper.cs        | 30 +++++++++++
 BeDesignerSCADA/ViewModel/MainViewModelNew.cs | 50 ++++++++++++++++++-
 5 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
index 596df93f..72140c14 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
@@ -58,9 +58,10 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         }
         private void Refresh()
         {
-            if (!string.IsNullOrEmpty(ImageStartPath) && File.Exists(ImageStartPath))
+            string path = $"{System.AppDomain.CurrentDomain.BaseDirectory}Images\\{ImageStartPath}";
+            if (!string.IsNullOrEmpty(ImageStartPath) && File.Exists(path))
             {
-                Source = new BitmapImage(new Uri(ImageStartPath));
+                Source = new BitmapImage(new Uri(path));
             }
         }
         public string ControlType => "控件";
@@ -83,11 +84,10 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         {
             if (!string.IsNullOrEmpty(ImageStartPath))
             {
-                string path = $"{System.AppDomain.CurrentDomain.BaseDirectory}Images\\{System.IO.Path.GetFileName(ImageStartPath)}";
+                string path = $"{System.AppDomain.CurrentDomain.BaseDirectory}Images\\{ImageStartPath}";
                 if (File.Exists(path))
                 {
-                    ImageStartPath = path;
-                    Source = new BitmapImage(new Uri(ImageStartPath));
+                    Source = new BitmapImage(new Uri(path));
                 }
             }
             this.MouseLeftButtonDown += TheImage_MouseLeftButtonDown;
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index acfceaa1..fddbac28 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -98,10 +98,16 @@
             
             <TabItem Header="组件列表">
                 <Border  BorderThickness="1" BorderBrush="#FFA9A9A9" Background="Transparent">
-                    <ListBox x:Name="CtlList" Grid.Row="2"   Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" 
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="35"/>
+                            <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <TextBox Margin="5" TextChanged="TextBox_TextChanged" FontSize="16"></TextBox>
+                        <ListBox x:Name="CtlList" Grid.Row="2"  Background="Transparent" ScrollViewer.VerticalScrollBarVisibility="Auto" 
                              ItemTemplate="{DynamicResource ToolBoxStyle}" FontSize="14" BorderThickness="0" 
-                             PreviewMouseMove="CtlList_PreviewMouseMove"
-                             />
+                             PreviewMouseMove="CtlList_PreviewMouseMove"/>
+                    </Grid>
                 </Border>
             </TabItem>
             
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
index b92e4d0e..a7220f10 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
@@ -28,6 +28,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Windows.Media.Effects;
+using BeDesignerSCADA.Helper;
 
 namespace BeDesignerSCADA.Controls
 {
@@ -191,6 +192,33 @@ namespace BeDesignerSCADA.Controls
 
         #region 执行操作事件
         /// <summary>
+        /// 查询输入框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            try
+            {
+                System.Windows.Controls.TextBox textBox = sender as System.Windows.Controls.TextBox;
+                var info = viewModel.ControlsNameValues?.ToList().Find(par => par.Value.ToLower().StartsWith(textBox.Text.ToLower()));
+                if (info.Value.Key != null)
+                {
+                    foreach (var item in CtlList.Items)
+                    {
+                        if ((item as Type).Name== info.Value.Key)
+                        {
+                            CtlList.ScrollIntoView(item);
+                            CtlList.SelectedItem = item;
+                        }
+                    }
+                }  
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+        /// <summary>
         /// 运行
         /// </summary>
         /// <param name="sender"></param>
diff --git a/BeDesignerSCADA/Helper/SystemHelper.cs b/BeDesignerSCADA/Helper/SystemHelper.cs
index f48189fb..e8ec91ac 100644
--- a/BeDesignerSCADA/Helper/SystemHelper.cs
+++ b/BeDesignerSCADA/Helper/SystemHelper.cs
@@ -3,11 +3,14 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace BeDesignerSCADA.Helper
 {
@@ -217,6 +220,33 @@ namespace BeDesignerSCADA.Helper
 
 
         #endregion
+
+        /// <summary>
+        /// 垂直方向滚动到顶部
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="scrollViewer"></param>
+        public static void ScrollViewToVerticalTop(FrameworkElement element, ScrollViewer scrollViewer)
+        {
+            var scrollViewerOffset = scrollViewer.VerticalOffset;
+            var point = new System.Windows.Point(0, scrollViewerOffset);
+            var tarPos = element.TransformToVisual(scrollViewer).Transform(point);
+            scrollViewer.ScrollToVerticalOffset(tarPos.Y);
+        }
+
+        /// <summary>
+        /// 水平方向滚动到右侧
+        /// </summary>
+        /// <param name="element"></param>
+        /// <param name="scrollViewer"></param>
+        public static void ScrollViewToHorizontalRight(FrameworkElement element, ScrollViewer scrollViewer)
+        {
+            var scrollViewerOffset = scrollViewer.HorizontalOffset;
+            var point = new System.Windows.Point(scrollViewerOffset, 0);
+            var tarPos = element.TransformToVisual(scrollViewer).Transform(point);
+            scrollViewer.ScrollToHorizontalOffset(tarPos.X);
+        }
+
     }
 
     [StructLayout(LayoutKind.Sequential)]
diff --git a/BeDesignerSCADA/ViewModel/MainViewModelNew.cs b/BeDesignerSCADA/ViewModel/MainViewModelNew.cs
index 2ba8506e..448f20a1 100644
--- a/BeDesignerSCADA/ViewModel/MainViewModelNew.cs
+++ b/BeDesignerSCADA/ViewModel/MainViewModelNew.cs
@@ -155,7 +155,48 @@ namespace BeDesignerSCADA.ViewModel
                 OnPropertyChanged("MenuModel");
             }
         }
+        /// <summary>
+        /// 控件集合名称映射
+        /// </summary>
+        public Dictionary<string, string> ControlsNameValues = new Dictionary<string, string>() {
 
+                    {"GestureTapButton","按钮" },
+                    {"TheTimer","计时器" },
+                    {"TheCheckBox","勾选框" },
+                    {"DigitalNumber","液晶数字" },
+                    {"TheComboBox","下拉框" },
+                    {"TheImage","图片" },
+                    {"TheTextBlock","文本块" },
+                    {"ArcGauge","仪表盘" },
+                    {"StatusLight","状态灯" },
+                    {"TheToggleButton","开关按钮" },
+                    {"TheGroupBox","分组" },
+                    {"TheTextBox","文本框" },
+                    {"NumberBox","数值框" },
+                    {"GraphArrow","箭头" },
+                    {"GraphStar","五角星" },
+                    {"TheSlider","滑块" },
+                    {"TheRadioButton","单选按钮" },
+                    {"SwitchButton","开关" },
+                    {"KnobButton","旋钮" },
+                    {"Silos","物料仓" },
+                    {"NewConveyorBelt","滚动线" },
+                    {"TheDataGrid","表格" },
+                    {"TheListBox","列表控件" },
+                    {"TheRedis","Redis控件" },
+                    {"WaveProgressBar","进度条波浪" },
+                    {"TheProgressBar","进度条正常" },
+                    {"TheRedProgressBar","进度条圆形红" },
+                    {"TheBlueProgressBar","进度条圆形蓝" },
+                    {"TheGreenProgressBar","进度条圆形绿" },
+                    {"TheAPI","API接口" },
+                    {"TheMQTT","MQTT" },
+                    {"TheTabControl","选项卡控件" },
+                    {"TheCylinder","气缸控件" },
+                    {"TheRectangle","矩形" },
+                    {"TheEllipse","圆形" },
+                    {"TheWuLiaoControl","物料集合控件" },
+                };
         #endregion
 
         #region 命令
@@ -311,7 +352,7 @@ namespace BeDesignerSCADA.ViewModel
             ofd.Filter = "图片|*.jpg;*.png;*.gif;*.jpeg;*.bmp";
             if (ofd.ShowDialog() == true)
             {
-                ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem)obj).Value = ofd.FileName;
+                
 
                 if (!string.IsNullOrEmpty(LayoutsPath))
                 {
@@ -324,17 +365,22 @@ namespace BeDesignerSCADA.ViewModel
                         FileInfo fi2 = new FileInfo(path2);
                         try
                         {
+                            if (!Directory.Exists(qz.Replace("Layouts", "Images")))     // 返回bool类型，存在返回true，不存在返回false
+                            {
+                                Directory.CreateDirectory(qz.Replace("Layouts", "Images"));      //不存在则创建路径
+                            }
                             if (File.Exists(path2))
                             {
                                 fi2.Delete();
                             }
                             fi1.CopyTo(path2);
+                            
+                            ((Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem)obj).Value = System.IO.Path.GetFileName(ofd.FileName);
                         }
                         catch (IOException ioex)
                         {
                             Console.WriteLine(ioex.Message);
                         }
-
                     }
                 }
             }

From c0ac4821ffa705553dbbe9433473de491df36ad3 Mon Sep 17 00:00:00 2001
From: pengliangyang <1406009520@qq.com>
Date: Fri, 14 Oct 2022 15:16:35 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Model/GVL_SmallStation.cs                 |  3 +
 .../Model/ProcessControl.cs                   | 90 ++++++++++++-------
 .../Model/RawMaterial/DeviceCurrentStatus.cs  |  4 +-
 .../Model/RawMaterial/DeviceInquire.cs        | 23 +++--
 .../View/HardwareStatusView.xaml              | 40 +++++++--
 BPASmartClient.Modbus/ModbusTcp.cs            |  9 +-
 BPASmartClient.S7Net/SiemensHelper.cs         |  7 +-
 DosingSystem/Model/DeviceInquire.cs           |  2 +-
 8 files changed, 126 insertions(+), 52 deletions(-)

diff --git a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
index a79cb1c9..e93643bf 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/GVL_SmallStation.cs
@@ -37,6 +37,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         /// Tray2的柔性味魔方配料标志
         /// </summary>
         public bool DosingTray2 { get; set; } = true;
+
+        public int DosingTray1Loc { get; set; } = 0;
+        public int DosingTray2Loc { get; set; } = 0;
         /// <summary>
         /// 配方下发状态 =0：配方未下发 ，1：配方下发给plc ，2：plc成功接收配方
         /// </summary>
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index dd6c403d..294ebadb 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -691,6 +691,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.0", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -709,6 +710,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.1", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -727,6 +729,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.2", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -745,30 +748,34 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.3", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray1 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘1，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
-                            if (GVL_SmallStation.GetInstance.DosingTray1) 
+                            if (GVL_SmallStation.GetInstance.DosingTray1 && GVL_SmallStation.GetInstance.DosingTray1Loc > 0 && GVL_SmallStation.GetInstance.DosingTray1Loc < 16)
                             {
-                                for (int i = 1; i < 16; i++)
+                                int i = GVL_SmallStation.GetInstance.DosingTray1Loc;
+                                if (RTrig.GetInstance("Tray1StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
                                 {
-                                    if (RTrig.GetInstance("Tray1StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+                                    MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
+                                    int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.CutWeightFeedback;
+                                    string info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                    MessageLog.GetInstance.ShowRunLog(info);
+                                    if (i >= 1 && i <= 8)
                                     {
-                                        MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘1，配方：{recipeName}，{i}号仓，配料完成");
-                                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.CutWeightFeedback;
-                                        DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                        if (i >= 1 && i <= 8)
-                                        {
-                                            HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true);
-                                        }
-                                        else if (i >= 9 && i <= 15)
-                                        {
-                                            HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true);
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray1 = false;
+                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true);
+                                        MessageLog.GetInstance.ShowRunLog(commInfo);
                                     }
+                                    else if (i >= 9 && i <= 15)
+                                    {
+                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true);
+                                        MessageLog.GetInstance.ShowRunLog(commInfo1);
+                                    }
+                                    GVL_SmallStation.GetInstance.DosingTray1 = false;
+                                    GVL_SmallStation.GetInstance.DosingTray1Loc = 0;
                                 }
+                                
                             }
                             if (RTrig.GetInstance("配方配料完成").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.1")) && (GVL_SmallStation.GetInstance.WindSendDosingFinish || !GVL_SmallStation.GetInstance.IsUseWindSend))
                             {
@@ -847,6 +854,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.0", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray2 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，1号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -865,6 +873,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.5", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray2 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，2号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -875,7 +884,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                 if (res > 0 && res is float loc)
                                 {
                                     int loc_index = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == loc);
-                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeight;
+                                    double weight = RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(loc_index).RawMaterialWeightW;
                                     if (loc_index >= 0)
                                     {
                                         DeviceInquire.GetInstance.GetDevice((int)loc)?.Start((uint)weight);//启动并写入每个原料重量
@@ -883,6 +892,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.6", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray2 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，3号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
@@ -901,29 +911,32 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                                         //HKDevice.HK_PLC_S7.Write("DB3.DBX50.7", false);
                                     }
                                     GVL_SmallStation.GetInstance.DosingTray2 = true;
+                                    GVL_SmallStation.GetInstance.DosingTray2Loc = (int)loc;
                                     MessageLog.GetInstance.ShowRunLog($"托盘2，配方：{recipeName}，4号桶，{(int)loc}号仓，配料完成");
                                 }
                             }
-                            if (GVL_SmallStation.GetInstance.DosingTray2 == true)
+                            if (GVL_SmallStation.GetInstance.DosingTray2 == true && GVL_SmallStation.GetInstance.DosingTray1 == false && GVL_SmallStation.GetInstance.DosingTray2Loc > 0 && GVL_SmallStation.GetInstance.DosingTray2Loc < 16)
                             {
-                                for (int i = 1; i < 16; i++)
+                                int i = GVL_SmallStation.GetInstance.DosingTray2Loc;
+                                if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
                                 {
-                                    if (RTrig.GetInstance("Tray2StatusDevice" + i).Start(DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3))
+                                    MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
+                                    int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
+                                    RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.CutWeightFeedback;
+                                    string info = DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                                    MessageLog.GetInstance.ShowRunLog(info);
+                                    if (i >= 1 && i <= 8)
                                     {
-                                        MessageLog.GetInstance.ShowRunLog($"柔性味魔方，托盘2,配方：{recipeName},{i}号仓，配料完成");
-                                        int res = Array.FindIndex(RemoteRecipes.ElementAt(index).RawMaterial.ToArray(), p => p.RawMaterialLocation == i);
-                                        RemoteRecipes.ElementAt(index).RawMaterial.ElementAt(res).Laying_Off_Weight = DeviceInquire.GetInstance.GetDevice(i).deviceStatus.CutWeightFeedback;
-                                        DeviceInquire.GetInstance.GetDevice(i).StatusReset();
-                                        if (i >= 1 && i <= 8)
-                                        {
-                                            HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true);
-                                        }
-                                        else if (i >= 9 && i <= 15)
-                                        {
-                                            HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true);
-                                        }
-                                        GVL_SmallStation.GetInstance.DosingTray2 = false;
+                                        string commInfo = HKDevice.HK_PLC_S7.Write("DB4.DBX30." + (i - 1), true);
+                                        MessageLog.GetInstance.ShowRunLog(commInfo);
                                     }
+                                    else if (i >= 9 && i <= 15)
+                                    {
+                                        string commInfo1 = HKDevice.HK_PLC_S7.Write("DB4.DBX31." + (i - 9), true);
+                                        MessageLog.GetInstance.ShowRunLog(commInfo1);
+                                    }
+                                    GVL_SmallStation.GetInstance.DosingTray2 = false;
+                                    GVL_SmallStation.GetInstance.DosingTray2Loc = 0;
                                 }
                             }
                             if (RTrig.GetInstance("DB3.DBX1.2").Start(HKDevice.HK_PLC_S7.Read<bool>("DB3.DBX1.2")))
@@ -957,7 +970,16 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 }
             }
         }
-
+        private void StockBinInit() 
+        {
+            for (int i = 1; i < 16; i++)
+            {
+                if (DeviceInquire.GetInstance.GetDevice(i).deviceStatus.RunStatus == 3)
+                {
+                    DeviceInquire.GetInstance.GetDevice(i).StatusReset();
+                }
+            }
+        }
         private void DosingDevice(int Index,int DeviceID) 
         {
             if (RTrig.GetInstance("Tray2StatusDevice" + DeviceID).Start(DeviceInquire.GetInstance.GetDevice(DeviceID).deviceStatus.RunStatus == 3))
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs
index 0cfa5646..20626973 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceCurrentStatus.cs
@@ -14,8 +14,8 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         private double _mWeight;
 
 
-        public bool RunStatus { get { return _mRunStatus; } set { _mRunStatus = value; OnPropertyChanged(); } }
-        private bool _mRunStatus;
+        public ushort RunStatus { get { return _mRunStatus; } set { _mRunStatus = value; OnPropertyChanged(); } }
+        private ushort _mRunStatus;
 
 
         public int DeviceNum { get { return _mDeviceNum; } set { _mDeviceNum = value; OnPropertyChanged(); } }
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
index 02bc9a42..10f0f3c8 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/RawMaterial/DeviceInquire.cs
@@ -43,12 +43,14 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     {
                         TopDeviceCurrentStatuses.ElementAt(TopIndex).Weight = DeviceLists.ElementAt(i).Value.deviceStatus.WeightFeedback;
                         TopDeviceCurrentStatuses.ElementAt(TopIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
+                        TopDeviceCurrentStatuses.ElementAt(TopIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
                     }
 
                     if (BottomIndex >= 0 && BottomIndex < BottomDeviceCurrentStatuses.Count)
                     {
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).Weight = DeviceLists.ElementAt(i).Value.deviceStatus.WeightFeedback;
                         BottomDeviceCurrentStatuses.ElementAt(BottomIndex).DeviceNum = DeviceLists.ElementAt(i).Value.deviceStatus.DeviceNum;
+                        BottomDeviceCurrentStatuses.ElementAt(BottomIndex).RunStatus = DeviceLists.ElementAt(i).Value.deviceStatus.RunStatus;
                     }
 
                     int deviceIndex = Array.FindIndex(devices.ToArray(), p => p.IpAddress == DeviceLists.ElementAt(i).Key && p.DeviceName != DeviceLists.ElementAt(i).Value.DeviceName);
@@ -68,7 +70,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     DeviceName = $"测试设备{i + 1}",
                     DeviceNum = i + 1,
+                    RunStatus = 1,
                     Weight = new Random().Next(100, 10000) / 100.0
+                    
                 });
 
                 devices.Add(new Devices()
@@ -84,6 +88,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                 {
                     DeviceName = $"测试设备{i + 1}",
                     DeviceNum = i + 1,
+                    RunStatus = 1,
                     Weight = new Random().Next(100, 10000) / 100.0
                 });
 
@@ -293,7 +298,6 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
         {
             this.DeviceName = DeviceName;
             AlarmHelper<AlarmInfo>.Init();
-            AlarmHelper<AlarmInfo>.Alarm.EStop1 = true;
             if (modbusTcp.Connected)
             {
                 ThreadManage.GetInstance().StartLong(new Action(() =>
@@ -310,7 +314,7 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
                     deviceStatus.DeviceNum = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceNum);//获取设备编号
                     deviceStatus.DeviceAlarmCode = (ushort)this.modbusTcp.ReadShort(DeviceAddress.DeviceAlarmCode);//获取设备故障编码
 
-                    //AlarmHelper<AlarmInfo>.Alarm.EStop1 = deviceStatus.DeviceAlarmCode.Get16bitValue(1);
+                    AlarmHelper<AlarmInfo>.Alarm.EStop1 = deviceStatus.DeviceAlarmCode.Get16bitValue(1);
                     AlarmHelper<AlarmInfo>.Alarm.Servo = deviceStatus.DeviceAlarmCode.Get16bitValue(2);
                     AlarmHelper<AlarmInfo>.Alarm.Inverter = deviceStatus.DeviceAlarmCode.Get16bitValue(3);
                     AlarmHelper<AlarmInfo>.Alarm.EStop2 = deviceStatus.DeviceAlarmCode.Get16bitValue(7);
@@ -328,9 +332,9 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             this.modbusTcp.SetString(DeviceAddress.DeviceName, name);
         }
 
-        public void StatusReset()
+        public string StatusReset()
         {
-            this.modbusTcp.Write(DeviceAddress.FinfishStatus, (ushort)1);
+            return this.modbusTcp.Write(DeviceAddress.FinfishStatus, (ushort)1);
             //var res = modbusTcp.Read(DeviceAddress.RunStatus);
         }
 
@@ -344,8 +348,15 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
             if (modbusTcp.Connected)
             {
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入配方量
-                modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
-                MessageLog.GetInstance.ShowRunLog($"开始配料");
+                string returnValue = modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
+                if (returnValue.Substring(0, 2) == "成功")
+                {
+                    MessageLog.GetInstance.ShowRunLog("发送成功" + returnValue);
+                }
+                else
+                {
+                    MessageLog.GetInstance.ShowRunLog("发送失败" + returnValue);
+                }
                 //配料设备参数写入
                 var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
                 if (res != null)
diff --git a/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml b/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
index 625f2a14..efff9b75 100644
--- a/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
+++ b/BPASmartClient.JXJFoodSmallStation/View/HardwareStatusView.xaml
@@ -62,7 +62,7 @@
 
                                 <StackPanel
                                     Grid.Row="1"
-                                    Margin="0,25,0,0"
+                                    Margin="0,10,0,0"
                                     HorizontalAlignment="Center"
                                     Orientation="Horizontal">
                                     <TextBlock
@@ -76,10 +76,9 @@
                                         Text=" kg" />
                                 </StackPanel>
 
-
                                 <StackPanel
                                     Grid.Row="1"
-                                    Margin="0,70,0,0"
+                                    Margin="0,40,0,0"
                                     HorizontalAlignment="Center"
                                     Orientation="Horizontal">
                                     <TextBlock
@@ -92,6 +91,22 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
+                                
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,70,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="运行状态：" />
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding RunStatus}" />
+
+                                </StackPanel>
 
                                 <Image
                                     Grid.RowSpan="2"
@@ -157,7 +172,7 @@
 
                                 <StackPanel
                                     Grid.Row="1"
-                                    Margin="0,25,0,0"
+                                    Margin="0,10,0,0"
                                     HorizontalAlignment="Center"
                                     Orientation="Horizontal">
                                     <TextBlock
@@ -174,7 +189,7 @@
 
                                 <StackPanel
                                     Grid.Row="1"
-                                    Margin="0,70,0,0"
+                                    Margin="0,40,0,0"
                                     HorizontalAlignment="Center"
                                     Orientation="Horizontal">
                                     <TextBlock
@@ -187,7 +202,20 @@
                                         Foreground="#FF0084FF"
                                         Text=" 号仓" />
                                 </StackPanel>
-
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Margin="0,70,0,0"
+                                    HorizontalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="运行状态：" />
+                                    <TextBlock
+                                        FontSize="20"
+                                        Foreground="#FF0084FF"
+                                        Text="{Binding RunStatus}" />
+                                </StackPanel>
                                 <Image
                                     Grid.RowSpan="2"
                                     Source="/BPASmartClient.CustomResource;component/Image/光柱.png"
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index 5864e493..641d84b0 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -253,9 +253,9 @@ namespace BPASmartClient.Modbus
      
 
 
-        public void Write<T>(string address, T value, byte slaveAddress = 1)
+        public string Write<T>(string address, T value, byte slaveAddress = 1)
         {
-            if (address == null || tcpClient == null) return;
+            if (address == null || tcpClient == null) return "失败，地址为空或断开连接";
             ushort startAddress = (ushort)GetAddress(address);
             CommandType commandType = CommandType.Coils;
             try
@@ -305,11 +305,16 @@ namespace BPASmartClient.Modbus
                 {
                     commandType = CommandType.Inputs;
                 }
+
+                return $"成功，地址：{address}，值：{value}";
             }
             catch (Exception ex)
             {
                 MessageLog.GetInstance.ShowEx($"写入地址：【{address}：= {startAddress}】,写入类型：【{commandType.ToString()}】出错，{ex.ToString()}");
+
                 ExceptionHandling(ex);
+
+                return $"异常，地址：{address}，值：{value}，发送异常";
             }
         }
 
diff --git a/BPASmartClient.S7Net/SiemensHelper.cs b/BPASmartClient.S7Net/SiemensHelper.cs
index 0a2a1ccb..7ec56301 100644
--- a/BPASmartClient.S7Net/SiemensHelper.cs
+++ b/BPASmartClient.S7Net/SiemensHelper.cs
@@ -58,11 +58,16 @@ namespace BPASmartClient.S7Net
             return myPlc?.Read(dataType, db, address, varType, count);
         }
 
-        public void Write<TValue>(string address, TValue value)
+        public string Write<TValue>(string address, TValue value)
         {
             if (IsConnected)
             {
                 myPlc?.Write(address, value);
+                return $"成功，地址：{address}，值：{value}";
+            }
+            else 
+            {
+                return $"失败，地址：{address}，值：{value}，断开连接";
             }
         }
 
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index 40b697f6..6472b679 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -337,7 +337,7 @@ namespace BPASmartClient.DosingSystem.Model
             if (modbusTcp.Connected)
             {
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入配方量
-                modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
+                string returnValue = modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
                 //配料设备参数写入
                 var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
                 if (res != null)

From 983a182213603bfcfa2a4707625542bea1d7cf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Fri, 14 Oct 2022 15:43:08 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/MessageLog.cs                 |  39 +-
 .../Pages/View/PromptView.xaml                |  21 +-
 .../Pages/View/PromptView.xaml.cs             |  29 ++
 BPASmartClient.Modbus/ModbusTcp.cs            |  70 ++-
 FryPot_DosingSystem/View/NewRecipeView.xaml   | 470 ++++++++++++------
 5 files changed, 466 insertions(+), 163 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
index 96a0fa4f..b8da7d9b 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using BPASmartClient.Model;
 using System.Windows.Media;
+using BPASmartClient.CustomResource.Pages.View;
 
 namespace BPASmartClient.CustomResource.Pages.Model
 {
@@ -44,7 +45,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
         {
             lock (userlock)
             {
-                if (!string.IsNullOrEmpty(Global.userInfo.UserName) && !string.IsNullOrEmpty(Global.userInfo.permission.ToString())&& !string.IsNullOrEmpty(info))
+                if (!string.IsNullOrEmpty(Global.userInfo.UserName) && !string.IsNullOrEmpty(Global.userInfo.permission.ToString()) && !string.IsNullOrEmpty(info))
                 {
                     UserLog userLog = new UserLog()
                     {
@@ -76,7 +77,7 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 RunLog?.Invoke(info);
             }
         }
-        
+
         int AlarmID;
         public void ShowAlarmLog(string info, string AlarmNumber = "_", AlarmLevel level = AlarmLevel.一般报警)
         {
@@ -97,5 +98,39 @@ namespace BPASmartClient.CustomResource.Pages.Model
                 AlarmLog?.Invoke(info);
             }
         }
+
+        public bool ShowDialog(string info, DialogType dialogType = DialogType.Information)
+        {
+            PromptView PV = new PromptView();
+            switch (dialogType)
+            {
+                case DialogType.Warning:
+                    PV.TextBlockIcon = "&#xe61f;";
+                    PV.TextBlockForeground = Brushes.Yellow;
+                    PV.TextBlockInfo = $"警告：{info}";
+                    break;
+                case DialogType.Error:
+                    PV.TextBlockIcon = "&#xed1a;";
+                    PV.TextBlockForeground = Brushes.Red;
+                    PV.TextBlockInfo = $"错误：{info}";
+                    break;
+                case DialogType.Information:
+                    PV.TextBlockIcon = "&#xe657;";
+                    PV.TextBlockForeground = Brushes.DeepSkyBlue;
+                    PV.TextBlockInfo = $"提示：{info}";
+                    break;
+                default:
+                    break;
+            }
+            var res = PV.ShowDialog();
+            return res == null ? false : (bool)res;
+        }
+    }
+
+    public enum DialogType
+    {
+        Warning,
+        Error,
+        Information,
     }
 }
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
index 917ceb69..78dc8238 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
@@ -13,6 +13,21 @@
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
     mc:Ignorable="d">
+
+    <Window.Resources>
+        <Style x:Key="buttonStyle" TargetType="Button">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" Stretch="Fill" />
@@ -34,8 +49,12 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Text="&#xe657;" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Red" FontFamily="../../Fonts/#iconfont"/>
+                <TextBlock Name="icon" Text="&#xe61f;" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="DeepSkyBlue" FontFamily="../../Fonts/#iconfont"/>
+                <TextBlock Name="info" Text="警告:" Grid.Column="1" TextWrapping="Wrap"  VerticalAlignment="Center" Foreground="DeepSkyBlue"/>
+            </Grid>
 
+            <Grid Grid.Row="1">
+                <Button/>
             </Grid>
 
             <Grid.RowDefinitions>
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
index d1961c58..11ddd2f5 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -24,6 +25,34 @@ namespace BPASmartClient.CustomResource.Pages.View
             InitializeComponent();
         }
 
+        public string TextBlockIcon
+        {
+            get { return this.icon.Text.Trim(); }
+            set { this.icon.Text = Regex.Unescape(StringToUnicode(value.ToString())); }
+        }
+
+        public Brush TextBlockForeground
+        {
+            get { return this.icon.Foreground; }
+            set { this.icon.Foreground = value; this.info.Foreground = value; }
+        }
+
+        public string TextBlockInfo
+        {
+            get { return this.info.Text.Trim(); }
+            set { this.info.Text = value; }
+        }
+
+        private string StringToUnicode(string s)
+        {
+            if (!string.IsNullOrEmpty(s))
+            {
+                //这里把格式&#xe625; 转为 \ue625
+                return s.Replace(@"&#x", @"\u").Replace(";", "");
+            }
+            return s;
+        }
+
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             this.DialogResult = false;
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index 641d84b0..8734228e 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -1,5 +1,5 @@
 using BPASmartClient.Helper;
-using BPASmartClient.Message;
+//using BPASmartClient.Message;
 using NModbus;
 using System;
 using System.Collections.Generic;
@@ -25,6 +25,8 @@ namespace BPASmartClient.Modbus
         private ManualResetEvent mre = new ManualResetEvent(false);
         public string IPAdress;
         public int Port;
+        public Action<string> Show { get; set; }
+        public Action<string> ShowEx { get; set; }
 
         /// <summary>
         /// 连接plc 原料设备成功
@@ -49,7 +51,7 @@ namespace BPASmartClient.Modbus
         /// <param name="port">端口号，默认502</param>
         public void ModbusTcpConnect(string ip, int port = 502)
         {
-            MessageLog.GetInstance.Show($"设备【{ip}:{port}】连接中。。。。");
+            Show?.Invoke($"设备【{ip}:{port}】连接中。。。。");
             IPAdress = ip;
             Port = port;
             modbusFactory = new ModbusFactory();
@@ -60,7 +62,7 @@ namespace BPASmartClient.Modbus
                 master.Transport.WriteTimeout = 2000;//写入超时时间
                 master.Transport.Retries = 10;//重试次数
                 ConnectOk?.Invoke();
-                MessageLog.GetInstance.Show($"设备【{ip}:{port}】连接成功");
+                Show?.Invoke($"设备【{ip}:{port}】连接成功");
             }
             else
             {
@@ -94,15 +96,15 @@ namespace BPASmartClient.Modbus
                 {
                     if (!ErrorFlag)
                     {
-                        MessageLog.GetInstance.ShowEx($"ModbusTcp 连接失败，IP = {IPAdress},Port = {Port}");
-                        MessageLog.GetInstance.ShowEx(ex.ToString());
+                        ShowEx?.Invoke($"ModbusTcp 连接失败，IP = {IPAdress},Port = {Port}");
+                        ShowEx?.Invoke(ex.ToString());
                         ErrorFlag = true;
                     }
                     if (!IsReconnect) break;
                     Thread.Sleep(3000);
                 }
             }
-            if (ErrorFlag && IsReconnect) MessageLog.GetInstance.Show("ModbusTcp 重连成功！");
+            if (ErrorFlag && IsReconnect) Show?.Invoke("ModbusTcp 重连成功！");
         }
 
         /// <summary>
@@ -244,18 +246,54 @@ namespace BPASmartClient.Modbus
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.ShowEx($"读取地址：【{address}：= {startAddress}】,读取类型：【{commandType.ToString()}】出错，{ex.ToString()}");
+                ShowEx?.Invoke($"读取地址：【{address}：= {startAddress}】,读取类型：【{commandType.ToString()}】出错，{ex.ToString()}");
                 ExceptionHandling(ex);
             }
             return default(object);
         }
 
-     
-
+        /// <summary>
+        /// 写入数据
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="address">写入地址</param>
+        /// <param name="value">写入值</param>
+        /// <param name="Retries">重试次数</param>
+        /// <param name="slaveAddress">从站地址</param>
+        /// <returns></returns>
+        public bool Write<T>(string address, T value, int Retries = 1, byte slaveAddress = 1)
+        {
+            int count = 0;
+            if (Retries == 1 || Retries == 0)
+            {
+                return TempWrite(address, value, slaveAddress);
+            }
+            else if (Retries > 1)
+            {
+                bool isok = false;
+                while (count < Retries)
+                {
+                    count++;
+                    TempWrite(address, value, slaveAddress);
+                    var res = Read(address);
+                    if (res != null && res.ToString() == value.ToString())
+                    {
+                        isok = true;
+                        break;
+                    }
+                }
+                return isok;
+            }
+            return false;
+        }
 
-        public string Write<T>(string address, T value, byte slaveAddress = 1)
+        private bool TempWrite<T>(string address, T value, byte slaveAddress = 1)
         {
-            if (address == null || tcpClient == null) return "失败，地址为空或断开连接";
+            if (address == null || tcpClient == null)
+            {
+                Show?.Invoke("写入失败，地址为空或断开连接");
+                return false;
+            }
             ushort startAddress = (ushort)GetAddress(address);
             CommandType commandType = CommandType.Coils;
             try
@@ -305,16 +343,14 @@ namespace BPASmartClient.Modbus
                 {
                     commandType = CommandType.Inputs;
                 }
-
-                return $"成功，地址：{address}，值：{value}";
+                Show?.Invoke($"成功，地址：{address}，值：{value}");
+                return true;
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.ShowEx($"写入地址：【{address}：= {startAddress}】,写入类型：【{commandType.ToString()}】出错，{ex.ToString()}");
-
+                ShowEx?.Invoke($"写入地址：【{address}：= {startAddress}】,写入类型：【{commandType.ToString()}】出错，{ex.ToString()}");
                 ExceptionHandling(ex);
-
-                return $"异常，地址：{address}，值：{value}，发送异常";
+                return false;
             }
         }
 
diff --git a/FryPot_DosingSystem/View/NewRecipeView.xaml b/FryPot_DosingSystem/View/NewRecipeView.xaml
index 44808a81..6d22f265 100644
--- a/FryPot_DosingSystem/View/NewRecipeView.xaml
+++ b/FryPot_DosingSystem/View/NewRecipeView.xaml
@@ -1,21 +1,27 @@
-<Window x:Class="FryPot_DosingSystem.View.NewRecipeView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:FryPot_DosingSystem.View"
-        xmlns:vm="clr-namespace:FryPot_DosingSystem.ViewModel" xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
-        mc:Ignorable="d"
-        Title="NewRecipeView" Height="550" Width="800"
-        WindowStyle="None" WindowStartupLocation="CenterScreen" AllowsTransparency="True">
+<Window
+    x:Class="FryPot_DosingSystem.View.NewRecipeView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Themes1="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Classic"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:FryPot_DosingSystem.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:FryPot_DosingSystem.ViewModel"
+    Title="NewRecipeView"
+    Width="800"
+    Height="550"
+    AllowsTransparency="True"
+    WindowStartupLocation="CenterScreen"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.DataContext>
-        <vm:NewRecipeViewModel></vm:NewRecipeViewModel>
+        <vm:NewRecipeViewModel />
     </Window.DataContext>
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/GenricStyle.xaml" />
-                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml"/>
+                <ResourceDictionary Source="/BPASmartClient.CustomResource;component/Themes/MyStyle.xaml" />
 
                 <ResourceDictionary>
                     <!--#region ListBox样式-->
@@ -40,35 +46,44 @@
                     <!--#endregion-->
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
-            <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
-            <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA"/>
-            <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5"/>
+            <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3" />
+            <SolidColorBrush x:Key="TextBox.MouseOver.Border" Color="#FF7EB4EA" />
+            <SolidColorBrush x:Key="TextBox.Focus.Border" Color="#FF569DE5" />
             <Style x:Key="TextBoxStyle" TargetType="{x:Type TextBox}">
-                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-                <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
-                <Setter Property="HorizontalContentAlignment" Value="Left"/>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                <Setter Property="AllowDrop" Value="true"/>
-                <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+                <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+                <Setter Property="BorderBrush" Value="{StaticResource TextBox.Static.Border}" />
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+                <Setter Property="HorizontalContentAlignment" Value="Left" />
+                <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                <Setter Property="AllowDrop" Value="true" />
+                <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+                <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type TextBox}">
-                            <Border x:Name="border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-                                <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                            <Border
+                                x:Name="border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="True">
+                                <ScrollViewer
+                                    x:Name="PART_ContentHost"
+                                    Focusable="false"
+                                    HorizontalScrollBarVisibility="Hidden"
+                                    VerticalScrollBarVisibility="Hidden" />
                             </Border>
                             <ControlTemplate.Triggers>
                                 <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Opacity" TargetName="border" Value="0.56"/>
+                                    <Setter TargetName="border" Property="Opacity" Value="0.56" />
                                 </Trigger>
                                 <Trigger Property="IsMouseOver" Value="true">
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource TextBox.MouseOver.Border}"/>
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.MouseOver.Border}" />
                                 </Trigger>
                                 <Trigger Property="IsKeyboardFocused" Value="true">
-                                    <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource TextBox.Focus.Border}"/>
+                                    <Setter TargetName="border" Property="BorderBrush" Value="{StaticResource TextBox.Focus.Border}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -77,51 +92,83 @@
                 <Style.Triggers>
                     <MultiTrigger>
                         <MultiTrigger.Conditions>
-                            <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
-                            <Condition Property="IsSelectionActive" Value="false"/>
+                            <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true" />
+                            <Condition Property="IsSelectionActive" Value="false" />
                         </MultiTrigger.Conditions>
-                        <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
+                        <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}" />
                     </MultiTrigger>
                 </Style.Triggers>
             </Style>
-            <SolidColorBrush x:Key="foreground" Color="#a2c2e8"/>
-            <SolidColorBrush x:Key="borderBrush" Color="Aqua"/>
+            <SolidColorBrush x:Key="foreground" Color="#a2c2e8" />
+            <SolidColorBrush x:Key="borderBrush" Color="Aqua" />
             <Style x:Key="ComboBoxStyle1" TargetType="{x:Type ComboBox}">
-                <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}"/>
-                <Setter Property="Foreground" Value="{DynamicResource foreground}"/>
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="Margin" Value="0,0,0,0"/>
-                <Setter Property="Padding" Value="0"/>
-                <Setter Property="Height" Value="24"/>
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-                <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                <Setter Property="IsTextSearchCaseSensitive" Value="true"/>
-                <Setter Property="IsEditable" Value="true"/>
-                <Setter Property="StaysOpenOnEdit" Value="true"/>
+                <Setter Property="FocusVisualStyle" Value="{StaticResource ComboBoxFocusVisual}" />
+                <Setter Property="Foreground" Value="{DynamicResource foreground}" />
+                <Setter Property="Background" Value="Transparent" />
+                <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}" />
+                <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="Margin" Value="0,0,0,0" />
+                <Setter Property="Padding" Value="0" />
+                <Setter Property="Height" Value="24" />
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+                <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+                <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+                <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+                <Setter Property="VerticalContentAlignment" Value="Center" />
+                <Setter Property="IsTextSearchCaseSensitive" Value="true" />
+                <Setter Property="IsEditable" Value="true" />
+                <Setter Property="StaysOpenOnEdit" Value="true" />
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ComboBox}">
-                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+                            <Border
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="true">
                                 <Grid>
-                                    <Themes1:ClassicBorderDecorator x:Name="Border" BorderStyle="None" BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" BorderThickness="2">
-                                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Focusable="False" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
-                                            <Themes1:SystemDropShadowChrome x:Name="Shdw" Color="Transparent" MinWidth="{Binding ActualWidth, ElementName=Border}" MaxHeight="{TemplateBinding MaxDropDownHeight}">
-                                                <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1">
+                                    <Themes1:ClassicBorderDecorator
+                                        x:Name="Border"
+                                        BorderBrush="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}"
+                                        BorderStyle="None"
+                                        BorderThickness="2">
+                                        <Popup
+                                            x:Name="PART_Popup"
+                                            AllowsTransparency="true"
+                                            Focusable="False"
+                                            IsOpen="{TemplateBinding IsDropDownOpen}"
+                                            Placement="Bottom"
+                                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                                            <Themes1:SystemDropShadowChrome
+                                                x:Name="Shdw"
+                                                MinWidth="{Binding ActualWidth, ElementName=Border}"
+                                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                                Color="Transparent">
+                                                <Border
+                                                    x:Name="DropDownBorder"
+                                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                                    BorderThickness="1">
                                                     <Border.Background>
-                                                        <SolidColorBrush Color="#264c73"></SolidColorBrush>
+                                                        <SolidColorBrush Color="#264c73" />
                                                     </Border.Background>
                                                     <ScrollViewer x:Name="DropDownScrollViewer">
                                                         <Grid RenderOptions.ClearTypeHint="Enabled">
-                                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                                                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
+                                                            <Canvas
+                                                                Width="0"
+                                                                Height="0"
+                                                                HorizontalAlignment="Left"
+                                                                VerticalAlignment="Top">
+                                                                <Rectangle
+                                                                    x:Name="OpaqueRect"
+                                                                    Width="{Binding ActualWidth, ElementName=DropDownBorder}"
+                                                                    Height="{Binding ActualHeight, ElementName=DropDownBorder}"
+                                                                    Fill="{Binding Background, ElementName=DropDownBorder}" />
                                                             </Canvas>
-                                                            <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                                            <ItemsPresenter
+                                                                x:Name="ItemsPresenter"
+                                                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                                         </Grid>
                                                     </ScrollViewer>
                                                 </Border>
@@ -129,42 +176,58 @@
                                         </Popup>
                                     </Themes1:ClassicBorderDecorator>
                                     <DockPanel Margin="2">
-                                        <FrameworkElement DockPanel.Dock="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"/>
+                                        <FrameworkElement Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" DockPanel.Dock="Right" />
                                         <Border x:Name="SelectedItemBorder" Margin="{TemplateBinding Padding}">
-                                            <ContentPresenter ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="1,1,1,1" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                            <ContentPresenter
+                                                Margin="1,1,1,1"
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Content="{TemplateBinding SelectionBoxItem}"
+                                                ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                                ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                                ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                         </Border>
                                     </DockPanel>
-                                    <ToggleButton ClickMode="Press" Focusable="false" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="2" MinWidth="0" MinHeight="0" Style="{StaticResource ComboBoxTransparentButtonStyle}" Width="Auto"/>
+                                    <ToggleButton
+                                        Width="Auto"
+                                        MinWidth="0"
+                                        MinHeight="0"
+                                        Margin="2"
+                                        ClickMode="Press"
+                                        Focusable="false"
+                                        IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                        Style="{StaticResource ComboBoxTransparentButtonStyle}" />
                                 </Grid>
                             </Border>
                             <ControlTemplate.Triggers>
                                 <MultiTrigger>
                                     <MultiTrigger.Conditions>
-                                        <Condition Property="IsDropDownOpen" Value="false"/>
+                                        <Condition Property="IsDropDownOpen" Value="false" />
                                     </MultiTrigger.Conditions>
-                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
                                 </MultiTrigger>
                                 <Trigger Property="HasItems" Value="false">
-                                    <Setter Property="MinHeight" TargetName="DropDownBorder" Value="95"/>
+                                    <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
                                 </Trigger>
                                 <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                                    <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                                    <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
                                 </Trigger>
                                 <MultiTrigger>
                                     <MultiTrigger.Conditions>
-                                        <Condition Property="IsGrouping" Value="true"/>
-                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
+                                        <Condition Property="IsGrouping" Value="true" />
+                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false" />
                                     </MultiTrigger.Conditions>
-                                    <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
+                                    <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
                                 </MultiTrigger>
-                                <Trigger Property="HasDropShadow" SourceName="PART_Popup" Value="true">
-                                    <Setter Property="Margin" TargetName="Shdw" Value="0,0,5,5"/>
-                                    <Setter Property="Color" TargetName="Shdw" Value="#71000000"/>
+                                <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                                    <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                                    <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
                                 </Trigger>
-                                <Trigger Property="ScrollViewer.CanContentScroll" SourceName="DropDownScrollViewer" Value="false">
-                                    <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}"/>
-                                    <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}"/>
+                                <Trigger SourceName="DropDownScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false">
+                                    <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding VerticalOffset, ElementName=DropDownScrollViewer}" />
+                                    <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding HorizontalOffset, ElementName=DropDownScrollViewer}" />
                                 </Trigger>
                             </ControlTemplate.Triggers>
                         </ControlTemplate>
@@ -172,9 +235,9 @@
                 </Setter>
                 <Style.Triggers>
                     <Trigger Property="IsEditable" Value="true">
-                        <Setter Property="IsTabStop" Value="false"/>
-                        <Setter Property="Padding" Value="1"/>
-                        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}"/>
+                        <Setter Property="IsTabStop" Value="false" />
+                        <Setter Property="Padding" Value="1" />
+                        <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
                     </Trigger>
                 </Style.Triggers>
             </Style>
@@ -183,70 +246,160 @@
     <Border Name="br">
         <Border.Background>
             <!--<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/bg.png"></ImageBrush>-->
-            <SolidColorBrush Color="#264c73">
-
-            </SolidColorBrush>
+            <SolidColorBrush Color="#264c73" />
         </Border.Background>
-        <Grid >
+        <Grid>
             <Grid.RowDefinitions>
-                <RowDefinition Height="50"></RowDefinition>
-                <RowDefinition Height="80"></RowDefinition>
-                <RowDefinition Height="40"></RowDefinition>
-                <RowDefinition></RowDefinition>
+                <RowDefinition Height="50" />
+                <RowDefinition Height="80" />
+                <RowDefinition Height="40" />
+                <RowDefinition />
             </Grid.RowDefinitions>
 
-            <TextBlock Text="配方信息" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF2AB2E7" FontSize="25" Margin="0,10"></TextBlock>
+            <TextBlock
+                Margin="0,10"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="25"
+                Foreground="#FF2AB2E7"
+                Text="配方信息" />
             <UniformGrid Grid.Row="1" Columns="2">
                 <StackPanel Orientation="Vertical">
-                    <StackPanel Orientation="Horizontal" Margin="0,8">
-                        <TextBlock Text="请输入配方名称：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBox Style="{DynamicResource TextBoxStyle}" Text="{Binding RecipeName}" Width="230" Height="30" BorderThickness="1" Background="Transparent" Foreground="Orange"
-                             VerticalContentAlignment="Center"
-                                BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" ></TextBox>
+                    <StackPanel Margin="0,8" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Foreground="#FF2AB2E7"
+                            Text="请输入配方名称：" />
+                        <TextBox
+                            Width="230"
+                            Height="30"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="1"
+                            FontSize="16"
+                            Foreground="Orange"
+                            Style="{DynamicResource TextBoxStyle}"
+                            Text="{Binding RecipeName}" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
-                        <TextBlock Text="请输入桶的数量：" Foreground="#FF2AB2E7" FontSize="18" Margin="10,0,5,0" VerticalAlignment="Center"></TextBlock>
-                        <TextBox Style="{DynamicResource TextBoxStyle}" Text="{Binding RecipeRollerNum}" InputMethod.IsInputMethodEnabled="False"  Width="230" Height="30" BorderThickness="1" Background="Transparent" Foreground="Orange"
-                             VerticalContentAlignment="Center"
-  BorderBrush="#FF2AB2E7" VerticalAlignment="Center" FontSize="16" TextChanged="TextBox_TextChanged"></TextBox>
+                        <TextBlock
+                            Margin="10,0,5,0"
+                            VerticalAlignment="Center"
+                            FontSize="18"
+                            Foreground="#FF2AB2E7"
+                            Text="请输入桶的数量：" />
+                        <TextBox
+                            Width="230"
+                            Height="30"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            BorderThickness="1"
+                            FontSize="16"
+                            Foreground="Orange"
+                            InputMethod.IsInputMethodEnabled="False"
+                            Style="{DynamicResource TextBoxStyle}"
+                            Text="{Binding RecipeRollerNum}"
+                            TextChanged="TextBox_TextChanged" />
                     </StackPanel>
                 </StackPanel>
                 <Grid>
                     <Grid.RowDefinitions>
-                        <RowDefinition/>
-                        <RowDefinition/>
+                        <RowDefinition />
+                        <RowDefinition />
                     </Grid.RowDefinitions>
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Button Content="添加原料" Width="180" Margin="0,0,10,0"  Height="30" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Cursor="Hand" Command="{Binding AddRecipe}" ></Button>
-                        <Button Content="确认更新" Height="30" Width="180"  Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Command="{Binding Comfirm}"></Button>
+                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                        <Button
+                            Width="180"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Command="{Binding AddRecipe}"
+                            Content="添加原料"
+                            Cursor="Hand"
+                            Foreground="#FF2AB2E7" />
+                        <Button
+                            Width="180"
+                            Height="30"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Command="{Binding Comfirm}"
+                            Content="确认更新"
+                            Foreground="#FF2AB2E7" />
                     </StackPanel>
-                    <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Center">
-                        <Button Content="另存为" Height="30" Width="180" Margin="0,0,10,0" Command="{Binding SaveAs}" Cursor="Hand"/>
-                        <Button Click="Button_Click" Content="取消" Height="30" FontSize="20" Background="Transparent" BorderBrush="#FF2AB2E7" Foreground="#FF2AB2E7" Width="180"  Cursor="Hand"></Button>
+                    <StackPanel
+                        Grid.Row="1"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="180"
+                            Height="30"
+                            Margin="0,0,10,0"
+                            Command="{Binding SaveAs}"
+                            Content="另存为"
+                            Cursor="Hand" />
+                        <Button
+                            Width="180"
+                            Height="30"
+                            Background="Transparent"
+                            BorderBrush="#FF2AB2E7"
+                            Click="Button_Click"
+                            Content="取消"
+                            Cursor="Hand"
+                            FontSize="20"
+                            Foreground="#FF2AB2E7" />
                     </StackPanel>
                 </Grid>
-               
+
             </UniformGrid>
-            <Grid Grid.Row="2" Background="#FF2AB2E7" Margin="0,0,0,10">
+            <Grid
+                Grid.Row="2"
+                Margin="0,0,0,10"
+                Background="#FF2AB2E7">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="210"/>
-                    <ColumnDefinition Width="225"/>
-                    <ColumnDefinition  Width="225"/>
-                    <ColumnDefinition/>
+                    <ColumnDefinition Width="210" />
+                    <ColumnDefinition Width="225" />
+                    <ColumnDefinition Width="225" />
+                    <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-                <TextBlock Text="原料名称" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter></GridSplitter>
-                <TextBlock Grid.Column="1" Text="原料桶号" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="White"/>
-                <GridSplitter Grid.Column="1"></GridSplitter>
-                <TextBlock Grid.Column="2" Text="原料重量" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"></TextBlock>
-                <GridSplitter Grid.Column="2"></GridSplitter>
-                <TextBlock Grid.Column="3" Text="操作" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="White"/>
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料名称" />
+                <GridSplitter />
+                <TextBlock
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料桶号" />
+                <GridSplitter Grid.Column="1" />
+                <TextBlock
+                    Grid.Column="2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="原料重量" />
+                <GridSplitter Grid.Column="2" />
+                <TextBlock
+                    Grid.Column="3"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="White"
+                    Text="操作" />
             </Grid>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Hidden">
                 <ItemsControl ItemsSource="{Binding materials}">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel></StackPanel>
+                            <StackPanel />
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
@@ -256,42 +409,73 @@
                                     <ControlTemplate>
                                         <Grid>
                                             <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="210"/>
+                                                <ColumnDefinition Width="210" />
 
-                                                <ColumnDefinition Width="210"></ColumnDefinition>
-                                                <ColumnDefinition Width="225"></ColumnDefinition>
-                                                <ColumnDefinition></ColumnDefinition>
+                                                <ColumnDefinition Width="210" />
+                                                <ColumnDefinition Width="225" />
+                                                <ColumnDefinition />
                                             </Grid.ColumnDefinitions>
-                                            <ComboBox ItemsSource="{Binding DataContext.materialNames,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}" Text="{Binding MaterialName}"  Margin="10,0,0,10" Width="190" FontSize="14" KeyUp="ComboBox_KeyUp" LostFocus="ComboBox_LostFocus"   Style="{StaticResource ComboBoxStyle1}" Height="30">
+                                            <ComboBox
+                                                Width="190"
+                                                Height="30"
+                                                Margin="10,0,0,10"
+                                                FontSize="14"
+                                                ItemsSource="{Binding DataContext.materialNames, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}"
+                                                KeyUp="ComboBox_KeyUp"
+                                                LostFocus="ComboBox_LostFocus"
+                                                Style="{StaticResource ComboBoxStyle1}"
+                                                Text="{Binding MaterialName}">
                                                 <ComboBox.ItemContainerStyle>
                                                     <Style TargetType="{x:Type ComboBoxItem}">
                                                         <Setter Property="Background" Value="White" />
-                                                        <Setter Property="Foreground" Value="#e69519"/>
+                                                        <Setter Property="Foreground" Value="#e69519" />
 
 
                                                     </Style>
                                                 </ComboBox.ItemContainerStyle>
                                             </ComboBox>
-                                            <StackPanel Grid.Column="1" Orientation="Horizontal" >
-                                                <TextBox Text="{Binding MaterialLoc}" Background="Transparent" FontSize="14" Height="30"
-                                                       BorderBrush="#e69519" Foreground="LightGray" Width="170" Margin="35,0,0,10" ></TextBox>
+                                            <StackPanel Grid.Column="1" Orientation="Horizontal">
+                                                <TextBox
+                                                    Width="170"
+                                                    Height="30"
+                                                    Margin="35,0,0,10"
+                                                    Background="Transparent"
+                                                    BorderBrush="#e69519"
+                                                    FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding MaterialLoc}" />
 
                                             </StackPanel>
-                                            <StackPanel Orientation="Horizontal"  Grid.Column="2">
-                                                <TextBox Text="{Binding MaterialWeight}" Background="Transparent" FontSize="14" Height="30"
-                                                       BorderBrush="#e69519" Foreground="LightGray" Width="170" Margin="35,0,0,10" ></TextBox>
-                                                <TextBlock VerticalAlignment="Center" FontSize="14" Margin="4,0,0,10" Text="g" Foreground="#e69519" ></TextBlock>
-                                            </StackPanel>
-                                            <Button Grid.Column="3"
-                                                    Content="删除"
-                                                    Width="94"
+                                            <StackPanel Grid.Column="2" Orientation="Horizontal">
+                                                <TextBox
+                                                    Width="170"
                                                     Height="30"
-                                                    FontSize="14"
-                                                    Margin="0,0,20,10"
+                                                    Margin="35,0,0,10"
                                                     Background="Transparent"
-                                                       BorderBrush="#e69519" Foreground="LightGray" HorizontalAlignment="Right"
-                                                    Command="{Binding DataContext.RemoveRecipe,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ItemsControl}}"
-                                                    CommandParameter="{Binding MaterialCode}"></Button>
+                                                    BorderBrush="#e69519"
+                                                    FontSize="14"
+                                                    Foreground="LightGray"
+                                                    Text="{Binding MaterialWeight}" />
+                                                <TextBlock
+                                                    Margin="4,0,0,10"
+                                                    VerticalAlignment="Center"
+                                                    FontSize="14"
+                                                    Foreground="#e69519"
+                                                    Text="g" />
+                                            </StackPanel>
+                                            <Button
+                                                Grid.Column="3"
+                                                Width="94"
+                                                Height="30"
+                                                Margin="0,0,20,10"
+                                                HorizontalAlignment="Right"
+                                                Background="Transparent"
+                                                BorderBrush="#e69519"
+                                                Command="{Binding DataContext.RemoveRecipe, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ItemsControl}}"
+                                                CommandParameter="{Binding MaterialCode}"
+                                                Content="删除"
+                                                FontSize="14"
+                                                Foreground="LightGray" />
                                         </Grid>
                                     </ControlTemplate>
                                 </RadioButton.Template>

From f7f6be18517348b6ebf76846a6b75fbb37936354 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Fri, 14 Oct 2022 17:59:02 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BPASmartClient.SCADAControl.csproj        |   8 +++
 .../CustomerControls/TheCheckBox.xaml.cs      |  12 ++++-
 .../CustomerControls/TheImage.xaml            |   2 +-
 .../CustomerControls/TheImage.xaml.cs         |   3 +-
 .../CustomerControls/TheRadioButton.cs        |  10 ++++
 .../CustomerControls/TheTabControl.xaml.cs    |   2 +-
 .../DLL/BPASmartClient.Compiler.dll           | Bin 55808 -> 56320 bytes
 .../Images/Image_32x32.png                    | Bin 0 -> 1828 bytes
 .../Images/暂无图片.png                   | Bin 0 -> 3667 bytes
 .../Themes/Generic.xaml                       |  51 ++++++------------
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml  |   2 +-
 11 files changed, 48 insertions(+), 42 deletions(-)
 create mode 100644 BPASmartClient.SCADAControl/Images/Image_32x32.png
 create mode 100644 BPASmartClient.SCADAControl/Images/暂无图片.png

diff --git a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
index fa35891c..90ffcd71 100644
--- a/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
+++ b/BPASmartClient.SCADAControl/BPASmartClient.SCADAControl.csproj
@@ -23,6 +23,7 @@
     <None Remove="Images\Cb_HalfChecked.png" />
     <None Remove="Images\databj.png" />
     <None Remove="Images\Exp.png" />
+    <None Remove="Images\Image_32x32.png" />
     <None Remove="Images\leftImage.png" />
     <None Remove="Images\mqtt.png" />
     <None Remove="Images\mqttrun.png" />
@@ -53,6 +54,7 @@
     <None Remove="Images\拉出.png" />
     <None Remove="Images\收缩.png" />
     <None Remove="Images\日期1.png" />
+    <None Remove="Images\暂无图片.png" />
     <None Remove="Images\矩形边框.png" />
     <None Remove="Images\矩形边框1.png" />
     <None Remove="Images\系统名称.png" />
@@ -124,6 +126,9 @@
     <Resource Include="Images\Exp.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\Image_32x32.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\leftImage.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
@@ -223,6 +228,9 @@
     <Resource Include="Images\日期1.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Images\暂无图片.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="Images\矩形边框.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
index ec3c34d7..9896f911 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheCheckBox.xaml.cs
@@ -31,10 +31,20 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         public TheCheckBox()
         {
             InitializeComponent();
+            
             Content = "勾选框";
             VerticalContentAlignment = VerticalAlignment.Center;
+            this.Loaded += TheButton_Loaded;
+        }
+        private void TheButton_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth == 54 && this.Content.ToString()== "勾选框")
+            {
+                Content = "勾选框";
+                Width = 60;
+                Height = 30;
+            }
         }
-
         public string ControlType => "控件";
 
 
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
index 83869b10..363028a6 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml
@@ -5,5 +5,5 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:BPASmartClient.SCADAControl.CustomerControls"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" Source="/BPASmartClient.SCADAControl;component/Images/State0.png">
+             d:DesignHeight="450" d:DesignWidth="800" Source="/BPASmartClient.SCADAControl;component/Images/暂无图片.png" Stretch="Fill">
 </Image>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
index 72140c14..c475d7b1 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheImage.xaml.cs
@@ -29,8 +29,7 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         public TheImage()
         {
             InitializeComponent();
-            Stretch = Stretch.UniformToFill;
-            //SetCurrentValue(SourceProperty, new BitmapImage(new Uri("pack://application:,,,/Images/借出.png", UriKind.Absolute)));
+            Stretch = Stretch.Fill;
             Width = 80;
             Height = 80;
         }
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs b/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
index 9fb6131b..21ed5e25 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheRadioButton.cs
@@ -27,6 +27,16 @@ namespace BPASmartClient.SCADAControl.CustomerControls
             languageResDic.Source = new Uri(@"/BPASmartClient.SCADAControl;component/Themes/Generic.xaml",UriKind.RelativeOrAbsolute);
             this.Resources.MergedDictionaries.Add(languageResDic);
             SetCurrentValue(ContentProperty, "单选按钮");
+            this.Loaded += TheButton_Loaded;
+        }
+        private void TheButton_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ActualWidth <= 70 && this.Content.ToString() == "单选按钮")
+            {
+                Content = "单选按钮";
+                Width = 78;
+                Height = 24;
+            }
         }
         static TheRadioButton()
         {
diff --git a/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
index 4af03091..48f7a29f 100644
--- a/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
+++ b/BPASmartClient.SCADAControl/CustomerControls/TheTabControl.xaml.cs
@@ -42,7 +42,7 @@ namespace BPASmartClient.SCADAControl.CustomerControls
         {
             try
             {
-                object _header = (this.SelectedItem as TabItem).Header;
+                object _header = (this.SelectedItem as TabItem)?.Header;
                 TabItems?.ToList().ForEach(par =>
                 {
                     if (_header!=null && par.Header == (string)_header)
diff --git a/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll b/BPASmartClient.SCADAControl/DLL/BPASmartClient.Compiler.dll
index c77b1d4f276535ff435161f578c5df3ff460a01d..d7bb62ee2d56c84e101ae9e1d2f192176df12ea0 100644
GIT binary patch
delta 24288
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
X`@S8%cmAWu#l3du?|&&Z_OSn7gDE9~

delta 23923
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

diff --git a/BPASmartClient.SCADAControl/Images/Image_32x32.png b/BPASmartClient.SCADAControl/Images/Image_32x32.png
new file mode 100644
index 0000000000000000000000000000000000000000..c272ba4a0c0e6159736bdd710aea40940975b7ab
GIT binary patch
literal 1828
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
SmsQ>X0000<MNUMnLSTYFokdgt

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Images/暂无图片.png b/BPASmartClient.SCADAControl/Images/暂无图片.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4db00b0c8f54db443963d27d3c5fe2058b879d6
GIT binary patch
literal 3667
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

literal 0
HcmV?d00001

diff --git a/BPASmartClient.SCADAControl/Themes/Generic.xaml b/BPASmartClient.SCADAControl/Themes/Generic.xaml
index 1eb6d38d..305b450b 100644
--- a/BPASmartClient.SCADAControl/Themes/Generic.xaml
+++ b/BPASmartClient.SCADAControl/Themes/Generic.xaml
@@ -395,7 +395,7 @@
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="Background">
                 <Setter.Value>
-                    <ImageBrush ImageSource="../Images/button2.png" />
+                    <ImageBrush ImageSource="../Images/button1.png" />
                 </Setter.Value>
             </Setter>
             <Setter Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
@@ -427,20 +427,12 @@
                         </Border>
                         <ControlTemplate.Triggers>
                             <Trigger Property="IsChecked" Value="true">
-                                <Setter TargetName="BD" Property="Background">
-                                    <Setter.Value>
-                                        <ImageBrush ImageSource="../Images/button2.png" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource MeunSelectForeground}" />
+                                <Setter TargetName="BD" Property="Opacity" Value="1"/>
+                                <Setter TargetName="textBlock" Property="Opacity" Value="1" />
                             </Trigger>
                             <Trigger Property="IsChecked" Value="False">
-                                <Setter TargetName="BD" Property="Background">
-                                    <Setter.Value>
-                                        <ImageBrush ImageSource="../Images/button1.png" />
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonSelectForeground}" />
+                                <Setter TargetName="BD" Property="Opacity" Value="0.5"/>
+                                <Setter TargetName="textBlock" Property="Opacity" Value="0.5" />
                             </Trigger>
                             <Trigger Property="IsEnabled" Value="False">
                                 <Setter TargetName="textBlock" Property="Foreground" Value="{DynamicResource ButtonUnSelectForeground}" />
@@ -500,7 +492,7 @@
     </Style>
 
     <Style TargetType="{x:Type ctrl:NumberBox}">
-        <Setter Property="BorderBrush" Value="{x:Static Themes1:ClassicBorderDecorator.ClassicBorderBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource borderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Foreground" Value="{DynamicResource foreground}" />
@@ -519,9 +511,10 @@
                 <ControlTemplate TargetType="{x:Type TextBox}">
                     <Themes1:ClassicBorderDecorator
                         x:Name="Bd"
-                        BorderBrush="{DynamicResource borderBrush}"
                         BorderStyle="None"
-                        BorderThickness="1">
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}">
                         <ScrollViewer x:Name="PART_ContentHost" />
                     </Themes1:ClassicBorderDecorator>
                     <ControlTemplate.Triggers>
@@ -758,14 +751,10 @@
                         SnapsToDevicePixels="True">
                         <Grid>
                             <Image
-                                Width="12"
-                                Height="14"
-                                Source="../Images/Cb_HalfChecked.png" />
+                                Source="../Images/Cb_HalfChecked.png" Margin="0,8,2,8" VerticalAlignment="Center" />
                             <Image
                                 x:Name="image1"
-                                Width="12"
-                                Height="14"
-                                Source="../Images/Cb_HalfChecked.png" />
+                                Source="../Images/Cb_HalfChecked.png" Margin="0,8,2,8" VerticalAlignment="Center" />
                         </Grid>
                         <ContentPresenter
                             Margin="{TemplateBinding Padding}"
@@ -1505,23 +1494,13 @@
                 <ControlTemplate TargetType="{x:Type RadioButton}">
                     <BulletDecorator VerticalAlignment="Center" Background="Transparent">
                         <BulletDecorator.Bullet>
-                            <Grid>
-                                <Ellipse
-                                    x:Name="Border"
-                                    Width="10"
-                                    Height="10"
-                                    Fill="{TemplateBinding Background}" />
-                                <Ellipse
-                                    x:Name="Dot"
-                                    Width="5"
-                                    Height="5"
-                                    Fill="#ff8a03"
-                                    Visibility="Hidden" />
+                            <Grid Height="{TemplateBinding Height}" Width="{TemplateBinding Height}">
+                                <Ellipse  x:Name="Border" Margin="0,5,10,5"  Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}"/>
+                                <Ellipse  x:Name="Dot" Width="{Binding Width,ElementName=Border}" Height="{Binding Height,ElementName=Border}" Margin="0,5,10,5"  Fill="{TemplateBinding Foreground}"  />
                             </Grid>
-
                         </BulletDecorator.Bullet>
                         <ContentPresenter
-                            Margin="{TemplateBinding Padding}"
+                            Margin="-5,0,0,0"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             RecognizesAccessKey="True" />
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index fddbac28..1b28f4a1 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -472,7 +472,7 @@
 
 
                             <!--代码绑定模块-->
-                            <mypro:EditorTemplateDefinition TargetProperties="ClickExec,ValueChangedExecute,TikcExecute,CheckedExec,UnCheckedExec,ChuLiaoExecute,StopChuLiaoExecute" >
+                            <mypro:EditorTemplateDefinition TargetProperties="ClickStr,ClickExec,ValueChangedExecute,TikcExecute,CheckedExec,UnCheckedExec,ChuLiaoExecute,StopChuLiaoExecute" >
                                 <mypro:EditorTemplateDefinition.EditingTemplate>
                                     <DataTemplate>
                                         <Grid>

From ae28cb47f9821a367d149c6c7b4c21f28c8bb79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 15 Oct 2022 11:03:20 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/MessageLog.cs                 |  3 +
 .../Pages/View/PromptView.xaml                | 56 +++++++++++++++----
 .../Pages/View/PromptView.xaml.cs             | 12 ++++
 .../ViewModel/RecipeSettingsViewModel.cs      |  9 ++-
 4 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
index b8da7d9b..afc3925a 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
@@ -108,16 +108,19 @@ namespace BPASmartClient.CustomResource.Pages.Model
                     PV.TextBlockIcon = "&#xe61f;";
                     PV.TextBlockForeground = Brushes.Yellow;
                     PV.TextBlockInfo = $"警告：{info}";
+                    PV.Cancel.Visibility = Visibility.Collapsed;
                     break;
                 case DialogType.Error:
                     PV.TextBlockIcon = "&#xed1a;";
                     PV.TextBlockForeground = Brushes.Red;
                     PV.TextBlockInfo = $"错误：{info}";
+                    PV.Cancel.Visibility = Visibility.Collapsed;
                     break;
                 case DialogType.Information:
                     PV.TextBlockIcon = "&#xe657;";
                     PV.TextBlockForeground = Brushes.DeepSkyBlue;
                     PV.TextBlockInfo = $"提示：{info}";
+                    PV.Cancel.Visibility = Visibility.Visible;
                     break;
                 default:
                     break;
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
index 78dc8238..1892c83b 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
@@ -19,15 +19,16 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate>
-                        <Grid>
-                            
-                        </Grid>
+                        <Border
+                            BorderBrush="DeepSkyBlue"
+                            BorderThickness="2"
+                            CornerRadius="8" />
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
     </Window.Resources>
-    
+
     <Grid>
         <Grid.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" Stretch="Fill" />
@@ -49,17 +50,52 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
 
-                <TextBlock Name="icon" Text="&#xe61f;" FontSize="30" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="DeepSkyBlue" FontFamily="../../Fonts/#iconfont"/>
-                <TextBlock Name="info" Text="警告:" Grid.Column="1" TextWrapping="Wrap"  VerticalAlignment="Center" Foreground="DeepSkyBlue"/>
+                <TextBlock
+                    Name="icon"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontFamily="../../Fonts/#iconfont"
+                    FontSize="30"
+                    Foreground="DeepSkyBlue"
+                    Text="&#xe61f;" />
+                <TextBlock
+                    Name="info"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Foreground="DeepSkyBlue"
+                    Text="警告:"
+                    TextWrapping="Wrap" />
             </Grid>
 
-            <Grid Grid.Row="1">
-                <Button/>
-            </Grid>
+            <StackPanel
+                Grid.Row="1"
+                Margin="0,0,10,0"
+                HorizontalAlignment="Right"
+                Orientation="Horizontal">
+                <Button
+                    Name="Cancel"
+                    Width="90"
+                    Height="30"
+                    Margin="5,0,5,0"
+                 Click="Cancel_Click"
+                    Content="取消"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />
+
+                <Button
+                    Name="ok"
+                    Width="90"
+                    Height="30"
+                    Margin="5,0,5,0"
+                    Click="ok_Click"
+                    Content="确定"
+                    FontSize="20"
+                    Style="{StaticResource ImageButtonStyle}" />
+            </StackPanel>
 
             <Grid.RowDefinitions>
                 <RowDefinition />
-                <RowDefinition Height="0.7*" />
+                <RowDefinition Height="0.5*" />
             </Grid.RowDefinitions>
         </Grid>
 
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
index 11ddd2f5..e8d5fc3e 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
@@ -58,5 +58,17 @@ namespace BPASmartClient.CustomResource.Pages.View
             this.DialogResult = false;
             this.Close();
         }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = false;
+            this.Close();
+        }
+
+        private void ok_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            this.Close();
+        }
     }
 }
diff --git a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
index d61d225b..076f3a78 100644
--- a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
@@ -48,9 +48,12 @@ namespace BPASmartClient.DosingSystem.ViewModel
             {
                 if (o is string str)
                 {
-                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
-                    if (res != null) Json<LocaPar>.Data.Recipes.Remove(res);
-                    MessageLog.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}");
+                    if (MessageLog.GetInstance.ShowDialog($"是否删除【{str}】配方"))
+                    {
+                        var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                        if (res != null) Json<LocaPar>.Data.Recipes.Remove(res);
+                        MessageLog.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}");
+                    }
                 }
             });
 

From b87c5d50fc7c4a2017b590d67165524dc3ab85b2 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 13:50:38 +0800
Subject: [PATCH 12/19] 1

---
 WPFDemo/TheListBox.xaml    |  29 +++
 WPFDemo/TheListBox.xaml.cs | 356 +++++++++++++++++++++++++++++++++++++
 WPFDemo/Window2.xaml       |  29 +--
 WPFDemo/Window2.xaml.cs    | 298 -------------------------------
 4 files changed, 390 insertions(+), 322 deletions(-)
 create mode 100644 WPFDemo/TheListBox.xaml
 create mode 100644 WPFDemo/TheListBox.xaml.cs

diff --git a/WPFDemo/TheListBox.xaml b/WPFDemo/TheListBox.xaml
new file mode 100644
index 00000000..2c6eddc9
--- /dev/null
+++ b/WPFDemo/TheListBox.xaml
@@ -0,0 +1,29 @@
+<UserControl x:Class="WPFDemo.TheListBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPFDemo"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <ListView x:Name="listView" 
+              ItemsSource="{Binding ViewItems,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   
+              Background="{x:Null}" Foreground="White" 
+              PreviewMouseMove="ListView_PreviewMouseMove"
+              PreviewMouseLeftButtonUp="lisbox_PreviewMouseLeftButtonUp">
+        <ListBox.ItemTemplate>
+            <ItemContainerTemplate>
+                <Border x:Name="border" Tag="border" BorderBrush="Aquamarine" MouseLeftButtonDown="Border_MouseLeftButtonDown" BorderThickness="1" Padding="5" Background="#FF18888A">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="60"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Margin="10,0,10,0" Grid.Column="0" Text="{Binding Name,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                        <TextBlock Grid.Column="1" Text="{Binding Ph,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                    </Grid>
+                </Border>
+            </ItemContainerTemplate>
+        </ListBox.ItemTemplate>
+    </ListView>
+</UserControl>
diff --git a/WPFDemo/TheListBox.xaml.cs b/WPFDemo/TheListBox.xaml.cs
new file mode 100644
index 00000000..a95547a4
--- /dev/null
+++ b/WPFDemo/TheListBox.xaml.cs
@@ -0,0 +1,356 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+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.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace WPFDemo
+{
+    /// <summary>
+    /// fyf 创建测试案例
+    /// TheListBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class TheListBox : UserControl
+    {
+        /// <summary>
+        /// 数据model
+        /// </summary>
+        public ListBoxDataModel TheListBoxModel = new ListBoxDataModel();
+        public TheListBox()
+        {
+            InitializeComponent();
+            this.DataContext = TheListBoxModel;
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "张三", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "李四", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "王麻子", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "二货", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "张三1", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "李四2", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "王麻子3", Ph = "125486545" });
+        }
+        #region 移动事件
+        /// <summary>
+        /// 当前拖动子控件流
+        /// </summary>
+        private UIElement ChildElement;
+        /// <summary>
+        /// 当前拖拽子控件Item
+        /// </summary>
+        private ListBoxItem ChildListBoxItem;
+        /// <summary>
+        /// 是否已经按下
+        /// </summary>
+        private bool isDown = false;
+        /// <summary>
+        /// 当前拖动的Pop窗体
+        /// </summary>
+        private Popup DropPopup = null;
+        /// <summary>
+        /// 鼠标按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                //isDown变量是防止多次操作。
+                if (isDown)
+                {
+                    isDown = false;
+                    return;
+                }
+
+                ChildElement = (UIElement)sender;
+                ChildElement.CaptureMouse();//设置了鼠标捕获，这样它可以不受到其它控件的影响。
+                ChildListBoxItem = Utils.FindVisualParent<ListBoxItem>(VisualTreeHelper.HitTest(ChildElement, e.GetPosition(ChildElement)).VisualHit);
+
+                //创建一个Pop,表明拖拽开始
+                CreatePopup(ChildElement, e);
+
+                isDown = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 鼠标抬起事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void lisbox_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                //鼠标未按下返回
+                if (!isDown) return;
+
+                isDown = false;
+
+                //关闭Pop窗体
+                if (this.DropPopup != null)
+                {
+                    this.DropPopup.IsOpen = false;
+                    this.DropPopup.Child = null;
+                    this.DropPopup = null;
+                }
+
+                //蒙层关闭,表明结束拖拽
+                MoveListBoxStyle(null, false);
+
+                //当控件具有鼠标捕获的话，则释放该捕获。
+                ChildElement.ReleaseMouseCapture();
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 鼠标移动事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListView_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (isDown == false) return;
+
+                if (e.LeftButton != MouseButtonState.Pressed)
+                    lisbox_PreviewMouseLeftButtonUp(null, null);
+
+                Point ptLeftUp = new Point(0, 0);
+                Point ptRightDown = new Point(this.ActualWidth, this.ActualHeight);
+
+                ptLeftUp = this.PointToScreen(ptLeftUp);
+                ptRightDown = this.PointToScreen(ptRightDown);
+
+                double y = e.GetPosition(this).Y;
+                double x = e.GetPosition(this).X;
+
+                if (DropPopup != null)//下面两句是设置Popup控件的位置除以2是想让鼠标在它的中心
+                {
+                    DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ChildElement).ActualWidth / 2;
+                    DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ChildElement).ActualHeight / 2;
+                }
+                MoveListBoxStyle(e,true);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+        /// <summary>
+        /// 移动效果
+        /// </summary>
+        /// <param name="boxItem"></param>
+        private void MoveListBoxStyle(MouseEventArgs e,bool isBool)
+        {
+            try
+            {
+                if (isBool)//为真，根据鼠标位置设置行透明度和显示状态
+                {
+                    //移动到某行减轻某行 暗黑
+                    foreach (ListBoxItem item in Utils.FindVisualChildren<ListBoxItem>(listView))
+                    {
+                        if (item != ChildListBoxItem)//这就是其他控件
+                        {
+                            double item_width = item.ActualWidth;
+                            double item_height = item.ActualHeight;
+                            double item_x = e.GetPosition(item).X;
+                            double item_y = e.GetPosition(item).Y;
+                            double Child_x = e.GetPosition(ChildElement).X;
+                            double Child_y = e.GetPosition(ChildElement).Y;
+
+                            if (item_y <= item_height && item_y > 0 && item_x > 0 && item_x <= item_width)//鼠标进入哪一行,则将那一行变灰
+                            {
+                                item.Opacity = 0.5;
+                                int lao_index = TheListBoxModel.ViewItems.IndexOf(item.Content as ItemModel);
+                                int new_index = TheListBoxModel.ViewItems.IndexOf(ChildListBoxItem.Content as ItemModel);
+                                TheListBoxModel.ViewItems.Move(lao_index, new_index);
+                            }
+                            else //鼠标没在哪一行，则保持原状
+                            {
+                                item.Opacity = 1;
+                            }
+                        }
+                        else
+                        {
+                            item.Visibility = Visibility.Hidden;
+                        }
+                    }
+                }
+                else//为假 恢复所有行透明度和显示状态
+                {
+                    //移动到某行减轻某行 暗黑
+                    foreach (ListBoxItem item in Utils.FindVisualChildren<ListBoxItem>(listView))
+                    {
+                        item.Opacity = 1;
+                        item.Visibility = Visibility.Visible;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+        /// <summary>
+        /// 创建浮动窗口
+        /// </summary>
+        /// <param name="dragElement"></param>
+        /// <param name="e"></param>
+        private void CreatePopup(Visual dragElement, MouseButtonEventArgs e)
+        {
+            //使用PointToScreen函数可以将点转换为屏幕坐标
+            //首先获取当前窗体的左上角和右下角两点的坐标
+            Point ptLeftUp = new Point(0, 0);
+            //转换获取到这个窗口相对于屏幕两个坐标
+            ptLeftUp = this.PointToScreen(ptLeftUp);
+            //获取myGrid的实际宽高，主
+            double y = e.GetPosition(this).Y;
+            double x = e.GetPosition(this).X;
+
+            //拖拽Popup框
+            this.DropPopup = new Popup();
+            Border border = new Border();
+            border.Margin = new Thickness(0, 0, 8, 8);
+            DropShadowEffect effect = new DropShadowEffect();
+            effect.Opacity = 1;
+            effect.ShadowDepth = -14;
+            effect.BlurRadius = 9;
+            effect.Color = Color.FromArgb(100, 0, 0, 0);
+            border.Effect = effect;
+
+            //矩阵框
+            Rectangle r = new Rectangle();
+            r.Width = ((FrameworkElement)dragElement).ActualWidth;
+            r.Height = ((FrameworkElement)dragElement).ActualHeight;
+            r.Fill = new VisualBrush(dragElement);
+            border.Child = r;
+            this.DropPopup.Child = border;
+            DropPopup.AllowsTransparency = true;
+            DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)dragElement).ActualWidth / 2;
+            DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)dragElement).ActualHeight / 2;
+            this.DropPopup.IsOpen = true;
+        }
+        #endregion
+    }
+    /// <summary>
+    /// 当前项数据Model
+    /// </summary>
+    public class ListBoxDataModel : ObservableObject
+    {
+        private ObservableCollection<ItemModel> _ViewItems;
+        public ObservableCollection<ItemModel> ViewItems
+        {
+            get
+            {
+                return _ViewItems;
+            }
+            set
+            {
+                _ViewItems = value;
+                OnPropertyChanged("ViewItems");
+            }
+        }
+        public ListBoxDataModel()
+        {
+            ViewItems = new ObservableCollection<ItemModel>();
+        }
+    }
+    /// <summary>
+    /// 行数据Model
+    /// </summary>
+    public class ItemModel : ObservableObject
+    {
+        private string _Name;
+        public string Name
+        {
+            get
+            {
+                return _Name;
+            }
+            set
+            {
+                _Name = value;
+                OnPropertyChanged("Name");
+            }
+        }
+        private string _Ph;
+        public string Ph
+        {
+            get
+            {
+                return _Ph;
+            }
+            set
+            {
+                _Ph = value;
+                OnPropertyChanged("Ph");
+            }
+        }
+    }
+    /// <summary>
+    /// 帮助类
+    /// </summary>
+    internal static class Utils
+    {
+        /// <summary>
+        /// 根据子元素查找父元素
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T FindVisualParent<T>(DependencyObject obj) where T : class
+        {
+            while (obj != null)
+            {
+                if (obj is T)
+                    return obj as T;
+
+                obj = VisualTreeHelper.GetParent(obj);
+            }
+            return null;
+        }
+        /// <summary>
+        /// 查询子控件
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
+        {
+            if (depObj != null)
+            {
+                for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++)
+                {
+                    DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
+                    if (child != null && child is T)
+                    {
+                        yield return (T)child;
+                    }
+
+                    foreach (T childOfChild in FindVisualChildren<T>(child))
+                    {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/WPFDemo/Window2.xaml b/WPFDemo/Window2.xaml
index 40f394a0..797d065b 100644
--- a/WPFDemo/Window2.xaml
+++ b/WPFDemo/Window2.xaml
@@ -10,29 +10,10 @@
         <Grid.Background>
             <ImageBrush ImageSource="/bj.png"/>
         </Grid.Background>
-        <ListView x:Name="lisbox" ItemsSource="{Binding ViewItems,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   
-                  Background="{x:Null}" Foreground="White" 
-                  PreviewMouseMove="ListView_PreviewMouseMove"
-                  PreviewMouseLeftButtonUp="lisbox_PreviewMouseLeftButtonUp">
-            <ListBox.ItemTemplate>
-                <ItemContainerTemplate>
-                    <Grid MouseLeftButtonDown="Grid_MouseLeftButtonDown" >
-                        <Border BorderBrush="Aquamarine" BorderThickness="1" Padding="5">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <TextBlock Grid.Column="0" Text="{Binding Name,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                                <TextBlock Grid.Column="1" Text="{Binding Ph,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
-                            </Grid>
-                        </Border>
-                    </Grid>
-                   
-                </ItemContainerTemplate>
-            </ListBox.ItemTemplate>
-        </ListView>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <local:TheListBox  HorizontalAlignment="Right" Grid.Row="1"></local:TheListBox>
     </Grid>
 </Window>
diff --git a/WPFDemo/Window2.xaml.cs b/WPFDemo/Window2.xaml.cs
index ec78fc3b..530ef240 100644
--- a/WPFDemo/Window2.xaml.cs
+++ b/WPFDemo/Window2.xaml.cs
@@ -23,307 +23,9 @@ namespace WPFDemo
     /// </summary>
     public partial class Window2 : Window
     {
-        TestModel testModel=new TestModel();
         public Window2()
         {
             InitializeComponent();
-            this.DataContext = testModel;
-
-
-            testModel.ViewItems.Add(new PageModel {Name="张三", Ph="125486545" });
-            testModel.ViewItems.Add(new PageModel { Name = "李四", Ph = "125486545" });
-            testModel.ViewItems.Add(new PageModel { Name = "王麻子", Ph = "125486545" });
-            testModel.ViewItems.Add(new PageModel { Name = "二货", Ph = "125486545" });
-        }
-
-        #region 移动事件
-        /// <summary>
-        /// 当前拖动子控件流
-        /// </summary>
-        private UIElement ChildElement;
-        /// <summary>
-        /// 是否已经按下
-        /// </summary>
-        private bool isDown = false;
-        /// <summary>
-        /// 按下记录初始鼠标点位
-        /// 鼠标相对与拖动子控件的位置（偏移量）
-        /// </summary>
-        private Point InitPoint;
-        /// <summary>
-        /// 当前拖动的Pop窗体
-        /// </summary>
-        private Popup DropPopup = null;
-
-
-        /// <summary>
-        /// 鼠标按下事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Grid_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                //isDown变量是防止多次操作。
-                if (isDown)
-                {
-                    isDown = false;
-                    return;
-                }
-
-                ChildElement = (UIElement)sender;
-                ChildElement.CaptureMouse();//设置了鼠标捕获，这样它可以不受到其它控件的影响。
-
-                InitPoint= new Point(e.GetPosition(ChildElement).X, e.GetPosition(ChildElement).Y);
-
-                //加蒙层，表明已经开始拖动
-                //暂时未加
-
-                CreatePopup(ChildElement, e);
-
-                isDown = true;
-            }
-            catch (Exception ex)
-            {
-
-            }
         }
-        /// <summary>
-        /// 鼠标抬起事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void lisbox_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                //鼠标未按下返回
-                if (!isDown) return;
-
-                isDown = false;
-
-                //关闭Pop窗体
-                if (this.DropPopup != null)
-                {
-                    this.DropPopup.IsOpen = false;
-                    this.DropPopup.Child = null;
-                    this.DropPopup = null;
-                }
-
-                //蒙层关闭
-
-                ChildElement.ReleaseMouseCapture();//当控件具有鼠标捕获的话，则释放该捕获。
-
-                //double y = e.GetPosition(this).Y;//获取鼠标抬起时的控件的位置 Y值
-                //double start = 0.0;
-                //int row = 0;
-                //foreach (RowDefinition rd in myGrid.RowDefinitions)
-                //{
-                //    start += rd.ActualHeight;
-                //    if (y < start)
-                //    {
-                //        break;
-                //    }
-                //    row++;
-                //}
-                //double x = e.GetPosition(myGrid).X;//获取鼠标抬起时的控件的位置 X值
-                //double cstart = 0.0;
-                //int column = 0;
-                //foreach (ColumnDefinition cd in myGrid.ColumnDefinitions)
-                //{
-                //    cstart += cd.ActualWidth;
-                //    if (x < cstart)
-                //    {
-                //        break;
-                //    }
-                //    column++;
-                //}
-                //var initRow = Grid.GetRow(ultUE);//找到控件所在的行
-                //var initCol = Grid.GetColumn(ultUE);//找到控件所在的列
-                //UIElement uIElement = null;
-                //if (row != initRow || column != initCol)
-                //{
-                //    uIElement = GetChildren(myGrid, row, column);
-                //}
-                //if (uIElement != null)
-                //{
-                //    //下面是交换两个控件的位置 （需要先移除再加载）
-                //    myGrid.Children.Remove(uIElement);
-                //    Grid.SetColumn(ultUE, column);//指定控件在grid中哪行哪例
-                //    Grid.SetRow(ultUE, row);
-                //    myGrid.Children.Add(uIElement);
-                //    Grid.SetColumn(uIElement, initCol);
-                //    Grid.SetRow(uIElement, initRow);
-                //}
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        /// <summary>
-        /// 鼠标移动事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ListView_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                if (isDown == false) return;
-
-                Point ptLeftUp = new Point(0, 0);
-                Point ptRightDown = new Point(this.ActualWidth, this.ActualHeight);
-
-                ptLeftUp = this.PointToScreen(ptLeftUp);
-                ptRightDown = this.PointToScreen(ptRightDown);
-
-                double y = e.GetPosition(lisbox).Y;
-                double x = e.GetPosition(lisbox).X;
-
-
-                if (DropPopup != null)
-                {
-                    //下面两句是设置Popup控件的位置除以2是想让鼠标在它的中心
-                    DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ChildElement).ActualWidth / 2;
-                    DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ChildElement).ActualHeight / 2;
-                }
-
-                //double start = 0.0;
-                //int row = 0;
-                //foreach (RowDefinition rd in myGrid.RowDefinitions)
-                //{
-                //    start += rd.ActualHeight;
-                //    if (y < start)
-                //    {
-                //        break;
-                //    }
-                //    row++;
-                //}
-                //double cstart = 0.0;
-                //int column = 0;
-                //foreach (ColumnDefinition cd in myGrid.ColumnDefinitions)
-                //{
-                //    cstart += cd.ActualWidth;
-                //    if (x < cstart)
-                //    {
-                //        break;
-                //    }
-                //    column++;
-                //}
-                ////下面的代码是当鼠标移动到哪个格子哪个格子就会亮起来。
-                //UIElement uIElement = GetChildren(myGrid, row, column);
-                //foreach (UIElement element in myGrid.Children)
-                //{
-                //    if (element != ultUE && element != uIElement)
-                //    {
-                //        element.Opacity = moveOpacity;
-                //    }
-                //    else
-                //    {
-                //        element.Opacity = 1;
-                //    }
-                //}
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        /// <summary>
-        /// 创建浮动窗口
-        /// </summary>
-        /// <param name="dragElement"></param>
-        /// <param name="e"></param>
-        private void CreatePopup(Visual dragElement, MouseButtonEventArgs e)
-        {
-            //使用PointToScreen函数可以将点转换为屏幕坐标
-            //首先获取当前窗体的左上角和右下角两点的坐标
-            Point ptLeftUp = new Point(0, 0);
-            //转换获取到这个窗口相对于屏幕两个坐标
-            ptLeftUp = this.PointToScreen(ptLeftUp);
-
-            //获取myGrid的实际宽高
-            double y = e.GetPosition(this).Y;
-            double x = e.GetPosition(this).X;
-
-
-            this.DropPopup = new Popup();
-            Border border = new Border();
-            border.Margin = new Thickness(0, 0, 8, 8);
-            DropShadowEffect effect = new DropShadowEffect();
-            effect.Opacity = 1;
-            effect.ShadowDepth = -14;
-            effect.BlurRadius = 9;
-            effect.Color = Color.FromArgb(100, 0, 0, 0);
-            border.Effect = effect;
-
-
-            Rectangle r = new Rectangle();
-            r.Width = ((FrameworkElement)dragElement).ActualWidth;
-            r.Height = ((FrameworkElement)dragElement).ActualHeight;
-            r.Fill = new VisualBrush(dragElement);
-            border.Child = r;
-            this.DropPopup.Child = border;
-            DropPopup.AllowsTransparency = true;
-            DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)dragElement).ActualWidth / 2;
-            DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)dragElement).ActualHeight / 2;
-
-            this.DropPopup.IsOpen = true;
-        }
-        #endregion
-    }
-
-    public class TestModel : ObservableObject
-    {
-        private ObservableCollection<PageModel> _pageModels;
-        public ObservableCollection<PageModel> ViewItems
-        {
-            get
-            {
-                return _pageModels;
-            }
-            set
-            {
-                _pageModels = value;
-                OnPropertyChanged("ViewItems");
-            }
-        }
-        public TestModel()
-        {
-            ViewItems=new ObservableCollection<PageModel>();
-        }
-    }
-
-    public class PageModel : ObservableObject
-    {
-        private string _Name;
-        public string Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                _Name = value;
-                OnPropertyChanged("Name");
-            }
-        }
-        private string _Ph;
-        public string Ph
-        {
-            get
-            {
-                return _Ph;
-            }
-            set
-            {
-                _Ph = value;
-                OnPropertyChanged("Ph");
-            }
-        }
-
     }
 }

From f36cdaff7e05a9326d3d5abb21bc88f4d760c43d Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 13:55:00 +0800
Subject: [PATCH 13/19] 1

---
 WPFDemo/TheListBox.xaml.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/WPFDemo/TheListBox.xaml.cs b/WPFDemo/TheListBox.xaml.cs
index a95547a4..9b016e32 100644
--- a/WPFDemo/TheListBox.xaml.cs
+++ b/WPFDemo/TheListBox.xaml.cs
@@ -149,7 +149,9 @@ namespace WPFDemo
                     DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ChildElement).ActualWidth / 2;
                     DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ChildElement).ActualHeight / 2;
                 }
-                MoveListBoxStyle(e,true);
+
+                //蒙层打开,表明拖拽开始，设置透明度和显示状态
+                MoveListBoxStyle(e, true);
             }
             catch (Exception ex)
             {
@@ -159,7 +161,7 @@ namespace WPFDemo
         /// 移动效果
         /// </summary>
         /// <param name="boxItem"></param>
-        private void MoveListBoxStyle(MouseEventArgs e,bool isBool)
+        private void MoveListBoxStyle(MouseEventArgs e, bool isBool)
         {
             try
             {
@@ -170,12 +172,10 @@ namespace WPFDemo
                     {
                         if (item != ChildListBoxItem)//这就是其他控件
                         {
-                            double item_width = item.ActualWidth;
-                            double item_height = item.ActualHeight;
-                            double item_x = e.GetPosition(item).X;
-                            double item_y = e.GetPosition(item).Y;
-                            double Child_x = e.GetPosition(ChildElement).X;
-                            double Child_y = e.GetPosition(ChildElement).Y;
+                            double item_width = item.ActualWidth;   //当前行宽
+                            double item_height = item.ActualHeight; //当前行高
+                            double item_x = e.GetPosition(item).X;  //鼠标相对当前行X位移
+                            double item_y = e.GetPosition(item).Y;  //鼠标相对当前行Y位移
 
                             if (item_y <= item_height && item_y > 0 && item_x > 0 && item_x <= item_width)//鼠标进入哪一行,则将那一行变灰
                             {

From a05e10a95dbee0e00bdc0beb3288690ab07bbd96 Mon Sep 17 00:00:00 2001
From: NXX <447201003@qq>
Date: Sat, 15 Oct 2022 13:56:43 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E5=B0=8F=E7=82=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmart.RecipeManagement/App.xaml            |  14 +-
 .../BPASmart.RecipeManagement.csproj          |   1 +
 .../View/RecipesConfigure.xaml                |   3 +-
 .../ViewModel/RecipeManagerViewModel.cs       |   7 +-
 BPASmartClient.MilkWithTea/App.xaml           |  16 +-
 BPASmartClient.MilkWithTea/App.xaml.cs        |  27 +-
 .../BPASmartClient.MilkWithTea.csproj         |   7 +-
 .../Control/ContextMenuToggleButton.cs        |  30 ++
 .../Control/ScrollViewer.cs                   | 225 ++++++++
 .../Control/ScrollViewerAttach.cs             | 111 ++++
 .../Control/TabControl.cs                     | 426 +++++++++++++++
 BPASmartClient.MilkWithTea/Control/TabItem.cs | 509 ++++++++++++++++++
 .../Control/TabPanel.cs                       | 200 +++++++
 .../Data/CancelRoutedEventArgs.cs             |  12 +
 BPASmartClient.MilkWithTea/Data/ValueBoxes.cs |  69 +++
 BPASmartClient.MilkWithTea/GLobal.cs          |  41 +-
 BPASmartClient.MilkWithTea/MainWindow.xaml.cs |  51 +-
 .../Model/JsonDeviceConfig.cs                 |  13 +
 .../Model/JsonLocalRecipes.cs                 |  23 +
 .../View/LocalConfigureView.xaml              | 247 ++++-----
 .../View/LocalConfigureView.xaml.cs           |   9 +-
 .../View/MainControlView.xaml                 |   8 +-
 .../View/MainControlView.xaml.cs              |   5 +-
 .../View/ParameterSetting.xaml                |  37 +-
 .../View/RecipeConfige.xaml                   | 135 +++++
 .../View/RecipeConfige.xaml.cs                | 174 ++++++
 .../ViewModel/LocalConfigureViewModel.cs      | 199 ++-----
 .../ViewModel/MainControlViewModel.cs         |  65 ++-
 .../ViewModel/MainWindowVeiwModel.cs          |  33 +-
 .../ViewModel/PatrameterSettiongViewModel.cs  | 191 ++++---
 .../ViewModel/RecipeConfigeViewModel.cs       |  75 +++
 .../BPASmartClient.Model.csproj               |   4 +
 BPASmartClient.MorkF/Control_MorkF.cs         | 243 +++------
 BPASmartClient.MorkF/GVL_MorkF.cs             |  38 ++
 BPASmartClient.MorkF/View/DebugView.xaml      |  56 +-
 .../ViewModel/DebugViewModel.cs               | 125 +++--
 .../BPASmartClient.MorkMOC.csproj             |   7 +-
 BPASmartClient.MorkMOC/Control_MorkMOC.cs     |  27 +-
 BPASmartClient.MorkMOC/Model/LocalMaterail.cs |  55 ++
 BPASmartClient.MorkMOC/OrderLocInfo.cs        |   3 +
 BPASmartClient.MorkS/Control_Morks.cs         |   2 +
 BPASmartClient.MorkS/GVL_MORKS.cs             |   1 +
 .../Model/LocalTeaWithMilkConfig.cs           |   4 +
 BPASmartClient/App.config                     |  19 +-
 44 files changed, 2769 insertions(+), 778 deletions(-)
 create mode 100644 BPASmartClient.MilkWithTea/Control/ContextMenuToggleButton.cs
 create mode 100644 BPASmartClient.MilkWithTea/Control/ScrollViewer.cs
 create mode 100644 BPASmartClient.MilkWithTea/Control/ScrollViewerAttach.cs
 create mode 100644 BPASmartClient.MilkWithTea/Control/TabControl.cs
 create mode 100644 BPASmartClient.MilkWithTea/Control/TabItem.cs
 create mode 100644 BPASmartClient.MilkWithTea/Control/TabPanel.cs
 create mode 100644 BPASmartClient.MilkWithTea/Data/CancelRoutedEventArgs.cs
 create mode 100644 BPASmartClient.MilkWithTea/Data/ValueBoxes.cs
 create mode 100644 BPASmartClient.MilkWithTea/Model/JsonDeviceConfig.cs
 create mode 100644 BPASmartClient.MilkWithTea/Model/JsonLocalRecipes.cs
 create mode 100644 BPASmartClient.MilkWithTea/View/RecipeConfige.xaml
 create mode 100644 BPASmartClient.MilkWithTea/View/RecipeConfige.xaml.cs
 create mode 100644 BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs
 create mode 100644 BPASmartClient.MorkMOC/Model/LocalMaterail.cs

diff --git a/BPASmart.RecipeManagement/App.xaml b/BPASmart.RecipeManagement/App.xaml
index 196cf0ec..3d9f99d4 100644
--- a/BPASmart.RecipeManagement/App.xaml
+++ b/BPASmart.RecipeManagement/App.xaml
@@ -87,7 +87,7 @@
         </ControlTemplate>
 
 
-        <Style   TargetType="{x:Type ComboBox}">
+        <Style    TargetType="{x:Type ComboBox}">
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="Background" Value="	#041039"/>
             <Setter Property="BorderBrush" Value="#FF2AB2E7"/>
@@ -101,13 +101,12 @@
                                 <ControlTemplate TargetType="{x:Type ComboBoxItem}">
                                     <Grid Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" >
                                         <Border x:Name="_borderbg" Background="	#041039" BorderBrush="#FF2AB2E7" BorderThickness="0"/>
-                                        <TextBlock
+                                        <ContentPresenter
                                         x:Name="_txt"
                                         Margin="5,0,3,0"
                                         HorizontalAlignment="Left"
                                         VerticalAlignment="Center"
-                                        Foreground="#FF2AB2E7"
-                                        Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}" />
+                                        />
 
                                         <Border
                                         x:Name="_border"
@@ -123,7 +122,7 @@
                                             <Setter TargetName="_borderbg" Property="Background" Value="#37405E" />
                                             <Setter TargetName="_borderbg" Property="BorderBrush" Value="white" />
                                             <Setter TargetName="_borderbg" Property="BorderThickness" Value="1" />
-                                            <Setter TargetName="_txt" Property="Foreground" Value="white" />
+                                            <!--<Setter TargetName="_txt" Property="Foreground" Value="white" />-->
                                         </MultiTrigger>
                                         <MultiTrigger>
                                             <MultiTrigger.Conditions>
@@ -132,7 +131,7 @@
                                             <Setter TargetName="_borderbg" Property="Background" Value="#022352" />
                                             <Setter TargetName="_borderbg" Property="BorderBrush" Value="	#00BFFF" />
                                             <Setter TargetName="_borderbg" Property="BorderThickness" Value="1" />
-                                            <Setter TargetName="_txt" Property="Foreground" Value="white" />
+                                            <!--<Setter TargetName="_txt" Property="Foreground" Value="white" />-->
                                         </MultiTrigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
@@ -221,7 +220,8 @@
                                         <StackPanel
                                         Background="{TemplateBinding Background}"  
                                         IsItemsHost="True" 
-                                        KeyboardNavigation.DirectionalNavigation="Contained"/>
+                                        KeyboardNavigation.DirectionalNavigation="Contained">
+                                        </StackPanel>
                                     </ScrollViewer>
                                 </Grid>
                             </Popup>
diff --git a/BPASmart.RecipeManagement/BPASmart.RecipeManagement.csproj b/BPASmart.RecipeManagement/BPASmart.RecipeManagement.csproj
index 3014e91f..033561b6 100644
--- a/BPASmart.RecipeManagement/BPASmart.RecipeManagement.csproj
+++ b/BPASmart.RecipeManagement/BPASmart.RecipeManagement.csproj
@@ -49,6 +49,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\BPASmart.Model\BPASmart.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
   </ItemGroup>
 
diff --git a/BPASmart.RecipeManagement/View/RecipesConfigure.xaml b/BPASmart.RecipeManagement/View/RecipesConfigure.xaml
index c7ab3986..e78e2b0b 100644
--- a/BPASmart.RecipeManagement/View/RecipesConfigure.xaml
+++ b/BPASmart.RecipeManagement/View/RecipesConfigure.xaml
@@ -66,7 +66,7 @@
                                                 <ColumnDefinition Width="2*" />
                                             </Grid.ColumnDefinitions>
 
-                                            <ComboBox
+                                            <ComboBox 
                                                     Name="cb"
                                                     Grid.Column="0"
                                                     Margin="3,1"
@@ -77,7 +77,6 @@
                                                     FontFamily="楷体"
                                                     FontSize="20"
                                                     IsEditable="False"   
-                                               
                                                     SelectedValuePath="Key" DisplayMemberPath="Value"
                                                     ItemsSource="{Binding DataContext.materialsName, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
                                                     SelectedValue="{Binding ID}"
diff --git a/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs b/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
index f6cf1d6d..af02937e 100644
--- a/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
+++ b/BPASmart.RecipeManagement/ViewModel/RecipeManagerViewModel.cs
@@ -1,5 +1,7 @@
 using BPASmart.Model;
 using BPASmart.RecipeManagement.View;
+using BPASmartClient.CustomResource.UserControls;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
 using BPASmartClient.Helper;
 using BPASmartClient.RecipeManagement.View;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -10,6 +12,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace BPASmart.RecipeManagement.ViewModel
 {
@@ -81,8 +84,8 @@ namespace BPASmart.RecipeManagement.ViewModel
                 var res = Json<LocalRecipes>.Data.locaRecipes.FirstOrDefault(p => p.ID == id);
                 if (res != null)
                 {
-                   //下发配方
-
+                    //下发配方
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, Application.Current.MainWindow, "提示", $"配方下发成功!");
                 }
             }
         }
diff --git a/BPASmartClient.MilkWithTea/App.xaml b/BPASmartClient.MilkWithTea/App.xaml
index 83ac9a37..27d40693 100644
--- a/BPASmartClient.MilkWithTea/App.xaml
+++ b/BPASmartClient.MilkWithTea/App.xaml
@@ -424,7 +424,7 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ComboBoxItem">
-                                    <Border Name="Back" Background="Transparent"  BorderThickness="0,0,0,0" BorderBrush="#81D779" >
+                                    <Border Name="Back" Background="Transparent"  BorderThickness="0,0,0,0" BorderBrush="#81D779" Height="{TemplateBinding Height}" >
                                         <ContentPresenter  VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5,0,0,0"></ContentPresenter>
                                     </Border>
                                     <ControlTemplate.Triggers>
@@ -444,13 +444,13 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ComboBox}">
-                        <Border BorderThickness="1" BorderBrush="#CDC9C9	" CornerRadius="3" Width="{TemplateBinding Width}" Height="30" Background="{TemplateBinding Background}" >
-                            <Grid >
+                        <Border BorderThickness="1" BorderBrush="#CDC9C9	" CornerRadius="3" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"  Background="{TemplateBinding Background}" >
+                            <Grid Height="{TemplateBinding Height}">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="3*"/>
                                     <ColumnDefinition Width="*"/>
                                 </Grid.ColumnDefinitions>
-                                <Grid Grid.Column="0" x:Name="grid">
+                                <Grid Grid.Column="0" x:Name="grid" >
                                     <ToggleButton
                                         Width="{Binding ElementName=grid,Path=ActualWidth}"
                                         Height="{Binding ElementName=grid, Path=ActualHeight}"
@@ -672,5 +672,13 @@
             </DoubleAnimationUsingKeyFrames>
         </Storyboard>
 
+        <Style TargetType="TextBlock">
+            <Setter Property="FontSize" Value="18"/>
+            <Setter Property="Foreground" Value="DarkSlateGray"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="FontSize" Value="18"/>
+        </Style>
+
     </Application.Resources>
 </Application>
diff --git a/BPASmartClient.MilkWithTea/App.xaml.cs b/BPASmartClient.MilkWithTea/App.xaml.cs
index 266bb6c8..aba6737f 100644
--- a/BPASmartClient.MilkWithTea/App.xaml.cs
+++ b/BPASmartClient.MilkWithTea/App.xaml.cs
@@ -1,11 +1,22 @@
-using BPASmartClient.Helper;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+global using BPA.Message;
+global using BPA.Message.Enum;
+global using BPASmartClient.Device;
+global using BPASmartClient.EventBus;
+global using BPASmartClient.Helper;
+global using BPASmartClient.MilkWithTea.Model;
+global using BPASmartClient.Model;
+global using BPASmartClient.MorkMOC;
+global using System;
+global using System.Collections.Generic;
+global using System.Collections.ObjectModel;
+global using System.Linq;
+global using System.Text;
+global using System.Threading.Tasks;
+global using System.Windows;
+global using System.Configuration;
+global using System.Data;
+
+
 
 namespace BPASmartClient.MilkWithTea
 {
diff --git a/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj b/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj
index 43e4c5d7..7b248a82 100644
--- a/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj
+++ b/BPASmartClient.MilkWithTea/BPASmartClient.MilkWithTea.csproj
@@ -23,14 +23,19 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\BPASmartClient.Business\BPASmartClient.Business.csproj" />
     <ProjectReference Include="..\BPASmartClient.CustomResource\BPASmartClient.CustomResource.csproj" />
     <ProjectReference Include="..\BPASmartClient.EventBus\BPASmartClient.EventBus.csproj" />
+    <ProjectReference Include="..\BPASmartClient.Helper\BPASmartClient.Helper.csproj" />
     <ProjectReference Include="..\BPASmartClient.IoT\BPASmartClient.IoT.csproj" />
     <ProjectReference Include="..\BPASmartClient.Model\BPASmartClient.Model.csproj" />
+    <ProjectReference Include="..\BPASmartClient.MorkMOC\BPASmartClient.MorkMOC.csproj" />
     <ProjectReference Include="..\BPASmartClient.MORKSM.BK.PLC\BPASmartClient.PLC.csproj" />
-    <ProjectReference Include="..\BPASmartClient.MorkTM\BPASmartClient.MorkTM.csproj" />
     <ProjectReference Include="..\BPASmartClient.ViewModel\BPASmartClient.ViewModel.csproj" />
   </ItemGroup>
 
diff --git a/BPASmartClient.MilkWithTea/Control/ContextMenuToggleButton.cs b/BPASmartClient.MilkWithTea/Control/ContextMenuToggleButton.cs
new file mode 100644
index 00000000..9ffe859b
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/ContextMenuToggleButton.cs
@@ -0,0 +1,30 @@
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+/// <summary>
+///     带上下文菜单的切换按钮
+/// </summary>
+public class ContextMenuToggleButton : ToggleButton
+{
+    public ContextMenu Menu { get; set; }
+
+    protected override void OnClick()
+    {
+        base.OnClick();
+        if (Menu != null)
+        {
+            if (IsChecked == true)
+            {
+                Menu.PlacementTarget = this;
+                Menu.IsOpen = true;
+            }
+            else
+            {
+                Menu.IsOpen = false;
+            }
+        }
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/Control/ScrollViewer.cs b/BPASmartClient.MilkWithTea/Control/ScrollViewer.cs
new file mode 100644
index 00000000..f289b71a
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/ScrollViewer.cs
@@ -0,0 +1,225 @@
+using BPASmartClient.MilkWithTea.Data;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+public class ScrollViewer : System.Windows.Controls.ScrollViewer
+{
+    private double _totalVerticalOffset;
+
+    private double _totalHorizontalOffset;
+
+    private bool _isRunning;
+
+    /// <summary>
+    ///     是否响应鼠标滚轮操作
+    /// </summary>
+    public static readonly DependencyProperty CanMouseWheelProperty = DependencyProperty.Register(
+        "CanMouseWheel", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    /// <summary>
+    ///     是否响应鼠标滚轮操作
+    /// </summary>
+    public bool CanMouseWheel
+    {
+        get => (bool) GetValue(CanMouseWheelProperty);
+        set => SetValue(CanMouseWheelProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    protected override void OnMouseWheel(MouseWheelEventArgs e)
+    {
+        if (!CanMouseWheel) return;
+
+        if (!IsInertiaEnabled)
+        {
+            if (ScrollViewerAttach.GetOrientation(this) == Orientation.Vertical)
+            {
+                base.OnMouseWheel(e);
+            }
+            else
+            {
+                _totalHorizontalOffset = HorizontalOffset;
+                CurrentHorizontalOffset = HorizontalOffset;
+                _totalHorizontalOffset = Math.Min(Math.Max(0, _totalHorizontalOffset - e.Delta), ScrollableWidth);
+                CurrentHorizontalOffset = _totalHorizontalOffset;
+            }
+            return;
+        }
+        e.Handled = true;
+
+        if (ScrollViewerAttach.GetOrientation(this) == Orientation.Vertical)
+        {
+            if (!_isRunning)
+            {
+                _totalVerticalOffset = VerticalOffset;
+                CurrentVerticalOffset = VerticalOffset;
+            }
+            _totalVerticalOffset = Math.Min(Math.Max(0, _totalVerticalOffset - e.Delta), ScrollableHeight);
+            ScrollToVerticalOffsetWithAnimation(_totalVerticalOffset);
+        }
+        else
+        {
+            if (!_isRunning)
+            {
+                _totalHorizontalOffset = HorizontalOffset;
+                CurrentHorizontalOffset = HorizontalOffset;
+            }
+            _totalHorizontalOffset = Math.Min(Math.Max(0, _totalHorizontalOffset - e.Delta), ScrollableWidth);
+            ScrollToHorizontalOffsetWithAnimation(_totalHorizontalOffset);
+        }
+    }
+
+    internal void ScrollToTopInternal(double milliseconds = 500)
+    {
+        if (!_isRunning)
+        {
+            _totalVerticalOffset = VerticalOffset;
+            CurrentVerticalOffset = VerticalOffset;
+        }
+        ScrollToVerticalOffsetWithAnimation(0, milliseconds);
+    }
+
+    public void ScrollToVerticalOffsetWithAnimation(double offset, double milliseconds = 500)
+    {
+        var animation = CreateAnimation(offset, milliseconds);
+        animation.EasingFunction = new CubicEase
+        {
+            EasingMode = EasingMode.EaseOut
+        };
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s, e1) =>
+        {
+            CurrentVerticalOffset = offset;
+            _isRunning = false;
+        };
+        _isRunning = true;
+
+        BeginAnimation(CurrentVerticalOffsetProperty, animation, HandoffBehavior.Compose);
+    }
+
+    public void ScrollToHorizontalOffsetWithAnimation(double offset, double milliseconds = 500)
+    {
+        var animation = CreateAnimation(offset, milliseconds);
+        animation.EasingFunction = new CubicEase
+        {
+            EasingMode = EasingMode.EaseOut
+        };
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s, e1) =>
+        {
+            CurrentHorizontalOffset = offset;
+            _isRunning = false;
+        };
+        _isRunning = true;
+
+        BeginAnimation(CurrentHorizontalOffsetProperty, animation, HandoffBehavior.Compose);
+    }
+
+    protected override HitTestResult HitTestCore(PointHitTestParameters hitTestParameters) =>
+        IsPenetrating ? null : base.HitTestCore(hitTestParameters);
+
+    /// <summary>
+    ///     是否支持惯性
+    /// </summary>
+    public static readonly DependencyProperty IsInertiaEnabledProperty = DependencyProperty.RegisterAttached(
+        "IsInertiaEnabled", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    public static void SetIsInertiaEnabled(DependencyObject element, bool value) => element.SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsInertiaEnabled(DependencyObject element) => (bool) element.GetValue(IsInertiaEnabledProperty);
+
+    /// <summary>
+    ///     是否支持惯性
+    /// </summary>
+    public bool IsInertiaEnabled
+    {
+        get => (bool) GetValue(IsInertiaEnabledProperty);
+        set => SetValue(IsInertiaEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     控件是否可以穿透点击
+    /// </summary>
+    public static readonly DependencyProperty IsPenetratingProperty = DependencyProperty.RegisterAttached(
+        "IsPenetrating", typeof(bool), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     控件是否可以穿透点击
+    /// </summary>
+    public bool IsPenetrating
+    {
+        get => (bool) GetValue(IsPenetratingProperty);
+        set => SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static void SetIsPenetrating(DependencyObject element, bool value) => element.SetValue(IsPenetratingProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsPenetrating(DependencyObject element) => (bool) element.GetValue(IsPenetratingProperty);
+
+    /// <summary>
+    ///     当前垂直滚动偏移
+    /// </summary>
+    internal static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
+        "CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
+
+    private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ScrollViewer ctl && e.NewValue is double v)
+        {
+            ctl.ScrollToVerticalOffset(v);
+        }
+    }
+
+    /// <summary>
+    ///     当前垂直滚动偏移
+    /// </summary>
+    internal double CurrentVerticalOffset
+    {
+        // ReSharper disable once UnusedMember.Local
+        get => (double) GetValue(CurrentVerticalOffsetProperty);
+        set => SetValue(CurrentVerticalOffsetProperty, value);
+    }
+
+    /// <summary>
+    ///     当前水平滚动偏移
+    /// </summary>
+    internal static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
+        "CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
+
+    private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ScrollViewer ctl && e.NewValue is double v)
+        {
+            ctl.ScrollToHorizontalOffset(v);
+        }
+    }
+
+    /// <summary>
+    ///     当前水平滚动偏移
+    /// </summary>
+    internal double CurrentHorizontalOffset
+    {
+        get => (double) GetValue(CurrentHorizontalOffsetProperty);
+        set => SetValue(CurrentHorizontalOffsetProperty, value);
+    }
+
+
+    /// <summary>
+    ///     创建一个Double动画
+    /// </summary>
+    /// <param name="toValue"></param>
+    /// <param name="milliseconds"></param>
+    /// <returns></returns>
+    public  DoubleAnimation CreateAnimation(double toValue, double milliseconds = 200)
+    {
+        return new(toValue, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
+        {
+            EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
+        };
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/Control/ScrollViewerAttach.cs b/BPASmartClient.MilkWithTea/Control/ScrollViewerAttach.cs
new file mode 100644
index 00000000..f943614b
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/ScrollViewerAttach.cs
@@ -0,0 +1,111 @@
+using BPASmartClient.MilkWithTea.Data;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+public class ScrollViewerAttach
+{
+    public static readonly DependencyProperty AutoHideProperty = DependencyProperty.RegisterAttached(
+        "AutoHide", typeof(bool), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetAutoHide(DependencyObject element, bool value)
+        => element.SetValue(AutoHideProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetAutoHide(DependencyObject element)
+        => (bool) element.GetValue(AutoHideProperty);
+
+    public static readonly DependencyProperty OrientationProperty = DependencyProperty.RegisterAttached(
+        "Orientation", typeof(Orientation), typeof(ScrollViewerAttach), new FrameworkPropertyMetadata(ValueBoxes.VerticalBox, FrameworkPropertyMetadataOptions.Inherits, OnOrientationChanged));
+
+    private static void OnOrientationChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is ScrollViewer)
+        {
+            return;
+        }
+
+        if (d is System.Windows.Controls.ScrollViewer scrollViewer)
+        {
+            if ((Orientation) e.NewValue == Orientation.Horizontal)
+            {
+                scrollViewer.PreviewMouseWheel += ScrollViewerPreviewMouseWheel;
+            }
+            else
+            {
+                scrollViewer.PreviewMouseWheel -= ScrollViewerPreviewMouseWheel;
+            }
+        }
+
+        void ScrollViewerPreviewMouseWheel(object sender, MouseWheelEventArgs args)
+        {
+            var scrollViewerNative = (System.Windows.Controls.ScrollViewer) sender;
+            scrollViewerNative.ScrollToHorizontalOffset(Math.Min(Math.Max(0, scrollViewerNative.HorizontalOffset - args.Delta), scrollViewerNative.ScrollableWidth));
+
+            args.Handled = true;
+        }
+    }
+
+    public static void SetOrientation(DependencyObject element, Orientation value)
+        => element.SetValue(OrientationProperty, ValueBoxes.OrientationBox(value));
+
+    public static Orientation GetOrientation(DependencyObject element)
+        => (Orientation) element.GetValue(OrientationProperty);
+
+    public static readonly DependencyProperty IsDisabledProperty = DependencyProperty.RegisterAttached(
+        "IsDisabled", typeof(bool), typeof(ScrollViewerAttach), new PropertyMetadata(ValueBoxes.FalseBox, OnIsDisabledChanged));
+
+    private static void OnIsDisabledChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is UIElement element)
+        {
+            if ((bool) e.NewValue)
+            {
+                element.PreviewMouseWheel += ScrollViewerPreviewMouseWheel;
+            }
+            else
+            {
+                element.PreviewMouseWheel -= ScrollViewerPreviewMouseWheel;
+            }
+        }
+
+        void ScrollViewerPreviewMouseWheel(object sender, MouseWheelEventArgs args)
+        {
+            if (args.Handled)
+            {
+                return;
+            }
+
+            args.Handled = true;
+
+            if (GetParent<System.Windows.Controls.ScrollViewer>((UIElement) sender) is { } scrollViewer)
+            {
+                scrollViewer.RaiseEvent(new MouseWheelEventArgs(args.MouseDevice, args.Timestamp, args.Delta)
+                {
+                    RoutedEvent = UIElement.MouseWheelEvent,
+                    Source = sender
+                });
+            }
+        }
+
+       static T GetParent<T>(DependencyObject d) where T : DependencyObject =>
+       d switch
+       {
+           null => default,
+           T t => t,
+           Window _ => null,
+           _ => GetParent<T>(VisualTreeHelper.GetParent(d))
+       };
+    }
+
+    public static void SetIsDisabled(DependencyObject element, bool value)
+        => element.SetValue(IsDisabledProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetIsDisabled(DependencyObject element)
+        => (bool) element.GetValue(IsDisabledProperty);
+
+   
+}
diff --git a/BPASmartClient.MilkWithTea/Control/TabControl.cs b/BPASmartClient.MilkWithTea/Control/TabControl.cs
new file mode 100644
index 00000000..342f4127
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/TabControl.cs
@@ -0,0 +1,426 @@
+using BPASmartClient.MilkWithTea.Data;
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+[TemplatePart(Name = HeaderPanelKey, Type = typeof(TabPanel))]
+[TemplatePart(Name = OverflowScrollviewer, Type = typeof(ScrollViewer))]
+[TemplatePart(Name = ScrollButtonLeft, Type = typeof(ButtonBase))]
+[TemplatePart(Name = ScrollButtonRight, Type = typeof(ButtonBase))]
+[TemplatePart(Name = HeaderBorder, Type = typeof(Border))]
+public class TabControl : System.Windows.Controls.TabControl
+{
+    private const string OverflowButtonKey = "PART_OverflowButton";
+
+    private const string HeaderPanelKey = "PART_HeaderPanel";
+
+    private const string OverflowScrollviewer = "PART_OverflowScrollviewer";
+
+    private const string ScrollButtonLeft = "PART_ScrollButtonLeft";
+
+    private const string ScrollButtonRight = "PART_ScrollButtonRight";
+
+    private const string HeaderBorder = "PART_HeaderBorder";
+
+    private ContextMenuToggleButton _buttonOverflow;
+
+    internal TabPanel HeaderPanel { get; private set; }
+
+    private ScrollViewer _scrollViewerOverflow;
+
+    private ButtonBase _buttonScrollLeft;
+
+    private ButtonBase _buttonScrollRight;
+
+    private Border _headerBorder;
+
+    /// <summary>
+    ///     是否为内部操作
+    /// </summary>
+    internal bool IsInternalAction;
+
+    /// <summary>
+    ///     是否启用动画
+    /// </summary>
+    public static readonly DependencyProperty IsAnimationEnabledProperty = DependencyProperty.Register(
+        "IsAnimationEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否启用动画
+    /// </summary>
+    public bool IsAnimationEnabled
+    {
+        get => (bool) GetValue(IsAnimationEnabledProperty);
+        set => SetValue(IsAnimationEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否可以拖动
+    /// </summary>
+    public static readonly DependencyProperty IsDraggableProperty = DependencyProperty.Register(
+        "IsDraggable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否可以拖动
+    /// </summary>
+    public bool IsDraggable
+    {
+        get => (bool) GetValue(IsDraggableProperty);
+        set => SetValue(IsDraggableProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowCloseButtonProperty = DependencyProperty.RegisterAttached(
+        "ShowCloseButton", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetShowCloseButton(DependencyObject element, bool value)
+        => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowCloseButton(DependencyObject element)
+        => (bool) element.GetValue(ShowCloseButtonProperty);
+
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public static readonly DependencyProperty ShowContextMenuProperty = DependencyProperty.RegisterAttached(
+        "ShowContextMenu", typeof(bool), typeof(TabControl), new FrameworkPropertyMetadata(ValueBoxes.TrueBox, FrameworkPropertyMetadataOptions.Inherits));
+
+    public static void SetShowContextMenu(DependencyObject element, bool value)
+        => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowContextMenu(DependencyObject element)
+        => (bool) element.GetValue(ShowContextMenuProperty);
+
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public bool ShowContextMenu
+    {
+        get => (bool) GetValue(ShowContextMenuProperty);
+        set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+        "IsTabFillEnabled", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public bool IsTabFillEnabled
+    {
+        get => (bool) GetValue(IsTabFillEnabledProperty);
+        set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
+        "TabItemWidth", typeof(double), typeof(TabControl), new PropertyMetadata(200.0));
+
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public double TabItemWidth
+    {
+        get => (double) GetValue(TabItemWidthProperty);
+        set => SetValue(TabItemWidthProperty, value);
+    }
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
+        "TabItemHeight", typeof(double), typeof(TabControl), new PropertyMetadata(30.0));
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public double TabItemHeight
+    {
+        get => (double) GetValue(TabItemHeightProperty);
+        set => SetValue(TabItemHeightProperty, value);
+    }
+
+    /// <summary>
+    ///     是否可以滚动
+    /// </summary>
+    public static readonly DependencyProperty IsScrollableProperty = DependencyProperty.Register(
+        "IsScrollable", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否可以滚动
+    /// </summary>
+    public bool IsScrollable
+    {
+        get => (bool) GetValue(IsScrollableProperty);
+        set => SetValue(IsScrollableProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示溢出按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowOverflowButtonProperty = DependencyProperty.Register(
+        "ShowOverflowButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.TrueBox));
+
+    /// <summary>
+    ///     是否显示溢出按钮
+    /// </summary>
+    public bool ShowOverflowButton
+    {
+        get => (bool) GetValue(ShowOverflowButtonProperty);
+        set => SetValue(ShowOverflowButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     是否显示滚动按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowScrollButtonProperty = DependencyProperty.Register(
+        "ShowScrollButton", typeof(bool), typeof(TabControl), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否显示滚动按钮
+    /// </summary>
+    public bool ShowScrollButton
+    {
+        get => (bool) GetValue(ShowScrollButtonProperty);
+        set => SetValue(ShowScrollButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     可见的标签数量
+    /// </summary>
+    private int _itemShowCount;
+
+    protected override void OnItemsChanged(NotifyCollectionChangedEventArgs e)
+    {
+        base.OnItemsChanged(e);
+
+        if (HeaderPanel == null)
+        {
+            IsInternalAction = false;
+            return;
+        }
+
+        UpdateOverflowButton();
+
+        if (IsInternalAction)
+        {
+            IsInternalAction = false;
+            return;
+        }
+
+        if (e.Action == NotifyCollectionChangedAction.Add)
+        {
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) return;
+                item.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                item.TabPanel = HeaderPanel;
+            }
+        }
+
+        _headerBorder?.InvalidateMeasure();
+        IsInternalAction = false;
+    }
+
+    public override void OnApplyTemplate()
+    {
+        if (_buttonOverflow != null)
+        {
+            if (_buttonOverflow.Menu != null)
+            {
+                _buttonOverflow.Menu.Closed -= Menu_Closed;
+                _buttonOverflow.Menu = null;
+            }
+
+            _buttonOverflow.Click -= ButtonOverflow_Click;
+        }
+
+        if (_buttonScrollLeft != null) _buttonScrollLeft.Click -= ButtonScrollLeft_Click;
+        if (_buttonScrollRight != null) _buttonScrollRight.Click -= ButtonScrollRight_Click;
+
+        base.OnApplyTemplate();
+        HeaderPanel = GetTemplateChild(HeaderPanelKey) as TabPanel;
+
+        if (IsTabFillEnabled) return;
+
+        _buttonOverflow = GetTemplateChild(OverflowButtonKey) as ContextMenuToggleButton;
+        _scrollViewerOverflow = GetTemplateChild(OverflowScrollviewer) as ScrollViewer;
+        _buttonScrollLeft = GetTemplateChild(ScrollButtonLeft) as ButtonBase;
+        _buttonScrollRight = GetTemplateChild(ScrollButtonRight) as ButtonBase;
+        _headerBorder = GetTemplateChild(HeaderBorder) as Border;
+
+        if (_buttonScrollLeft != null) _buttonScrollLeft.Click += ButtonScrollLeft_Click;
+        if (_buttonScrollRight != null) _buttonScrollRight.Click += ButtonScrollRight_Click;
+
+        if (_buttonOverflow != null)
+        {
+            var menu = new ContextMenu
+            {
+                Placement = PlacementMode.Bottom,
+                PlacementTarget = _buttonOverflow
+            };
+            menu.Closed += Menu_Closed;
+            _buttonOverflow.Menu = menu;
+            _buttonOverflow.Click += ButtonOverflow_Click;
+        }
+    }
+
+    protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+    {
+        base.OnRenderSizeChanged(sizeInfo);
+        UpdateOverflowButton();
+    }
+
+    private void UpdateOverflowButton()
+    {
+        if (!IsTabFillEnabled)
+        {
+            _itemShowCount = (int) (ActualWidth / TabItemWidth);
+            //_buttonOverflow?.Show(ShowOverflowButton && Items.Count > 0 && Items.Count >= _itemShowCount);
+        }
+    }
+
+    private void Menu_Closed(object sender, RoutedEventArgs e) => _buttonOverflow.IsChecked = false;
+
+    private void ButtonScrollRight_Click(object sender, RoutedEventArgs e) =>
+        _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Min(
+            _scrollViewerOverflow.CurrentHorizontalOffset + TabItemWidth, _scrollViewerOverflow.ScrollableWidth));
+
+    private void ButtonScrollLeft_Click(object sender, RoutedEventArgs e) =>
+        _scrollViewerOverflow.ScrollToHorizontalOffsetWithAnimation(Math.Max(
+            _scrollViewerOverflow.CurrentHorizontalOffset - TabItemWidth, 0));
+
+    private void ButtonOverflow_Click(object sender, RoutedEventArgs e)
+    {
+        if (_buttonOverflow.IsChecked == true)
+        {
+            _buttonOverflow.Menu.Items.Clear();
+            for (var i = 0; i < Items.Count; i++)
+            {
+                if (ItemContainerGenerator.ContainerFromIndex(i) is not TabItem item) continue;
+
+                var menuItem = new MenuItem
+                {
+                    HeaderStringFormat = ItemStringFormat,
+                    HeaderTemplate = ItemTemplate,
+                    HeaderTemplateSelector = ItemTemplateSelector,
+                    Header = item.Header,
+                    Width = TabItemWidth,
+                    IsChecked = item.IsSelected,
+                    IsCheckable = true,
+                    IsEnabled = item.IsEnabled
+                };
+
+                menuItem.Click += delegate
+                {
+                    _buttonOverflow.IsChecked = false;
+
+                    var list = GetActualList();
+                    if (list == null) return;
+
+                    var actualItem = ItemContainerGenerator.ItemFromContainer(item);
+                    if (actualItem == null) return;
+
+                    var index = list.IndexOf(actualItem);
+                    if (index >= _itemShowCount)
+                    {
+                        list.Remove(actualItem);
+                        list.Insert(0, actualItem);
+                        HeaderPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey,
+                            IsAnimationEnabled
+                                ? new Duration(TimeSpan.FromMilliseconds(200))
+                                : new Duration(TimeSpan.FromMilliseconds(0)));
+                        HeaderPanel.ForceUpdate = true;
+                        HeaderPanel.Measure(new Size(HeaderPanel.DesiredSize.Width, ActualHeight));
+                        HeaderPanel.ForceUpdate = false;
+                        SetCurrentValue(SelectedIndexProperty, ValueBoxes.Int0Box);
+                    }
+
+                    item.IsSelected = true;
+                };
+                _buttonOverflow.Menu.Items.Add(menuItem);
+            }
+        }
+    }
+
+    internal double GetHorizontalOffset() => _scrollViewerOverflow?.CurrentHorizontalOffset ?? 0;
+
+    internal void UpdateScroll() => _scrollViewerOverflow?.RaiseEvent(new MouseWheelEventArgs(Mouse.PrimaryDevice, Environment.TickCount, 0)
+    {
+        RoutedEvent = MouseWheelEvent
+    });
+
+    internal void CloseAllItems() => CloseOtherItems(null);
+
+    internal void CloseOtherItems(TabItem currentItem)
+    {
+        var actualItem = currentItem != null ? ItemContainerGenerator.ItemFromContainer(currentItem) : null;
+
+        var list = GetActualList();
+        if (list == null) return;
+
+        IsInternalAction = true;
+
+        for (var i = 0; i < Items.Count; i++)
+        {
+            var item = list[i];
+            if (!Equals(item, actualItem) && item != null)
+            {
+                var argsClosing = new CancelRoutedEventArgs(TabItem.ClosingEvent, item);
+
+                if (ItemContainerGenerator.ContainerFromItem(item) is not TabItem tabItem) continue;
+
+                tabItem.RaiseEvent(argsClosing);
+                if (argsClosing.Cancel) return;
+
+                tabItem.RaiseEvent(new RoutedEventArgs(TabItem.ClosedEvent, item));
+                list.Remove(item);
+
+                i--;
+            }
+        }
+
+        SetCurrentValue(SelectedIndexProperty, Items.Count == 0 ? -1 : 0);
+    }
+
+    internal IList GetActualList()
+    {
+        IList list;
+        if (ItemsSource != null)
+        {
+            list = ItemsSource as IList;
+        }
+        else
+        {
+            list = Items;
+        }
+
+        return list;
+    }
+
+    protected override bool IsItemItsOwnContainerOverride(object item) => item is TabItem;
+
+    protected override DependencyObject GetContainerForItemOverride() => new TabItem();
+}
diff --git a/BPASmartClient.MilkWithTea/Control/TabItem.cs b/BPASmartClient.MilkWithTea/Control/TabItem.cs
new file mode 100644
index 00000000..d911285e
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/TabItem.cs
@@ -0,0 +1,509 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using BPASmartClient.MilkWithTea.Control;
+using BPASmartClient.MilkWithTea.Data;
+using TabControl = BPASmartClient.MilkWithTea.Control.TabControl;
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+public class TabItem : System.Windows.Controls.TabItem
+{
+    /// <summary>
+    ///     动画速度
+    /// </summary>
+    private const int AnimationSpeed = 150;
+
+    /// <summary>
+    ///     选项卡是否处于拖动状态
+    /// </summary>
+    private static bool ItemIsDragging;
+
+    /// <summary>
+    ///     选项卡是否等待被拖动
+    /// </summary>
+    private bool _isWaiting;
+
+    /// <summary>
+    ///     拖动中的选项卡坐标
+    /// </summary>
+    private Point _dragPoint;
+
+    /// <summary>
+    ///     鼠标按下时选项卡位置
+    /// </summary>
+    private int _mouseDownIndex;
+
+    /// <summary>
+    ///     鼠标按下时选项卡横向偏移
+    /// </summary>
+    private double _mouseDownOffsetX;
+
+    /// <summary>
+    ///     鼠标按下时的坐标
+    /// </summary>
+    private Point _mouseDownPoint;
+
+    /// <summary>
+    ///     右侧可移动的最大值
+    /// </summary>
+    private double _maxMoveRight;
+
+    /// <summary>
+    ///     左侧可移动的最大值
+    /// </summary>
+    private double _maxMoveLeft;
+
+    /// <summary>
+    ///     选项卡宽度
+    /// </summary>
+    public double ItemWidth { get; internal set; }
+
+    /// <summary>
+    ///     选项卡拖动等待距离（在鼠标移动了超过20个像素无关单位后，选项卡才开始被拖动）
+    /// </summary>
+    private const double WaitLength = 20;
+
+    /// <summary>
+    ///     选项卡是否处于拖动状态
+    /// </summary>
+    private bool _isDragging;
+
+    /// <summary>
+    ///     选项卡是否已经被拖动
+    /// </summary>
+    private bool _isDragged;
+
+    /// <summary>
+    ///     目标横向位移
+    /// </summary>
+    internal double TargetOffsetX { get; set; }
+
+    /// <summary>
+    ///     当前编号
+    /// </summary>
+    private int _currentIndex;
+
+    /// <summary>
+    ///     标签容器横向滚动距离
+    /// </summary>
+    private double _scrollHorizontalOffset;
+
+
+    private TabPanel _tabPanel;
+
+
+    /// <summary>
+    ///     标签容器
+    /// </summary>
+    internal TabPanel TabPanel
+    {
+        get
+        {
+            if (_tabPanel == null && TabControlParent != null)
+            {
+                _tabPanel = TabControlParent.HeaderPanel;
+            }
+
+            return _tabPanel;
+        }
+        set => _tabPanel = value;
+    }
+
+    private TabControl TabControlParent => ItemsControl.ItemsControlFromItemContainer(this) as TabControl;
+
+
+    /// <summary>
+    ///     当前编号
+    /// </summary>
+    internal int CurrentIndex
+    {
+        get => _currentIndex;
+        set
+        {
+            if (_currentIndex == value || value < 0) return;
+            var oldIndex = _currentIndex;
+            _currentIndex = value;
+            UpdateItemOffsetX(oldIndex);
+        }
+    }
+
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public static readonly DependencyProperty ShowCloseButtonProperty =
+        TabControl.ShowCloseButtonProperty.AddOwner(typeof(TabItem));
+
+    /// <summary>
+    ///     是否显示关闭按钮
+    /// </summary>
+    public bool ShowCloseButton
+    {
+        get => (bool) GetValue(ShowCloseButtonProperty);
+        set => SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static void SetShowCloseButton(DependencyObject element, bool value)
+        => element.SetValue(ShowCloseButtonProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowCloseButton(DependencyObject element)
+        => (bool) element.GetValue(ShowCloseButtonProperty);
+
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public static readonly DependencyProperty ShowContextMenuProperty =
+        TabControl.ShowContextMenuProperty.AddOwner(typeof(TabItem), new FrameworkPropertyMetadata(OnShowContextMenuChanged));
+
+    private static void OnShowContextMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TabItem) d;
+        if (ctl.Menu != null)
+        {
+            var show = (bool) e.NewValue;
+            ctl.Menu.IsEnabled = show;
+            //ctl.Menu.Show(show);
+        }
+    }
+
+    /// <summary>
+    ///     是否显示上下文菜单
+    /// </summary>
+    public bool ShowContextMenu
+    {
+        get => (bool) GetValue(ShowContextMenuProperty);
+        set => SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    public static void SetShowContextMenu(DependencyObject element, bool value)
+        => element.SetValue(ShowContextMenuProperty, ValueBoxes.BooleanBox(value));
+
+    public static bool GetShowContextMenu(DependencyObject element)
+        => (bool) element.GetValue(ShowContextMenuProperty);
+
+    public static readonly DependencyProperty MenuProperty = DependencyProperty.Register(
+        "Menu", typeof(ContextMenu), typeof(TabItem), new PropertyMetadata(default(ContextMenu), OnMenuChanged));
+
+    private static void OnMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var ctl = (TabItem) d;
+        //ctl.OnMenuChanged(e.NewValue as ContextMenu);
+    }
+
+    //private void OnMenuChanged(ContextMenu menu)
+    //{
+    //    if (IsLoaded && menu != null)
+    //    {
+    //        var parent = TabControlParent;
+    //        if (parent == null) return;
+
+    //        var item = parent.ItemContainerGenerator.ItemFromContainer(this);
+
+    //        menu.DataContext = item;
+    //        menu.SetBinding(IsEnabledProperty, new Binding(ShowContextMenuProperty.Name)
+    //        {
+    //            Source = this
+    //        });
+    //        menu.SetBinding(VisibilityProperty, new Binding(ShowContextMenuProperty.Name)
+    //        {
+    //            Source = this,
+    //            Converter = GetResourceInternal<IValueConverter>(ResourceToken.Boolean2VisibilityConverter)
+    //        });
+    //    }
+    //}
+
+  
+
+    public ContextMenu Menu
+    {
+        get => (ContextMenu) GetValue(MenuProperty);
+        set => SetValue(MenuProperty, value);
+    }
+
+    /// <summary>
+    ///     更新选项卡横向偏移
+    /// </summary>
+    /// <param name="oldIndex"></param>
+    private void UpdateItemOffsetX(int oldIndex)
+    {
+        if (!_isDragging || CurrentIndex >= TabPanel.ItemDic.Count)
+        {
+            return;
+        }
+
+        var moveItem = TabPanel.ItemDic[CurrentIndex];
+        moveItem.CurrentIndex -= CurrentIndex - oldIndex;
+        var offsetX = moveItem.TargetOffsetX;
+        var resultX = offsetX + (oldIndex - CurrentIndex) * ItemWidth;
+        TabPanel.ItemDic[CurrentIndex] = this;
+        TabPanel.ItemDic[moveItem.CurrentIndex] = moveItem;
+        moveItem.CreateAnimation(offsetX, resultX);
+    }
+
+    public TabItem()
+    {
+        //CommandBindings.Add(new CommandBinding(ControlCommands.Close, (s, e) => Close()));
+        //CommandBindings.Add(new CommandBinding(ControlCommands.CloseAll,
+        //    (s, e) => { TabControlParent.CloseAllItems(); }));
+        //CommandBindings.Add(new CommandBinding(ControlCommands.CloseOther,
+        //    (s, e) => { TabControlParent.CloseOtherItems(this); }));
+
+        //Loaded += (s, e) => OnMenuChanged(Menu);
+    }
+
+   
+    protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseRightButtonDown(e);
+
+        if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
+        IsSelected = true;
+        Focus();
+    }
+
+    protected override void OnHeaderChanged(object oldHeader, object newHeader)
+    {
+        base.OnHeaderChanged(oldHeader, newHeader);
+
+        if (TabPanel != null)
+        {
+            TabPanel.ForceUpdate = true;
+            InvalidateMeasure();
+            TabPanel.ForceUpdate = true;
+        }
+    }
+
+    internal void Close()
+    {
+        var parent = TabControlParent;
+        if (parent == null) return;
+
+        var item = parent.ItemContainerGenerator.ItemFromContainer(this);
+
+        var argsClosing = new CancelRoutedEventArgs(ClosingEvent, item);
+        RaiseEvent(argsClosing);
+        if (argsClosing.Cancel) return;
+
+        TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, parent.IsAnimationEnabled
+            ? new Duration(TimeSpan.FromMilliseconds(200))
+            : new Duration(TimeSpan.FromMilliseconds(1)));
+
+        parent.IsInternalAction = true;
+        RaiseEvent(new RoutedEventArgs(ClosedEvent, item));
+
+        var list = parent.GetActualList();
+        list?.Remove(item);
+    }
+
+    protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonDown(e);
+
+        if (VisualTreeHelper.HitTest(this, e.GetPosition(this)) == null) return;
+        var parent = TabControlParent;
+        if (parent == null) return;
+
+        if (parent.IsDraggable && !ItemIsDragging && !_isDragging)
+        {
+            parent.UpdateScroll();
+            TabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromSeconds(0)));
+            _mouseDownOffsetX = RenderTransform.Value.OffsetX;
+            _scrollHorizontalOffset = parent.GetHorizontalOffset();
+            var mx = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            _mouseDownIndex = CalLocationIndex(mx);
+            var subIndex = _mouseDownIndex - CalLocationIndex(_scrollHorizontalOffset);
+            _maxMoveLeft = -subIndex * ItemWidth;
+            _maxMoveRight = parent.ActualWidth - ActualWidth + _maxMoveLeft;
+
+            _isDragging = true;
+            ItemIsDragging = true;
+            _isWaiting = true;
+            _dragPoint = e.GetPosition(parent);
+            _dragPoint = new Point(_dragPoint.X + _scrollHorizontalOffset, _dragPoint.Y);
+            _mouseDownPoint = _dragPoint;
+            CaptureMouse();
+        }
+    }
+
+    protected override void OnMouseMove(MouseEventArgs e)
+    {
+        base.OnMouseMove(e);
+
+        if (ItemIsDragging && _isDragging)
+        {
+            var parent = TabControlParent;
+            if (parent == null) return;
+
+            var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            CurrentIndex = CalLocationIndex(subX);
+
+            var p = e.GetPosition(parent);
+            p = new Point(p.X + _scrollHorizontalOffset, p.Y);
+
+            var subLeft = p.X - _dragPoint.X;
+            var totalLeft = p.X - _mouseDownPoint.X;
+
+            if (Math.Abs(subLeft) <= WaitLength && _isWaiting) return;
+
+            _isWaiting = false;
+            _isDragged = true;
+
+            var left = subLeft + RenderTransform.Value.OffsetX;
+            if (totalLeft < _maxMoveLeft)
+            {
+                left = _maxMoveLeft + _mouseDownOffsetX;
+            }
+            else if (totalLeft > _maxMoveRight)
+            {
+                left = _maxMoveRight + _mouseDownOffsetX;
+            }
+
+            var t = new TranslateTransform(left, 0);
+            RenderTransform = t;
+            _dragPoint = p;
+        }
+    }
+
+    protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    {
+        base.OnMouseLeftButtonUp(e);
+
+        ReleaseMouseCapture();
+
+        if (_isDragged)
+        {
+            var parent = TabControlParent;
+            if (parent == null) return;
+
+            var subX = TranslatePoint(new Point(), parent).X + _scrollHorizontalOffset;
+            var index = CalLocationIndex(subX);
+            var left = index * ItemWidth;
+            var offsetX = RenderTransform.Value.OffsetX;
+            CreateAnimation(offsetX, offsetX - subX + left, index);
+        }
+
+        _isDragging = false;
+        ItemIsDragging = false;
+        _isDragged = false;
+    }
+
+    protected override void OnMouseDown(MouseButtonEventArgs e)
+    {
+        if (e.ChangedButton == MouseButton.Middle && e.ButtonState == MouseButtonState.Pressed)
+        {
+            if (ShowCloseButton || ShowContextMenu)
+            {
+                Close();
+            }
+        }
+    }
+
+    /// <summary>
+    ///     创建动画
+    /// </summary>
+    internal void CreateAnimation(double offsetX, double resultX, int index = -1)
+    {
+        var parent = TabControlParent;
+
+        void AnimationCompleted()
+        {
+            RenderTransform = new TranslateTransform(resultX, 0);
+            if (index == -1) return;
+
+            var list = parent.GetActualList();
+            if (list == null) return;
+
+            var item = parent.ItemContainerGenerator.ItemFromContainer(this);
+            if (item == null) return;
+
+            TabPanel.CanUpdate = false;
+            parent.IsInternalAction = true;
+
+            list.Remove(item);
+            parent.IsInternalAction = true;
+            list.Insert(index, item);
+            _tabPanel.SetValue(TabPanel.FluidMoveDurationPropertyKey, new Duration(TimeSpan.FromMilliseconds(0)));
+            TabPanel.CanUpdate = true;
+            TabPanel.ForceUpdate = true;
+            TabPanel.Measure(new Size(TabPanel.DesiredSize.Width, ActualHeight));
+            TabPanel.ForceUpdate = false;
+
+            Focus();
+            IsSelected = true;
+
+            if (!IsMouseCaptured)
+            {
+                parent.SetCurrentValue(Selector.SelectedIndexProperty, _currentIndex);
+            }
+        }
+
+        TargetOffsetX = resultX;
+        if (!parent.IsAnimationEnabled)
+        {
+            AnimationCompleted();
+            return;
+        }
+
+        var animation = CreateAnimation(resultX, AnimationSpeed);
+        animation.FillBehavior = FillBehavior.Stop;
+        animation.Completed += (s1, e1) => AnimationCompleted();
+        var f = new TranslateTransform(offsetX, 0);
+        RenderTransform = f;
+        f.BeginAnimation(TranslateTransform.XProperty, animation, HandoffBehavior.Compose);
+    }
+    /// <summary>
+    ///     创建一个Double动画
+    /// </summary>
+    /// <param name="toValue"></param>
+    /// <param name="milliseconds"></param>
+    /// <returns></returns>
+    public static DoubleAnimation CreateAnimation(double toValue, double milliseconds = 200)
+    {
+        return new(toValue, new Duration(TimeSpan.FromMilliseconds(milliseconds)))
+        {
+            EasingFunction = new PowerEase { EasingMode = EasingMode.EaseInOut }
+        };
+    }
+
+
+    /// <summary>
+    ///     计算选项卡当前合适的位置编号
+    /// </summary>
+    /// <param name="left"></param>
+    /// <returns></returns>
+    private int CalLocationIndex(double left)
+    {
+        if (_isWaiting)
+        {
+            return CurrentIndex;
+        }
+
+        var maxIndex = TabControlParent.Items.Count - 1;
+        var div = (int) (left / ItemWidth);
+        var rest = left % ItemWidth;
+        var result = rest / ItemWidth > .5 ? div + 1 : div;
+
+        return result > maxIndex ? maxIndex : result;
+    }
+
+    public static readonly RoutedEvent ClosingEvent = EventManager.RegisterRoutedEvent("Closing", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
+
+    public event EventHandler Closing
+    {
+        add => AddHandler(ClosingEvent, value);
+        remove => RemoveHandler(ClosingEvent, value);
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TabItem));
+
+    public event EventHandler Closed
+    {
+        add => AddHandler(ClosedEvent, value);
+        remove => RemoveHandler(ClosedEvent, value);
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/Control/TabPanel.cs b/BPASmartClient.MilkWithTea/Control/TabPanel.cs
new file mode 100644
index 00000000..82efc317
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Control/TabPanel.cs
@@ -0,0 +1,200 @@
+using BPASmartClient.MilkWithTea.Data;
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+
+namespace BPASmartClient.MilkWithTea.Control;
+
+public class TabPanel : Panel
+{
+    private int _itemCount;
+
+    /// <summary>
+    ///     是否可以更新
+    /// </summary>
+    internal bool CanUpdate = true;
+
+    /// <summary>
+    ///     选项卡字典
+    /// </summary>
+    internal Dictionary<int, TabItem> ItemDic = new();
+
+    public static readonly DependencyPropertyKey FluidMoveDurationPropertyKey =
+        DependencyProperty.RegisterReadOnly("FluidMoveDuration", typeof(Duration), typeof(TabPanel),
+            new PropertyMetadata(new Duration(TimeSpan.FromMilliseconds(0))));
+
+    /// <summary>
+    ///     流式行为持续时间
+    /// </summary>
+    public static readonly DependencyProperty FluidMoveDurationProperty =
+        FluidMoveDurationPropertyKey.DependencyProperty;
+
+    /// <summary>
+    ///     流式行为持续时间
+    /// </summary>
+    public Duration FluidMoveDuration
+    {
+        get => (Duration) GetValue(FluidMoveDurationProperty);
+        set => SetValue(FluidMoveDurationProperty, value);
+    }
+
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public static readonly DependencyProperty IsTabFillEnabledProperty = DependencyProperty.Register(
+        "IsTabFillEnabled", typeof(bool), typeof(TabPanel), new PropertyMetadata(ValueBoxes.FalseBox));
+
+    /// <summary>
+    ///     是否将标签填充
+    /// </summary>
+    public bool IsTabFillEnabled
+    {
+        get => (bool) GetValue(IsTabFillEnabledProperty);
+        set => SetValue(IsTabFillEnabledProperty, ValueBoxes.BooleanBox(value));
+    }
+
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public static readonly DependencyProperty TabItemWidthProperty = DependencyProperty.Register(
+        "TabItemWidth", typeof(double), typeof(TabPanel), new PropertyMetadata(200.0));
+
+    /// <summary>
+    ///     标签宽度
+    /// </summary>
+    public double TabItemWidth
+    {
+        get => (double) GetValue(TabItemWidthProperty);
+        set => SetValue(TabItemWidthProperty, value);
+    }
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public static readonly DependencyProperty TabItemHeightProperty = DependencyProperty.Register(
+        "TabItemHeight", typeof(double), typeof(TabPanel), new PropertyMetadata(30.0));
+
+    /// <summary>
+    ///     标签高度
+    /// </summary>
+    public double TabItemHeight
+    {
+        get => (double) GetValue(TabItemHeightProperty);
+        set => SetValue(TabItemHeightProperty, value);
+    }
+
+    /// <summary>
+    ///     是否可以强制更新
+    /// </summary>
+    internal bool ForceUpdate;
+
+    private Size _oldSize;
+
+    /// <summary>
+    ///     是否已经加载
+    /// </summary>
+    private bool _isLoaded;
+
+    protected override Size MeasureOverride(Size constraint)
+    {
+        if ((_itemCount == InternalChildren.Count || !CanUpdate) && !ForceUpdate && !IsTabFillEnabled) return _oldSize;
+        constraint.Height = TabItemHeight;
+        _itemCount = InternalChildren.Count;
+
+        var size = new Size();
+
+        ItemDic.Clear();
+
+        var count = InternalChildren.Count;
+        if (count == 0)
+        {
+            _oldSize = new Size();
+            return _oldSize;
+        }
+        constraint.Width += InternalChildren.Count;
+
+        var itemWidth = .0;
+        var arr = new int[count];
+
+        if (!IsTabFillEnabled)
+        {
+            itemWidth = TabItemWidth;
+        }
+        else
+        {
+            if (TemplatedParent is TabControl tabControl)
+            {
+                arr = DivideInt2Arr((int) tabControl.ActualWidth + InternalChildren.Count, count);
+            }
+        }
+
+        for (var index = 0; index < count; index++)
+        {
+            if (IsTabFillEnabled)
+            {
+                itemWidth = arr[index];
+            }
+            if (InternalChildren[index] is TabItem tabItem)
+            {
+                tabItem.RenderTransform = new TranslateTransform();
+                tabItem.MaxWidth = itemWidth;
+                var rect = new Rect
+                {
+                    X = size.Width - tabItem.BorderThickness.Left,
+                    Width = itemWidth,
+                    Height = TabItemHeight
+                };
+                tabItem.Arrange(rect);
+                tabItem.ItemWidth = itemWidth - tabItem.BorderThickness.Left;
+                tabItem.CurrentIndex = index;
+                tabItem.TargetOffsetX = 0;
+                ItemDic[index] = tabItem;
+                size.Width += tabItem.ItemWidth;
+            }
+        }
+        size.Height = constraint.Height;
+        _oldSize = size;
+        return _oldSize;
+    }
+
+    /// <summary>
+    ///     平分一个整数到一个数组中
+    /// </summary>
+    /// <param name="num"></param>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    public static int[] DivideInt2Arr(int num, int count)
+    {
+        var arr = new int[count];
+        var div = num / count;
+        var rest = num % count;
+        for (var i = 0; i < count; i++)
+        {
+            arr[i] = div;
+        }
+        for (var i = 0; i < rest; i++)
+        {
+            arr[i] += 1;
+        }
+        return arr;
+    }
+
+    public TabPanel()
+    {
+        Loaded += (s, e) =>
+        {
+            if (_isLoaded) return;
+            ForceUpdate = true;
+            Measure(new Size(DesiredSize.Width, ActualHeight));
+            ForceUpdate = false;
+            foreach (var item in ItemDic.Values)
+            {
+                item.TabPanel = this;
+            }
+            _isLoaded = true;
+        };
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/Data/CancelRoutedEventArgs.cs b/BPASmartClient.MilkWithTea/Data/CancelRoutedEventArgs.cs
new file mode 100644
index 00000000..b5a10ba4
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Data/CancelRoutedEventArgs.cs
@@ -0,0 +1,12 @@
+using System.Windows;
+
+namespace BPASmartClient.MilkWithTea.Data;
+
+public class CancelRoutedEventArgs : RoutedEventArgs
+{
+    public CancelRoutedEventArgs(RoutedEvent routedEvent, object source) : base(routedEvent, source)
+    {
+    }
+
+    public bool Cancel { get; set; }
+}
diff --git a/BPASmartClient.MilkWithTea/Data/ValueBoxes.cs b/BPASmartClient.MilkWithTea/Data/ValueBoxes.cs
new file mode 100644
index 00000000..84495fab
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Data/ValueBoxes.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace BPASmartClient.MilkWithTea.Data;
+
+/// <summary>
+///     装箱后的值类型（用于提高效率）
+/// </summary>
+internal static class ValueBoxes
+{
+    internal static object TrueBox = true;
+
+    internal static object FalseBox = false;
+
+    internal static object VerticalBox = Orientation.Vertical;
+
+    internal static object HorizontalBox = Orientation.Horizontal;
+
+    internal static object VisibleBox = Visibility.Visible;
+
+    internal static object CollapsedBox = Visibility.Collapsed;
+
+    internal static object HiddenBox = Visibility.Hidden;
+
+    internal static object Double01Box = .1;
+
+    internal static object Double0Box = .0;
+
+    internal static object Double1Box = 1.0;
+
+    internal static object Double10Box = 10.0;
+
+    internal static object Double20Box = 20.0;
+
+    internal static object Double100Box = 100.0;
+
+    internal static object Double200Box = 200.0;
+
+    internal static object Double300Box = 300.0;
+
+    internal static object DoubleNeg1Box = -1.0;
+
+    internal static object Int0Box = 0;
+
+    internal static object Int1Box = 1;
+
+    internal static object Int2Box = 2;
+
+    internal static object Int5Box = 5;
+
+    internal static object Int99Box = 99;
+
+    internal static object BooleanBox(bool value) => value ? TrueBox : FalseBox;
+
+    internal static object OrientationBox(Orientation value) =>
+        value == Orientation.Horizontal ? HorizontalBox : VerticalBox;
+
+    internal static object VisibilityBox(Visibility value)
+    {
+        return value switch
+        {
+            Visibility.Visible => VisibleBox,
+            Visibility.Hidden => HiddenBox,
+            Visibility.Collapsed => CollapsedBox,
+            _ => throw new ArgumentOutOfRangeException(nameof(value), value, null)
+        };
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/GLobal.cs b/BPASmartClient.MilkWithTea/GLobal.cs
index 386fbb90..a3a2dfe8 100644
--- a/BPASmartClient.MilkWithTea/GLobal.cs
+++ b/BPASmartClient.MilkWithTea/GLobal.cs
@@ -1,5 +1,5 @@
 using BPASmartClient.Model;
-using Model;
+using BPASmartClient.MorkMOC;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -17,46 +17,15 @@ namespace BPASmartClient.MilkWithTea
         public static string recipePath = string.Empty;
         public static string posionPath = string.Empty;
 
-        public static bool makeEnable = false;
-
-        public static ObservableCollection<LocalTeaWithMilkConfig> MaterialRecipes { get; set; } = new ObservableCollection<LocalTeaWithMilkConfig>();
+        public static bool makeEnable = true;
         /// <summary>
-        /// 设备信息列表
+        /// 设备信息集合
         /// </summary>
         public static ObservableCollection<DeviceConfigModelJson> deviceConfig { get; set; } = new ObservableCollection<DeviceConfigModelJson>();
 
 
-        /// <summary>
-        /// 获取Json文件内容,转换成ObservableCollection
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public static ObservableCollection<T> GetJsonToT<T>(string path)
-        {
-            if (!File.Exists(path))
-            {
-                //创建该文件
-                File.Create(path);
-                return default;
-            }
-            else
-            {
-                using (StreamReader recipeReader = new StreamReader(path))//读取json文件
-                {
-                    string datacache = "";
-                    string line;
-                    while ((line = recipeReader.ReadLine()) != null)  //循环将每一行数据拼接为一个完整的字符串
-                    {
-                        datacache = datacache + line;
-                    }
 
-                    var res = JsonConvert.DeserializeObject<ObservableCollection<T>>(datacache);  //将string转换为class类，从而达到json文件转换的目的
-                    if (res != null)
-                        return res;
-                    else return new ObservableCollection<T> { };
-                }
-            }
-        }
+
+
     }
 }
diff --git a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs
index 8d2e064e..9ee91d82 100644
--- a/BPASmartClient.MilkWithTea/MainWindow.xaml.cs
+++ b/BPASmartClient.MilkWithTea/MainWindow.xaml.cs
@@ -7,6 +7,7 @@ using BPASmartClient.IoT;
 using BPASmartClient.Message;
 using BPASmartClient.Peripheral;
 using BPASmartClient.ViewModel;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -36,8 +37,10 @@ namespace BPASmartClient.MilkWithTea
         public MainWindow()
         {
             InitializeComponent();
-
-            Initialize();
+            
+            TextHelper.GetInstance.WriteTextInfo("MOC", "StartShop", "DeviceConfig");
+            CreateDevice();
+            //Initialize();
 
         }
 
@@ -45,6 +48,50 @@ namespace BPASmartClient.MilkWithTea
         DoubleAnimation yd1 = new DoubleAnimation();//实例化浮点动画
         DoubleAnimation yd2 = new DoubleAnimation();
 
+        private void CreateDevice()
+        {
+            DirectoryInfo directoryInfo = new DirectoryInfo(LocaPath.GetInstance().GetDeviceConfigPath);
+            if(!File.Exists($"{directoryInfo}Moc.json"))
+            {
+                File.WriteAllText($"{directoryInfo}Moc.json", JsonConvert.SerializeObject(GLobal.deviceConfig));
+            }
+            string JsonString = File.ReadAllText($"{directoryInfo}MOC.json");
+            var result = JsonConvert.DeserializeObject<ObservableCollection<DeviceConfigModelJson>>(JsonString);
+            if (result != null)
+            {
+                ShopDeviceConfigViewModel.deviceConfig.Clear();
+                foreach (var item in result)
+                {
+                    GLobal.deviceConfig.Add(item);
+                }
+            }
+
+            if(GLobal.deviceConfig.Count <1)
+            {
+                GLobal.deviceConfig.Add(new DeviceConfigModelJson());
+                if(GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.Count <1)
+                {
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.Add(new DeviceModel());
+                    if(GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.Count <1)
+                    {
+                        GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.Add(new CommunicationModel());
+                    }
+                }
+            }
+            if (GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).variables.Count < 1)
+            {
+                for (int i = 0; i < 20; i++)
+                {
+                    GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).variables.Add(new Variable()
+                    {
+                        Id = GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).variables.Count,
+                        Address = string.Empty,
+                        ReadLeng = 0
+                    });
+                }
+                File.WriteAllText($"{LocaPath.GetInstance().GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig));
+            }
+        }
 
         private void Initialize()
         {
diff --git a/BPASmartClient.MilkWithTea/Model/JsonDeviceConfig.cs b/BPASmartClient.MilkWithTea/Model/JsonDeviceConfig.cs
new file mode 100644
index 00000000..8d8efb1c
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Model/JsonDeviceConfig.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MilkWithTea.Model
+{
+    public class JsonDeviceConfig
+    {
+        public ObservableCollection<DeviceConfigModelJson> deviceConfig { get; set; } = new ObservableCollection<DeviceConfigModelJson>();
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/Model/JsonLocalRecipes.cs b/BPASmartClient.MilkWithTea/Model/JsonLocalRecipes.cs
new file mode 100644
index 00000000..e5482a0e
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/Model/JsonLocalRecipes.cs
@@ -0,0 +1,23 @@
+using BPASmartClient.MorkMOC;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MilkWithTea.Model
+{
+    partial class JsonLocalRecipes
+    {
+        /// <summary>
+        /// 本地奶茶配方
+        /// </summary>
+        public ObservableCollection<LocalRecipe> localRecipes { get; set; } = new ObservableCollection<LocalRecipe>();
+        /// <summary>
+        /// 本地原料
+        /// </summary>
+        public ObservableCollection<LocalMaterail> localMaterails { get; set; } = new ObservableCollection<LocalMaterail>();
+
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml b/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml
index 9b6ed672..4bcf9727 100644
--- a/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml
+++ b/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml
@@ -11,48 +11,6 @@
         <vm:LocalConfigureViewModel/>
     </UserControl.DataContext>
     <UserControl.Resources>
-        <Style   TargetType="{x:Type DataGridCell}">
-            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-            <Setter Property="TextBlock.FontSize" Value="13" />
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="ToolTip" Value="{Binding RelativeSource={RelativeSource Mode=Self},Path=Content.Text}" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type DataGridCell}">
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                            <!--HorizontalAlignment 可以设置内容展示位置-->
-                            <ContentPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                          Margin="{TemplateBinding Padding}"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Opacity" Value=".56"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-        <Style  TargetType="DataGridRow">
-            <Setter Property="FontSize" Value="16"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="Margin" Value="0,5"/>
-            <Style.Triggers>
-                <!--  隔行换色  -->
-                <Trigger Property="AlternationIndex" Value="0">
-                    <Setter Property="Background" Value="#FFFAFAFA" />
-                </Trigger>
-                <Trigger Property="AlternationIndex" Value="1">
-                    <Setter Property="Background" Value="#FFF5F5F7" />
-                </Trigger>
-
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Background" Value="#87CEFA" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
         <Style  TargetType="Button">
             <Setter Property="Width" Value="90"/>
             <Setter Property="Height" Value="20"/>
@@ -78,12 +36,47 @@
                 </Setter.Value>
             </Setter>
         </Style>
+
+        <Style TargetType="ListViewItem" >
+            <Setter Property="Margin" Value="60,20"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListViewItem">
+                        <Border Padding="4" x:Name="mborder" BorderBrush="Transparent" BorderThickness="1">
+
+                            <Border >
+                                <Grid Width="250" >
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="auto"/>
+                                        <ColumnDefinition  Width="*"/>
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Text="{Binding MaterialPosition}"  VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10,0"/>
+                                    <TextBox Text="{Binding MaterialName}"  Grid.Column="1" Width="140"
+                                           HorizontalAlignment="Center" VerticalAlignment="Center"></TextBox>
+                                </Grid>
+                            </Border>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger  Property="IsMouseOver" Value="True">
+
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </UserControl.Resources>
     <Grid Background="#F3F6F9" Margin="20">
-        <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible">
-            <StackPanel>
-                <!--奶茶配方录入-->
-            <Expander  Style="{StaticResource ExpanderStyle}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="40"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
+            <Button Content="奶茶配方录入" HorizontalAlignment="Right" VerticalAlignment="Center" Width="150" Click="Button_Click"/>
+            <ScrollViewer VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" Grid.Row="1">
+                <StackPanel>
+                    <!--奶茶配方录入-->
+                    <!--<Expander  Style="{StaticResource ExpanderStyle}">
                 <Expander.Header>
                     <TextBlock Text="奶茶配方录入" />
                 </Expander.Header>
@@ -154,128 +147,74 @@
                         </DataGrid>
                     </Grid>
                 </Expander.Content>
-            </Expander>
-                <!--配料录入-->
-            <Expander Grid.Row="1" Style="{StaticResource ExpanderStyle}">
-                <Expander.Header>
-                    <TextBlock Text="本地配料录入" />
-                </Expander.Header>
-                <Expander.Content>
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="70"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Button Content="保存物料位置名称" Grid.ColumnSpan="2"  Style="{StaticResource buttonNormal}" Height="34" Width="200" Command="{Binding UpdateMaterialPosionCommand}"/>
-                            <DataGrid Grid.Row="1"  Margin="50,5" AutoGenerateColumns="False"  ItemsSource="{Binding materail1,Mode=TwoWay}"
-                                      FrozenColumnCount="1" RowHeight="34" 
-                                      VerticalAlignment="Top" HorizontalAlignment="Right"
-                                      IsReadOnly="True"
-                                      CanUserResizeColumns="False" CanUserResizeRows="False" SelectionMode="Single"
-                                      CanUserReorderColumns="False" AlternationCount="2" RowHeaderWidth="0" CanUserAddRows="False">
-                            <DataGrid.Columns>
-                                <DataGridTemplateColumn Header="物料位置" Width="170">
-                                    <DataGridTemplateColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <StackPanel Orientation="Horizontal" >
-                                                <TextBlock Foreground="Black" Text="{Binding MaterialPosion}" 
-                                                           VerticalAlignment="Center" HorizontalAlignment="Left" 
-                                                           Margin="5,0" FontSize="16"/>
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </DataGridTemplateColumn.CellTemplate>
-                                </DataGridTemplateColumn>
-                                <DataGridTemplateColumn Header="物料" Width="250">
-                                    <DataGridTemplateColumn.CellTemplate>
-                                        <DataTemplate>
-                                            <TextBox Text="{Binding MaterialName ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
-                                                     VerticalAlignment="Center" HorizontalContentAlignment="Center"  
-                                                      VerticalContentAlignment="Center"
-                                                     Margin="2" FontSize="16"
-                                                     Width="160" Height="28" />
-                                        </DataTemplate>
-                                    </DataGridTemplateColumn.CellTemplate>
-                                </DataGridTemplateColumn>
-                            </DataGrid.Columns>
-                        </DataGrid>
-                            <DataGrid Grid.Row="1" Grid.Column="1"   Margin="50,5" AutoGenerateColumns="False"  ItemsSource="{Binding materail2,Mode=TwoWay}"
-                                 FrozenColumnCount="1" RowHeight="34" 
-                                 VerticalAlignment="Top" HorizontalAlignment="Left"
-                                 IsReadOnly="True"
-                                CanUserResizeColumns="False" CanUserResizeRows="False" SelectionMode="Single"
-                                 CanUserReorderColumns="False" AlternationCount="2" RowHeaderWidth="0" CanUserAddRows="False">
+            </Expander>-->
+                    <!--配料录入-->
+                    <Expander Grid.Row="1" Style="{StaticResource ExpanderStyle}">
+                        <Expander.Header>
+                            <TextBlock Text="本地配料录入" />
+                        </Expander.Header>
+                        <Expander.Content>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="70"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Button Content="保存物料位置名称" Grid.ColumnSpan="2"  Style="{StaticResource buttonNormal}" Height="34" Width="200"
+                                    Command="{Binding UpdateMaterialPosionCommand}"/>
+                                <ListView ItemsSource="{Binding localMaterails}" Grid.Row="1" 
+                                      Width="800" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                     HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <ListView.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <WrapPanel Margin="10"/>
+                                        </ItemsPanelTemplate>
+                                    </ListView.ItemsPanel>
+                                </ListView>
+                            </Grid>
+                        </Expander.Content>
+                    </Expander>
+                    <!--奶茶清单-->
+                    <Expander Grid.Row="2" Style="{StaticResource ExpanderStyle}" >
+                        <Expander.Header>
+                            <TextBlock Text="本地奶茶配方"/>
+                        </Expander.Header>
+                        <Expander.Content>
+                            <DataGrid Grid.Row="4" Margin="100,5" AutoGenerateColumns="False" RowHeight="32" ItemsSource="{Binding localMaterialRecipes}" Width="500"
+                        FrozenColumnCount="1"
+                        VerticalAlignment="Top"
+                        IsReadOnly="True"
+                        CanUserResizeColumns="False" CanUserResizeRows="False" SelectionMode="Single"
+                        CanUserReorderColumns="False" AlternationCount="2" RowHeaderWidth="0" CanUserAddRows="False">
                                 <DataGrid.Columns>
-                                    <DataGridTemplateColumn Header="物料位置" Width="170">
+                                    <DataGridTemplateColumn Header="奶茶" Width="200">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate>
                                                 <StackPanel Orientation="Horizontal" >
-                                                    <TextBlock Foreground="Black" Text="{Binding MaterialPosion}" 
-                                                           VerticalAlignment="Center" HorizontalAlignment="Left" 
-                                                           Margin="5,0" FontSize="16"/>
+                                                    <TextBlock Text="{Binding RecipeName}" Foreground="Black"
+                                                       VerticalAlignment="Center" HorizontalAlignment="Center"
+                                                       Margin="5,2" FontSize="16"/>
                                                 </StackPanel>
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Header="物料" Width="250">
+                                    <DataGridTemplateColumn Header="操作" Width="*">
                                         <DataGridTemplateColumn.CellTemplate>
                                             <DataTemplate>
-                                                <TextBox Text="{Binding MaterialName ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
-                                                     VerticalAlignment="Center" HorizontalContentAlignment="Center" 
-                                                     VerticalContentAlignment="Center"
-                                                     Margin="2"  Height="28"
-                                                     Width="160" FontSize="16"/>
+                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                    <Button Content="删除" Margin="2"
+                                                    Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.DeleteRecipeCommand}"  
+                                                    CommandParameter="{Binding RecipeID}"/>
+                                                </StackPanel>
                                             </DataTemplate>
                                         </DataGridTemplateColumn.CellTemplate>
                                     </DataGridTemplateColumn>
                                 </DataGrid.Columns>
                             </DataGrid>
-                        </Grid>
-                </Expander.Content>
-            </Expander>
-                <!--奶茶清单-->
-            <Expander Grid.Row="2" Style="{StaticResource ExpanderStyle}" >
-                <Expander.Header>
-                    <TextBlock Text="本地奶茶配方"/>
-                </Expander.Header>
-                <Expander.Content>
-                    <DataGrid Grid.Row="4" Margin="100,5" AutoGenerateColumns="False" RowHeight="32" ItemsSource="{Binding localMaterialRecipes}" Width="500"
-                        FrozenColumnCount="1"
-                        VerticalAlignment="Top"
-                        IsReadOnly="True"
-                        CanUserResizeColumns="False" CanUserResizeRows="False" SelectionMode="Single"
-                        CanUserReorderColumns="False" AlternationCount="2" RowHeaderWidth="0" CanUserAddRows="False">
-                        <DataGrid.Columns>
-                            <DataGridTemplateColumn Header="奶茶" Width="200">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <StackPanel Orientation="Horizontal" >
-                                            <TextBlock Text="{Binding GoodNames}" Foreground="Black"
-                                                       VerticalAlignment="Center" HorizontalAlignment="Center"
-                                                       Margin="5,2" FontSize="16"/>
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                            <DataGridTemplateColumn Header="操作" Width="*">
-                                <DataGridTemplateColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
-                                            <Button Content="删除" Margin="2"
-                                                    Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Path=DataContext.DeleteRecipeCommand}"  
-                                                    CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid}, Path=SelectedIndex}" />
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </DataGridTemplateColumn.CellTemplate>
-                            </DataGridTemplateColumn>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                </Expander.Content>
-            </Expander>
-            </StackPanel>
-        </ScrollViewer>
+                        </Expander.Content>
+                    </Expander>
+                </StackPanel>
+            </ScrollViewer>
+        </Grid>
+        
     </Grid>
 </UserControl>
diff --git a/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml.cs b/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml.cs
index e3d3a769..6099ee62 100644
--- a/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml.cs
+++ b/BPASmartClient.MilkWithTea/View/LocalConfigureView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPASmartClient.MilkWithTea.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -24,5 +25,11 @@ namespace BPASmartClient.MilkWithTea.View
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            RecipeConfige recipeConfige = new RecipeConfige();
+            recipeConfige.ShowDialog();
+        }
     }
 }
diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml b/BPASmartClient.MilkWithTea/View/MainControlView.xaml
index d2aed96e..46e6263a 100644
--- a/BPASmartClient.MilkWithTea/View/MainControlView.xaml
+++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml
@@ -168,11 +168,11 @@
             <TextBlock Text="配方" Grid.Row="2" Grid.Column="1" Margin="10"  FontSize="22"  />
             <Border BorderBrush="#D5DFE5" BorderThickness="4" Grid.Row="3" Margin="20,0,0,0">
                 <ListBox   ItemsSource="{Binding localTeaWithMilks}" SelectionChanged="ListBox_SelectionChanged" IsEnabled="{Binding MakeEnable}"
-                      Foreground="LightSlateGray">
+                      Foreground="LightSlateGray" SelectedValue="{Binding SelectedRecipe,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
                     <ListBox.ItemTemplate>
                         <DataTemplate >
                             <Grid>
-                                <TextBlock Text="{Binding GoodNames}" Margin="5,10" FontSize="22" 
+                                <TextBlock Text="{Binding RecipeName}" Margin="5,10" FontSize="22" 
                                     Background="Transparent" />
                             </Grid>
                         </DataTemplate>
@@ -181,7 +181,7 @@
             </Border>
           
             <ListBox x:Name="recipeList" Grid.Row="3" Grid.Column="1"  Margin="5,10"
-                     ItemsSource="{Binding materialRecipes}" FontSize="18" 
+                     ItemsSource="{Binding localMaterails}" FontSize="18" 
                      Width="200" HorizontalAlignment="Left" Foreground="LightSlateGray">
                 <ListBox.ItemTemplate>
                     <DataTemplate >
@@ -191,7 +191,7 @@
                                 <ColumnDefinition Width="40"/>
                                 <ColumnDefinition Width="15"/>
                             </Grid.ColumnDefinitions>
-                            <TextBlock Text="{Binding Material}" Margin="20,10" FontSize="16"/>
+                            <TextBlock Text="{Binding MaterialName}" Margin="20,10" FontSize="16"/>
                             <TextBlock Text="{Binding MaterialWeight}"  Margin="5,10,0,10" Grid.Column="1" HorizontalAlignment="Left" />
                             <TextBlock Text="g"  Margin="0,10" HorizontalAlignment="Right" Grid.Column="2"/>
                         </Grid>
diff --git a/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs
index 8593362a..8388f1cb 100644
--- a/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs
+++ b/BPASmartClient.MilkWithTea/View/MainControlView.xaml.cs
@@ -1,5 +1,4 @@
 using BPASmartClient.MilkWithTea.ViewModel;
-using Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -29,9 +28,9 @@ namespace BPASmartClient.MilkWithTea.View
 
         private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-           if((sender as ListBox).SelectedItem is LocalTeaWithMilkConfig config)
+           if((sender as ListBox).SelectedItem is LocalRecipe config)
             {
-                recipeList.ItemsSource = config.materialRecipes;
+                recipeList.ItemsSource = config.localMaterails;
             }
         }
     }
diff --git a/BPASmartClient.MilkWithTea/View/ParameterSetting.xaml b/BPASmartClient.MilkWithTea/View/ParameterSetting.xaml
index 281b45b3..77c36e79 100644
--- a/BPASmartClient.MilkWithTea/View/ParameterSetting.xaml
+++ b/BPASmartClient.MilkWithTea/View/ParameterSetting.xaml
@@ -11,13 +11,7 @@
         <vm:PatrameterSettiongViewModel/>
     </UserControl.DataContext>
     <UserControl.Resources>
-        <Style TargetType="TextBlock">
-            <Setter Property="FontSize" Value="18"/>
-            <Setter Property="Foreground" Value="DarkSlateGray"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="FontSize" Value="18"/>
-        </Style>
+       
     </UserControl.Resources>
     <Grid Background="#F3F6F9" Margin="20" >
         <Grid.ColumnDefinitions>
@@ -40,18 +34,18 @@
                     <StackPanel Orientation="Horizontal">
                         <TextBlock Text="通道口："/>
                         <ComboBox  ItemsSource="{Binding materialPosions}" 
-                               SelectedIndex="{Binding MaterialID ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
+                               SelectedValue="{Binding MaterialID ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
                                Margin="10,0" Width="120 " Style="{StaticResource cmbstyle}"/>
                         <TextBlock Text="出料量："   Margin="10,0,0,0" />
                         <TextBox Text="{Binding OutMaterailWeight}" Width="60" Margin="10,0" VerticalContentAlignment="Center"/>
                         <TextBlock Text="g"   Margin="2,0"/>
                         <Button Content="出料" Style="{StaticResource buttonNormal}" Height="36" Width="100" Margin="30,0" Command="{Binding OutMaterailCommad}"/>
-                        <TextBlock Text="转盘位置："  Margin="60,0,10,0"/>
-                        <ComboBox  ItemsSource="{Binding TurntablePosion}" 
+                        <!--<TextBlock Text="转盘位置："  Margin="60,0,10,0"/>-->
+                        <!--<ComboBox  ItemsSource="{Binding TurntablePosion}" 
                                SelectedIndex="{Binding TurntableID,Mode=TwoWay ,UpdateSourceTrigger=PropertyChanged}"
                                Margin="10,0" Width="100 " Style="{StaticResource cmbstyle}"/>
                         <Button Content="转动" Style="{StaticResource buttonNormal}" Height="36" Width="80" Margin="30,0" 
-                            Command="{Binding TurntableCommad}"/>
+                            Command="{Binding TurntableCommad}"/>-->
                     </StackPanel>
                     <CheckBox Grid.Row="2" Content="禁用本地奶茶下单" HorizontalAlignment="Left" Margin="0,10"
                               HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
@@ -84,7 +78,7 @@
                     <TextBlock Text="校正后的重量" Grid.Column="5"/>
                     <TextBlock Text="出料时间" Grid.Column="3"/>
 
-                    <ComboBox Grid.Row="1" Width="100" Style="{StaticResource cmbstyle}" ItemsSource="{Binding materialPosions}"
+                    <ComboBox Grid.Row="1" Width="100" Style="{StaticResource cmbstyle}" ItemsSource="{Binding materialPosions}" Height="30"
                                 SelectedIndex="{Binding CorrectPassway ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" SelectionChanged="ComboBox_SelectionChanged" />
                     <TextBlock  Grid.Row="1" Grid.Column="1" ></TextBlock>
                     <CheckBox  x:Name="OpenIsCheck"
@@ -126,16 +120,31 @@
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
                     <RowDefinition Height="*"/>
+                    <RowDefinition Height="10"/>
                 </Grid.RowDefinitions>
                 <TextBlock Text="店铺名称:" Grid.ColumnSpan="2" FontSize="22" Height="28" Width="94"  HorizontalAlignment="Left" Margin="20,0"/>
                 <TextBox Text="{Binding ShopName}" Grid.Column="2" Grid.ColumnSpan="2" Margin="-20,10,30,10" VerticalContentAlignment="Center"/>
                 <TextBlock Text="店铺ID:" Grid.Row="1" Height="23" Width="60" HorizontalAlignment="Left" Margin="20,0"/>
                 <TextBlock Text="设备ID:" Grid.Column="2" Grid.Row="1" Height="23" Width="60" />
-                <TextBlock Text="PLC地址:"  Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="2" Height="23" Width="72" HorizontalAlignment="Left" Margin="20,0"/>
+                
                 <TextBox Text="{Binding ShopID}" Width="60" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left" VerticalContentAlignment="Center" Margin="0,12"/>
                 <TextBox Text="{Binding DeviceID}" Width="60"  Grid.Column="3" Grid.Row="1" HorizontalAlignment="Left" VerticalContentAlignment="Center"  Margin="0,12"/>
-                <TextBox Text="{Binding PLCAdress}"  Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Margin="-20,10,30,10"
+
+                <RadioButton Content="网口" GroupName="a" Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center"
+                             Command="{Binding ChangeCommunationCommand}"/>
+                <StackPanel Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" Visibility="{Binding VsIP}" 
+                            HorizontalAlignment="Center" VerticalAlignment="Center">
+                    <TextBlock Text="IP:"    Height="23"  Margin="20,0"/>
+                    <TextBox Text="{Binding PLCAdress}"   Margin="0,10,30,10" Width="160"
                          VerticalContentAlignment="Center"/>
+                </StackPanel>
+                <RadioButton Content="串口" GroupName="a" Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center"
+                             IsChecked="{Binding IsPort}" Command="{Binding ChangeCommunationCommand}"/>
+                <StackPanel Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3" Orientation="Horizontal" Visibility="{Binding VsPort}">
+                    <TextBlock  Text="串口号：" />
+                    <ComboBox  Style="{DynamicResource cmbstyle}" Height="26" Width="100" ItemsSource="{Binding Ports}"
+                               SelectedValue="{Binding Prot}"/>
+                </StackPanel>
                 <Button Style="{StaticResource buttonNormal}" 
                         
                         Grid.Column="4"  Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="3" 
diff --git a/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml b/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml
new file mode 100644
index 00000000..59428732
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml
@@ -0,0 +1,135 @@
+<Window x:Class="BPASmartClient.MilkWithTea.View.RecipeConfige"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:BPASmartClient.MilkWithTea.View"
+        xmlns:vm="clr-namespace:BPASmartClient.MilkWithTea.ViewModel"
+        mc:Ignorable="d"
+        Title="RecipeConfige"
+        Height="800" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True" 
+        >
+    <Window.DataContext>
+        <vm:RecipeConfigeViewModel/>
+    </Window.DataContext>
+    <Window.Resources>
+    
+
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="60"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
+
+        </Grid.RowDefinitions>
+
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+            <TextBlock Text="奶茶名称" Margin="10,0" />
+            <TextBox Text="{Binding Name}" Width="120" Foreground="DarkSlateGray" Margin="10,0"/>
+            <Button Content="添加配料" Margin="10,0" Width="100" Command="{Binding AddMaterialCommand}"/>
+            <Button Content="保存" Margin="10,0" Width="100" Command="{Binding SaveCommand}"/>
+            <Button Content="取消" Margin="10,0" Width="100" Click="Button_Click"/>
+        </StackPanel>
+        <Grid Grid.Row="1">
+            <ScrollViewer 
+                    HorizontalScrollBarVisibility="Hidden"
+                    VerticalScrollBarVisibility="Auto">
+                <ItemsControl ItemsSource="{Binding Materails}" >
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <RadioButton GroupName="all">
+                                <RadioButton.Template>
+                                    <ControlTemplate TargetType="RadioButton">
+                                        <Grid Name="gr" Height="40" Margin="20,0">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="2*"/>
+                                                <ColumnDefinition Width="2*"/>
+                                                <ColumnDefinition Width="2*" />
+                                            </Grid.ColumnDefinitions>
+                                            <ComboBox Name="cb" Width="120" Height="30"
+                                                    ItemsSource="{Binding DataContext.materialNames, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
+                                                    SelectedValue="{Binding MaterialID}"
+                                                    
+                                                    SelectedValuePath="Key" DisplayMemberPath="Value"/>
+                                            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                <TextBox Text="{Binding MaterialWeight}" Width="120" Margin="10,0"/>
+                                                <TextBlock Text="g" />
+                                            </StackPanel>
+                                            <Button Grid.Column="2"
+                                                    Width="70"
+                                                    Height="25"
+                                                    Margin="15,0,0,0"
+                                                    FontSize="16"    
+                                                    BorderBrush="#FF2AB2E7"
+                                                    BorderThickness="1"
+                                                    HorizontalAlignment="Left"
+                                                   
+                                                    Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
+                                                    CommandParameter="{Binding  RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
+                                                    Content="删 除" />
+
+                                        </Grid>
+
+
+                                    </ControlTemplate>
+                                </RadioButton.Template>
+                            </RadioButton>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+        <Grid Grid.Row="2">
+            <ListBox x:Name="listview1" AllowDrop="True" SelectionMode="Extended" MouseMove="listview1_MouseMove" 
+                      ItemsSource="{Binding Materails}"  PreviewMouseLeftButtonUp="listview1_MouseLeftButtonUp">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Border PreviewMouseLeftButtonDown="listview1_MouseLeftButtonDown"  Width="800" BorderBrush="Black" BorderThickness="1" Background="White"
+                                >
+                            <RadioButton GroupName="all" >
+                                <RadioButton.Template>
+                                    <ControlTemplate TargetType="RadioButton">
+                                        <Grid Name="gr" Height="40" Margin="20,0">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="2*"/>
+                                                <ColumnDefinition Width="2*"/>
+                                                <ColumnDefinition Width="2*" />
+                                            </Grid.ColumnDefinitions>
+                                            <ComboBox Name="cb" Width="120" Height="30"
+                                                    ItemsSource="{Binding DataContext.materialNames, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
+                                                    SelectedValue="{Binding MaterialID }"
+                                                    
+                                                    SelectedValuePath="Key" DisplayMemberPath="Value"/>
+                                            <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                <TextBox Text="{Binding MaterialWeight}" Width="120" Margin="10,0"/>
+                                                <TextBlock Text="g" />
+                                            </StackPanel>
+                                            <Button Grid.Column="2"
+                                                    Width="70"
+                                                    Height="25"
+                                                    Margin="15,0,0,0"
+                                                    FontSize="16"    
+                                                    BorderBrush="#FF2AB2E7"
+                                                    BorderThickness="1"
+                                                    HorizontalAlignment="Left"
+                                                   
+                                                    Command="{Binding DataContext.DeleteCommand, RelativeSource={RelativeSource AncestorType=Window, Mode=FindAncestor}}"
+                                                    CommandParameter="{Binding  RelativeSource={RelativeSource AncestorType=ListBoxItem, Mode=FindAncestor}}"
+                                                    Content="删 除" />
+                                        </Grid>
+
+
+                                    </ControlTemplate>
+                                </RadioButton.Template>
+                            </RadioButton>
+                        </Border>
+                       
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+              
+            </ListBox>
+        </Grid>
+    </Grid>
+</Window>
diff --git a/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml.cs b/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml.cs
new file mode 100644
index 00000000..389aab52
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/View/RecipeConfige.xaml.cs
@@ -0,0 +1,174 @@
+using BPASmartClient.MilkWithTea.ViewModel;
+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.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.MilkWithTea.View
+{
+    /// <summary>
+    /// RecipeConfige.xaml 的交互逻辑
+    /// </summary>
+    public partial  class RecipeConfige : Window
+    {
+        double X,Y;
+        Border ultUE;
+        Popup mypopup;
+        ListBoxItem OldItem;
+
+        public RecipeConfige()
+        {
+            InitializeComponent();
+            ActionManage.GetInstance.CancelRegister("RecipeConfigeViewClose");
+            ActionManage.GetInstance.Register(new Action(()=> this.Close()), "RecipeConfigeViewClose");
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
+
+       
+
+       
+
+        
+
+        private int GetCurrentIndex(GetPositionDelegate getPosition)
+        {
+            int index = -1;
+            for (int i = 0; i < listview1.Items.Count; ++i)
+            {
+                ListViewItem item = GetListViewItem(i);
+                if (item != null && this.IsMouseOverTarget(item, getPosition))
+                {
+                    index = i;
+                    break;
+                }
+            }
+            return index;
+        }
+
+        private bool IsMouseOverTarget(Visual target, GetPositionDelegate getPosition)
+        {
+            Rect bounds = VisualTreeHelper.GetDescendantBounds(target);
+            Point mousePos = getPosition((IInputElement)target);
+            return bounds.Contains(mousePos);
+        }
+
+        
+        delegate Point GetPositionDelegate(IInputElement element);
+
+        ListViewItem GetListViewItem(int index)
+        {
+            if (listview1.ItemContainerGenerator.Status != GeneratorStatus.ContainersGenerated)
+                return null;
+            return listview1.ItemContainerGenerator.ContainerFromIndex(index) as ListViewItem;
+        }
+
+        private void CloneVisual(Border border, MouseButtonEventArgs e)
+        {
+            ListBoxItem listBoxItem = new ListBoxItem();
+            Point ptLeftUp = new Point(0, 0);
+            ptLeftUp = listview1.PointToScreen(ptLeftUp);
+            mypopup = new Popup();
+            double y = e.GetPosition(listview1).Y;
+            double x = e.GetPosition(listview1).X;
+ 
+            VisualBrush brush = new VisualBrush(border);
+            Rectangle rect = new Rectangle();
+            rect.Width = border.ActualWidth;
+            rect.Height = border.ActualHeight;
+            rect.Fill = brush;
+            rect.Opacity = border.Opacity;
+            border.Opacity = 0.8;
+            mypopup.Child = rect;
+            mypopup.AllowsTransparency = true;
+            mypopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ultUE).ActualWidth / 2;
+            mypopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ultUE).ActualHeight / 2;
+            mypopup.IsOpen = true;
+        }
+
+        private void listview1_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            var pos = e.GetPosition(listview1);
+            HitTestResult result = VisualTreeHelper.HitTest(listview1, pos);
+            OldItem = Utils.FindVisualParent<ListBoxItem>(result.VisualHit);
+            if(OldItem != null)
+            {
+                if (e.Source is Border)
+                {
+                    ultUE = (Border)e.Source;
+                    ultUE.CaptureMouse();
+                    ultUE.Visibility = Visibility.Collapsed;
+                    CloneVisual(ultUE, e);
+                }
+            }
+        }
+
+
+
+        private void listview1_MouseMove(object sender, MouseEventArgs e)
+        {
+            Point ptLeftUp = new Point(0, 0);
+            Point ptRightDown = new Point(this.ActualWidth, this.ActualHeight);
+            ptLeftUp = listview1.PointToScreen(ptLeftUp);
+            ptRightDown = listview1.PointToScreen(ptRightDown);
+            double y = e.GetPosition(listview1).Y;
+            double x = e.GetPosition(listview1).X;
+            if (mypopup != null)
+            {
+                mypopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ultUE).ActualWidth / 2;
+                mypopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ultUE).ActualHeight / 2;
+            }
+        }
+
+        private void listview1_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            if(mypopup != null)
+            {
+                mypopup.IsOpen = false;
+                mypopup = null;
+            }
+           
+            if (OldItem == null) return;
+            var pos = e.GetPosition(listview1);
+            HitTestResult result = VisualTreeHelper.HitTest(listview1, pos);
+            if(result == null) return;
+            var Newitem = Utils.FindVisualParent<ListBoxItem>(result.VisualHit);
+            if (Newitem == null) return;
+            if (OldItem == Newitem) return;
+            int iold = listview1.Items.IndexOf((LocalMaterail)OldItem.DataContext);
+            int inew = listview1.Items.IndexOf((LocalMaterail)Newitem.DataContext);
+            RecipeConfigeViewModel.Materails.Move(iold,inew);
+            
+        }
+    }
+
+    internal static class Utils
+    {
+        //根据子元素查找父元素
+        public static T FindVisualParent<T>(DependencyObject obj) where T : class
+        {
+            while (obj != null)
+            {
+                if (obj is T)
+                    return obj as T;
+
+                obj = VisualTreeHelper.GetParent(obj);
+            }
+            return null;
+        }
+    }
+}
diff --git a/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs
index 12d118a1..21f1beca 100644
--- a/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs
+++ b/BPASmartClient.MilkWithTea/ViewModel/LocalConfigureViewModel.cs
@@ -1,7 +1,5 @@
-using BPASmartClient.MorkTM;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-using Model;
+using BPASmartClient.MorkMOC;
+using CommunityToolkit.Mvvm.Input;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -14,56 +12,34 @@ using System.Windows;
 
 namespace BPASmartClient.MilkWithTea.ViewModel
 {
-    public class LocalConfigureViewModel : ObservableObject
-
+    partial class LocalConfigureViewModel : ObservableObject
     {
-        #region 奶茶配方录入
-        /// <summary>
-        /// 奶茶配方
-        /// </summary>
-        public ObservableCollection<MaterialRecipe> materialRecipes { get => materialRecipes1; set => materialRecipes1 = value; } 
-        /// <summary>                                                                                                                                   
-        /// 出料集合                                                                                                                               
-        /// </summary>
-        public ObservableCollection<string> MaterailList { get; set; } = new ObservableCollection<string>();
-        /// <summary>
-        /// 奶茶名称
-        /// </summary>
-        public string LocalGoodName { get { return _localGoodName; } set { _localGoodName = value; OnPropertyChanged(); } }
-        private string _localGoodName;
-
-        private ObservableCollection<MaterialRecipe> materialRecipes1 = new ObservableCollection<MaterialRecipe>();
-
-        /// <summary>
-        /// 添加一条配方
-        /// </summary>
-        public RelayCommand AddRecipeCommand { get; set; }
-        /// <summary>
-        /// 删除一条配方
-        /// </summary>
-        public RelayCommand<object> RemoveRecipeCommand { get; set; }
-        /// <summary>
-        /// 取消配方
-        /// </summary>
-        public RelayCommand RecipeCancelCommand { get; set; }
-        /// <summary>
-        /// 保存配方
-        /// </summary>
-        public RelayCommand SaveRecipeCommand { get; set; }
-
-        #endregion
-
         #region 本地奶茶配方
         /// <summary>
         /// 本地奶茶配方列表
         /// </summary>
-        public ObservableCollection<LocalTeaWithMilkConfig> localMaterialRecipes { get; set; } = GLobal.MaterialRecipes;
+        public ObservableCollection<LocalRecipe> localMaterialRecipes { get; set; } = Json<JsonLocalRecipes>.Data.localRecipes;
        
 
         /// <summary>
         /// 删除配方奶茶
         /// </summary>
-        public RelayCommand<object> DeleteRecipeCommand { get; set; }
+        [RelayCommand]
+        private void DeleteRecipe(object o)
+        {
+            if (o == null) return;
+            if(o is string id)
+            {
+                var res = localMaterialRecipes.FirstOrDefault(p => p.RecipeID == id);
+                if (res != null)
+                {
+                    localMaterialRecipes.Remove(res);
+                    Json<JsonLocalRecipes>.Save();
+                }
+                
+              
+            }
+        }
 
         #endregion
 
@@ -71,141 +47,26 @@ namespace BPASmartClient.MilkWithTea.ViewModel
         /// <summary>
         /// 物料位置名称集合
         /// </summary>
-        public ObservableCollection<MaterailNameAndPosion> materailNameAndPosions { get; set; } = new ObservableCollection<MaterailNameAndPosion>();
-        public List<MaterailNameAndPosion> materail1 { get; set; } = new List<MaterailNameAndPosion>();
-        public List<MaterailNameAndPosion> materail2 { get; set; } = new List<MaterailNameAndPosion>();
+        public ObservableCollection<LocalMaterail> localMaterails { get; set; } = Json<JsonLocalRecipes>.Data.localMaterails;
+       
         /// <summary>
         /// 更新物料位置
         /// </summary>
-        public RelayCommand UpdateMaterialPosionCommand { get; set; }
+        [RelayCommand]
+        private void UpdateMaterialPosion()
+        {
+            Json<JsonLocalRecipes>.Save();
+        }
         #endregion
 
         public LocalConfigureViewModel()
         {
-            materialRecipes.Add(new MaterialRecipe()
-            {
-                MaterialWeight = 10
-            });
-
-
             
-           
-
-
-            AddRecipeCommand = new RelayCommand(new Action(() =>
-            {
-                materialRecipes.Add(new MaterialRecipe()
-                {
-                    MaterialID = materialRecipes.Count() + 1
-                });
-
-            }));
-
-            RemoveRecipeCommand = new RelayCommand<object>((o =>
-            {
-                if (o != null && o is int index)
-                {
-                    materialRecipes.RemoveAt(index);
-                    for (int i = 0; i < materialRecipes.Count; i++)//ID排序
-                    {
-                        materialRecipes[i].MaterialID = i + 1;
-                    }
-                }
-
-            }));
-
-            RecipeCancelCommand = new RelayCommand(new Action(() =>
-            {
-                materialRecipes.Clear();
-                LocalGoodName = String.Empty;
-            }));
-
-            SaveRecipeCommand = new RelayCommand(new Action(() =>
-            {
-                if (LocalGoodName == "" || LocalGoodName == null) return;
-                if (materialRecipes.Count == 0) return;
-
-                localMaterialRecipes.Insert(0, new LocalTeaWithMilkConfig()
-                {
-                    GoodNames = LocalGoodName,
-                    materialRecipes = materialRecipes
-
-                });
-
-                UpdateLocalJosnData<LocalTeaWithMilkConfig>(GLobal.recipePath, localMaterialRecipes);//更新奶茶配方json文件
-                MessageBox.Show("保存成功");
-            }));
-
-
-            DeleteRecipeCommand = new RelayCommand<object>((o =>
-            {
-                if (o != null && o is int index)
-                {
-                    localMaterialRecipes.RemoveAt(index);
-                    UpdateLocalJosnData<LocalTeaWithMilkConfig>(GLobal.recipePath, localMaterialRecipes);//更新奶茶配方json文件
-                }
-            }));
-
-            UpdateMaterialPosionCommand = new RelayCommand(new Action(() =>
-            {
-                materailNameAndPosions.Clear();
-                foreach(var item in materail1)
-                {
-                    materailNameAndPosions.Add(item);
-                }
-                foreach (var item in materail2)
-                {
-                    materailNameAndPosions.Add(item);
-                }
-                UpdateLocalJosnData<MaterailNameAndPosion>(GLobal.posionPath, materailNameAndPosions);//更新物料位置名称
-                MaterailList.Clear();   
-                foreach (MaterailNameAndPosion m in materailNameAndPosions)
-                {
-                    if (m.MaterialName != null) MaterailList.Add(m.MaterialName);
-
-                }
-            }));
-
-            Init();
-        }
-
-        /// <summary>
-        /// 界面初始化加载
-        /// </summary>
-        private void Init()
-        {
-
-            materailNameAndPosions = GLobal.GetJsonToT<MaterailNameAndPosion>(GLobal.posionPath);
-            if (materailNameAndPosions.Count == 0)
-            {
-                foreach (MaterialPosion item in Enum.GetValues(typeof(MaterialPosion)))
-                {
-                    materailNameAndPosions.Add(new MaterailNameAndPosion()
-                    {
-                        MaterialPosion = item.ToString()
-                    });
-                }
-            }
-            materail1 =  materailNameAndPosions.Take<MaterailNameAndPosion>(14).ToList();
-            materail2 = materailNameAndPosions.TakeLast<MaterailNameAndPosion>(14).ToList();
-            foreach (MaterailNameAndPosion m in materailNameAndPosions)
-            {
-                if (m.MaterialName != null) MaterailList.Add(m.MaterialName);
-
-            }
+            
         }
 
+       
+        
         
-        /// <summary>
-        /// 更新Json文件数据
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="path"></param>
-        /// <param name="ts"></param>
-        private void UpdateLocalJosnData<T>(string path, ObservableCollection<T> ts)
-        {
-            if (ts != null) File.WriteAllText(path, JsonConvert.SerializeObject(ts));
-
-        }
     }
 }
diff --git a/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs
index b27afd0b..aaee4657 100644
--- a/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs
+++ b/BPASmartClient.MilkWithTea/ViewModel/MainControlViewModel.cs
@@ -1,29 +1,22 @@
-using BPA.Message;
-using BPA.Message.Enum;
-using BPASmartClient.Device;
-using BPASmartClient.EventBus;
+
+global using CommunityToolkit.Mvvm.Input;
 using BPASmartClient.Helper;
-using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-using Model;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+using BPASmartClient.Message;
 
 namespace BPASmartClient.MilkWithTea.ViewModel
 {
-    public class MainControlViewModel: ObservableObject
+     partial class MainControlViewModel: ObservableObject
     {
-        
 
-        public ObservableCollection<LocalTeaWithMilkConfig> localTeaWithMilks { get; set; } = GLobal.MaterialRecipes;
+        /// <summary>
+        /// 本地奶茶列表
+        /// </summary>
+        public ObservableCollection<LocalRecipe> localTeaWithMilks { get; set; } = Json<JsonLocalRecipes>.Data.localRecipes;
 
-        public ObservableCollection<MaterialRecipe> materialRecipes { get; set; } = new ObservableCollection<MaterialRecipe>();
+        /// <summary>
+        /// 奶茶对应的原料列表
+        /// </summary>
+        public ObservableCollection<LocalMaterail> materialRecipes { get; set; } = new ObservableCollection<LocalMaterail>();
 
         /// <summary>
         /// 订单状态列表
@@ -38,15 +31,16 @@ namespace BPASmartClient.MilkWithTea.ViewModel
         /// <summary>
         /// 当前正在制作的奶茶
         /// </summary>
-        public string CurrentGood { get { return _currentGood; } set { _currentGood = value; OnPropertyChanged(); } }
+        [ObservableProperty]
         private string _currentGood = "茉莉花茶";
         /// <summary>
         /// 奶茶制作百分比
         /// </summary>
-        public string MakePercent { get { return _makePercent; } set { _makePercent = value; OnPropertyChanged(); } }
+        [ObservableProperty]
         private string _makePercent = "0";
 
-
+        [ObservableProperty]
+        private LocalRecipe _selectedRecipe;
 
         /// <summary>
         /// 当前正在制作的奶茶
@@ -56,16 +50,31 @@ namespace BPASmartClient.MilkWithTea.ViewModel
         /// <summary>
         /// 本地奶茶制作
         /// </summary>
-        public RelayCommand MakeGoodCommand { get; set; }
+        [RelayCommand]
+        private void MakeGood()
+        {
+            if(SelectedRecipe == null) return;
+            foreach(var item in SelectedRecipe.localMaterails)
+            {
+                var res = Json<JsonLocalRecipes>.Data.localMaterails.FirstOrDefault(p => p.MaterialID == item.MaterialID);
+                if ( res!= null)
+                {
+                    item.MaterialPosition = res.MaterialPosition;
+                }
+                else
+                {
+                    MessageLog.GetInstance.ShowEx($"配料：{item.MaterialName}不存在，下单失败");
+                    return;
+                }
+            }
+            ActionManage.GetInstance.Send( "MakeGoods",SelectedRecipe);
+        }
+
+
 
-     
 
         public MainControlViewModel()
         {
-            MakeGoodCommand = new RelayCommand(new Action(() =>
-            {
-
-            }));
             Init();
             MorkOrderPush morkOrderPush = new MorkOrderPush() { GoodsName = "珍珠奶茶", SortNum = 1 };
             MorkOrderPush morkOrderPush1 = new MorkOrderPush() { GoodsName = "茉莉花茶", SortNum = 2 };
diff --git a/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs b/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs
index 6dad830f..1c306e84 100644
--- a/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs
+++ b/BPASmartClient.MilkWithTea/ViewModel/MainWindowVeiwModel.cs
@@ -1,7 +1,6 @@
-using BPASmartClient.Helper;
+global using Microsoft.Toolkit.Mvvm.ComponentModel;
+using BPASmartClient.Helper;
 using BPASmartClient.Model;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Model;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -17,23 +16,23 @@ namespace BPASmartClient.MilkWithTea.ViewModel
 
         public MainWindowVeiwModel()
         {
-            init();
-        }
-
-        private void init()
-        {
-            string path = Path.Combine(Environment.CurrentDirectory, "AccessFile", "Recipes");
-            //判断文件夹是否存在，如果不存在就创建file文件夹
-            if (!Directory.Exists(path))
+            Json<JsonLocalRecipes>.Read();
+            Json<JsonDeviceConfig>.Read();
+            if (Json<JsonLocalRecipes>.Data.localMaterails.Count<14)
             {
-                Directory.CreateDirectory(path);
+                Json<JsonLocalRecipes>.Data.localMaterails.Clear();
+                for (int i = 1; i < 15; i++)
+                {
+                    Json<JsonLocalRecipes>.Data.localMaterails.Add(new LocalMaterail
+                    {
+                        MaterialID = Guid.NewGuid().ToString(),
+                        MaterialPosition = i
+                    });;
+                }
             }
-            GLobal.recipePath = Path.Combine(path, "LocalRecipes.json");
-            GLobal.posionPath = Path.Combine(path, "MaterialPosion.json");
-
-            GLobal.MaterialRecipes = GLobal.GetJsonToT<LocalTeaWithMilkConfig>(GLobal.recipePath);
-            GLobal.deviceConfig = GLobal.GetJsonToT<DeviceConfigModelJson>($"{LocaPath.GetInstance().GetDeviceConfigPath}奶茶味魔方.json");
         }
 
+        
+
     }
 }
diff --git a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs
index ed2b05fa..25926a3e 100644
--- a/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs
+++ b/BPASmartClient.MilkWithTea/ViewModel/PatrameterSettiongViewModel.cs
@@ -1,9 +1,7 @@
 using BPASmartClient.Helper;
 using BPASmartClient.Message;
 using BPASmartClient.Model;
-using BPASmartClient.MorkTM;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -15,164 +13,185 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.MilkWithTea.ViewModel
 {
-    public class PatrameterSettiongViewModel: ObservableObject
+    partial class PatrameterSettiongViewModel: ObservableObject
     {
+        string FileName => GLobal.deviceConfig.Count > 0 ? GLobal.deviceConfig[0].ShopName : string.Empty;
+
         /// <summary>
         /// 物料通道口列表
         /// </summary>
-        public ObservableCollection<MaterialPosion> materialPosions { get; set; } = new ObservableCollection<MaterialPosion>();
-        /// <summary>
-        /// 转盘位置列表
-        /// </summary>
-        public ObservableCollection<OutMaterialPosion> TurntablePosion { get; set; } = new ObservableCollection<OutMaterialPosion>();
+        public ObservableCollection<int> materialPosions { get; set; } = new ObservableCollection<int>();
 
-        /// <summary>
-        /// 出料位置ID
-        /// </summary>
-        public int MaterialID { get { return _materialID; } set { _materialID = value; OnPropertyChanged(); } }
+        [ObservableProperty]
         private int _materialID = 0;
+
         /// <summary>
         /// 出料重量
         /// </summary>
-        public float OutMaterailWeight { get { return _outMaterilWeight; } set { _outMaterilWeight = value; OnPropertyChanged(); } }
-        private float _outMaterilWeight;
-        /// <summary>
-        /// 装盘ID
-        /// </summary>
-        public int TurntableID { get { return _turntableID; } set { _turntableID = value; OnPropertyChanged(); } }
-        private int _turntableID = 0;
+        [ObservableProperty]
+        private int _outMaterilWeight;
+
         /// <summary>
         /// 矫正的通道号
         /// </summary>
-        public int CorrectPassway { get { return _CorrectPassway; } set { _CorrectPassway = value; OnPropertyChanged(); } }
+        [ObservableProperty]
         private int _CorrectPassway = 0;
         /// <summary>
         /// 通道是否开启
         /// </summary>
-        public bool PasswayIsOpen { get { return _passwayIsOpen; } set { _passwayIsOpen = value; OnPropertyChanged(); } }
+        [ObservableProperty]
         private bool _passwayIsOpen ;
         /// <summary>
         /// 矫正重量
         /// </summary>
-        public float  CorrectMatetailWeight { get { return _CorrectMatetailWeight; } set { _CorrectMatetailWeight = value; OnPropertyChanged(); } }
-        private float _CorrectMatetailWeight = 0;
+        [ObservableProperty]
+        private int _correctMatetailWeight = 0;
         /// <summary>
         /// 矫正时间
         /// </summary>
-        public int OutTime { get { return _0utTime; } set { _0utTime = value; OnPropertyChanged(); } }
-        private int _0utTime = 0;
+        [ObservableProperty]
+        private int _outTime = 0;
 
         public bool IsEnable { get { return !GLobal.makeEnable; } set { GLobal.makeEnable = !value; OnPropertyChanged(); } }
         /// <summary>
         /// 出料动作
         /// </summary>
-        public RelayCommand OutMaterailCommad { get; set; }
-        /// <summary>
-        /// 转动转盘
-        /// </summary>
-        public RelayCommand TurntableCommad { get; set; }
+        [RelayCommand]
+        private void OutMaterial()
+        {
+            ActionManage.GetInstance.Send("通道口出料", new object[] { MaterialID, OutMaterilWeight });
+        }
         /// <summary>
         /// 开始矫正
         /// </summary>
-        public RelayCommand CheckPasswayCommad { get; set; }
+        [RelayCommand]
+        private void CheckPassway()
+        {
+
+        }
         /// <summary>
         /// 开启通道
         /// </summary>
-        public RelayCommand OpenPasswayCommand { get; set; }
+        [RelayCommand]
+        private void OpenPassway()
+        {
+
+        }
         /// <summary>
         /// 确认重量
         /// </summary>
-        public RelayCommand CheckMaterailWeightCommand { get; set; }
+        [RelayCommand]
+        private void CheckMaterailWeight()
+        {
 
+        }
         #region 设备配置
-        
+
         /// <summary>
         /// 店铺名称
         /// </summary>
-        public string ShopName { get { return _shopName; } set { _shopName = value; OnPropertyChanged(); } }
-        private string _shopName;
+        [ObservableProperty]
+        private string? _shopName = string.Empty;
         /// <summary>
         /// 店铺ID
         /// </summary>
-        public string ShopID { get { return _shopID; } set { _shopID = value; OnPropertyChanged(); } }
-        private string _shopID;
+        [ObservableProperty]
+        private string? _shopID = string.Empty;
         /// <summary>
         /// 设备ID
         /// </summary>
-        public string DeviceID { get { return _deviceID; } set { _deviceID = value; OnPropertyChanged(); } }
-        private string _deviceID;
+        [ObservableProperty]
+        private string? _deviceID = string.Empty;
         /// <summary>
         /// PLC地址
         /// </summary>
-        public string PLCAdress { get { return _pLCAdress; } set { _pLCAdress = value; OnPropertyChanged(); } }
-        private string _pLCAdress;
+        [ObservableProperty]
+        private string? _pLCAdress = string.Empty;
 
-        public RelayCommand SaveDevicesCommand { get; set; }
-        #endregion
+        [ObservableProperty]
+        private bool _isPort = true;
 
-        public PatrameterSettiongViewModel()
-        {
-          
-            OutMaterailCommad = new RelayCommand(new Action(() =>
-            {
-                ActionManage.GetInstance.Send("通道口出料", new object[] { MaterialID +1, OutMaterailWeight });
+        [ObservableProperty]
+        private Visibility _vsIP = Visibility.Hidden;
 
-            }));
+        [ObservableProperty]
+        private Visibility _vsPort = Visibility.Visible;
 
-            TurntableCommad = new RelayCommand(new Action(() =>
-            {
-                ActionManage.GetInstance.Send("转盘转动", new object[] { TurntableID });
-            }));
-
-            OpenPasswayCommand = new RelayCommand(new Action(() =>
-            {
-                if(PasswayIsOpen) ActionManage.GetInstance.Send("开启通道", new object[] { CorrectPassway + 1 });
+        [ObservableProperty]
+        private string[] _ports;
 
-            }));
+        [ObservableProperty]
+        private string _prot;
 
-            CheckPasswayCommad = new RelayCommand(new Action(() =>
+        [RelayCommand]
+        private void SaveDevices()
+        {
+            SaveDeviceMessage();
+        }
+        [RelayCommand]
+        private void ChangeCommunation()
+        {
+            if(IsPort)
             {
-                ActionManage.GetInstance.Send("开始矫正", new object[] { CorrectPassway + 1,OutTime });
-            }));
-
-            CheckMaterailWeightCommand = new RelayCommand(new Action(() =>
+                VsPort = Visibility.Visible;
+                VsIP = Visibility.Hidden;
+            }
+            else
             {
-                ActionManage.GetInstance.Send("矫正重量", new object[] { CorrectPassway + 1, CorrectMatetailWeight });
-            }));
-
-            SaveDevicesCommand = new RelayCommand(SaveDeviceMessage);
+                VsIP = Visibility.Visible;
+                VsPort = Visibility.Hidden;
+            }
+        }
+        #endregion
 
+        public PatrameterSettiongViewModel()
+        {
+            Ports = System.IO.Ports.SerialPort.GetPortNames();
             init();
         }
         private void init()
         {
-            foreach (MaterialPosion materialPosion in Enum.GetValues(typeof(MaterialPosion)))
+            for (int i = 1; i < 14; i++)
             {
-                materialPosions.Add(materialPosion);
+                materialPosions.Add(i);
             }
-
-            foreach (OutMaterialPosion outMaterialPosion in Enum.GetValues(typeof(OutMaterialPosion)))
+            if (GLobal.deviceConfig.Count > 0)
             {
-                TurntablePosion.Add(outMaterialPosion);
+                ShopName = GLobal.deviceConfig.ElementAtOrDefault(0).ShopName ;
+                ShopID = GLobal.deviceConfig.ElementAtOrDefault(0).ShopId;
+                
+                DeviceID = GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAt(0).DeviceId;
+                PLCAdress = GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).communicationPar.IPAddress;
             }
-            ShopName = GLobal.deviceConfig.ElementAt(0).ShopName;
-            ShopID = GLobal.deviceConfig.ElementAt(0).ShopId;
-            DeviceID = GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).DeviceId;
-            PLCAdress = GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).communicationPar.IPAddress;
+          
         }
 
         private void SaveDeviceMessage()
         {
+            
             if (GLobal.deviceConfig.Count > 0)
             {
-                GLobal.deviceConfig.ElementAt(0).ShopName = ShopName;
-                GLobal.deviceConfig.ElementAt(0).ShopId = ShopID;
-                GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).DeviceId = DeviceID;
-                GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).Id = Guid.NewGuid().ToString();
-                GLobal.deviceConfig.ElementAt(0).deviceModels.ElementAt(0).communicationDevcies.ElementAt(0).communicationPar.IPAddress = PLCAdress;
-                File.WriteAllText($"{LocaPath.GetInstance().GetDeviceConfigPath}奶茶味魔方.json", JsonConvert.SerializeObject(GLobal.deviceConfig));
+                GLobal.deviceConfig.ElementAtOrDefault(0).ShopName = ShopName;
+                GLobal.deviceConfig.ElementAtOrDefault(0).ShopId = ShopID;
+                GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).DeviceId = DeviceID;
+                if(IsPort)
+                {
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.IsSerialPort = true;
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.SerialPort = Prot;
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.BaudRate = 9600;
+                }
+                else
+                {
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.IsSerialPort = false;
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.IsNetworkPort = true;
+                    GLobal.deviceConfig.ElementAtOrDefault(0).deviceModels.ElementAtOrDefault(0).communicationDevcies.ElementAtOrDefault(0).communicationPar.IPAddress = PLCAdress;
+                }
             }
-               
+            File.WriteAllText($"{LocaPath.GetInstance().GetDeviceConfigPath}MOC.json", JsonConvert.SerializeObject(GLobal.deviceConfig));
+
+
         }
+
+        
     }
 }
diff --git a/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs b/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs
new file mode 100644
index 00000000..efd2389c
--- /dev/null
+++ b/BPASmartClient.MilkWithTea/ViewModel/RecipeConfigeViewModel.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+
+namespace BPASmartClient.MilkWithTea.ViewModel
+{
+    partial class RecipeConfigeViewModel:ObservableObject
+    {
+        public static ObservableCollection<LocalMaterail> Materails { get; set; } = new ObservableCollection<LocalMaterail>();
+
+        public Dictionary<string,string> materialNames { get; set; } = new Dictionary<string,string>();
+
+        [ObservableProperty]
+        private string _name = String.Empty;
+
+
+        [RelayCommand]
+        private void AddMaterial()
+        {
+            Materails.Add(new LocalMaterail());
+        }
+        [RelayCommand]
+        private void Delete(object o)
+        {
+            if (o == null) return;
+            if(o is ListBoxItem id)
+            {
+                 Materails.Remove((LocalMaterail)id.DataContext);
+            }
+        }
+        [RelayCommand]
+        private void Save()
+        {
+            if(Name == String.Empty)
+            {
+                return;
+            }
+            if(Json<JsonLocalRecipes>.Data.localRecipes.FirstOrDefault(p=>p.RecipeName == Name)!= null)
+            {
+                return;
+            }
+            foreach(var materail in Materails)
+            {
+                materail.MaterialName = materialNames[materail.MaterialID]; 
+            }
+            Json<JsonLocalRecipes>.Data.localRecipes.Add(new LocalRecipe
+            {
+                RecipeID = Guid.NewGuid().ToString(),
+                RecipeName = Name,
+                localMaterails = Materails,
+            });
+
+            Json<JsonLocalRecipes>.Save();
+            ActionManage.GetInstance.Send("RecipeConfigeViewClose");
+        }
+
+        public RecipeConfigeViewModel()
+        {
+            if(Json<JsonLocalRecipes>.Data.localMaterails.Count > 0)
+            {
+                foreach(var item in Json<JsonLocalRecipes>.Data.localMaterails)
+                {
+                    if(item.MaterialID!=null&&item.MaterialName!=null)
+                    {
+                        materialNames.Add(item.MaterialID, item.MaterialName);
+                    }
+                }
+            }
+            Materails.Clear();
+        }
+    }
+}
diff --git a/BPASmartClient.Model/BPASmartClient.Model.csproj b/BPASmartClient.Model/BPASmartClient.Model.csproj
index 1b4a839d..953b9861 100644
--- a/BPASmartClient.Model/BPASmartClient.Model.csproj
+++ b/BPASmartClient.Model/BPASmartClient.Model.csproj
@@ -21,4 +21,8 @@
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="奶咖一体机\" />
+  </ItemGroup>
+
 </Project>
diff --git a/BPASmartClient.MorkF/Control_MorkF.cs b/BPASmartClient.MorkF/Control_MorkF.cs
index 11233b4b..87fecb75 100644
--- a/BPASmartClient.MorkF/Control_MorkF.cs
+++ b/BPASmartClient.MorkF/Control_MorkF.cs
@@ -35,55 +35,38 @@ namespace BPASmartClient.MorkF
         #region 调试代码
         public void CommandRegist()
         {
+            #region 设备控制
             ActionManage.GetInstance.Register(PLCInite, "InitCommand");
             ActionManage.GetInstance.Register(InitialData, "SimultaorOrder");
-            ActionManage.GetInstance.Register(MaterialOne, "MaterialOne");
-            ActionManage.GetInstance.Register(MaterialTwo, "MaterialTwo");
-            ActionManage.GetInstance.Register(MaterialThree, "MaterialThree");
-            ActionManage.GetInstance.Register(MaterialFour, "MaterialFour");
-            ActionManage.GetInstance.Register(MaterialFive, "MaterialFive");
-            ActionManage.GetInstance.Register(ManualOpenExhaust, "OpenExhaust");
-            ActionManage.GetInstance.Register(CloseExhaust, "CloaseExhaust");
-            ActionManage.GetInstance.Register(StartQX, "StartQXOne");
-            ActionManage.GetInstance.Register(StartQX, "StartQXTwo");
-
+           
+            #endregion
             ActionManage.GetInstance.Register(ShreddCabbage, "ShreddCabbage");
             ActionManage.GetInstance.Register(FryPork, "FryPork");
             ActionManage.GetInstance.Register(XingBaoGu, "XingBaoGu");
 
-            ActionManage.GetInstance.Register(TakePot, "TakePot");
-            ActionManage.GetInstance.Register(TakePotReset, "TakePotReset");
-            ActionManage.GetInstance.Register(TakeMaterial, "TakeMaterial");
-            ActionManage.GetInstance.Register(ManualOutMeal, "OutMeal");
+            #region 配料控制
+            ActionManage.GetInstance.Register(OutMaterials, "OutMaterials");
+            #endregion
 
+            #region 炒锅1
             ActionManage.GetInstance.Register<Action>(AddOil, "AddOil");
-            ActionManage.GetInstance.Register(TakeOff, "TakeOff");
-            ActionManage.GetInstance.Register(OneBlock, "OneBlock");
-            ActionManage.GetInstance.Register(TwoBlock, "TwoBlock");
-            ActionManage.GetInstance.Register(ThreeBlock, "ThreeBlock");
-            ActionManage.GetInstance.Register(OverTurnOff, "OverTurnOff");
-            ActionManage.GetInstance.Register(OverOneBlock, "OverOneBlock");
-            ActionManage.GetInstance.Register(OverTwoBlock, "OverTwoBlock");
-            ActionManage.GetInstance.Register(OverThreeBlock, "OverThreeBlock");
-            ActionManage.GetInstance.Register(OverGoOn, "OverGoOn");
-            ActionManage.GetInstance.Register(OverGoDown, "OverGoDown");
-            ActionManage.GetInstance.Register(AutoModel, "AutoModel");
-            ActionManage.GetInstance.Register(ManualModel, "ManualModel");
-
-            ActionManage.GetInstance.Register<Action>(AddOil, "SecAddOil");
-            ActionManage.GetInstance.Register(TakeOff, "SecTakeOff");
-            ActionManage.GetInstance.Register(OneBlock, "SecOneBlock");
-            ActionManage.GetInstance.Register(TwoBlock, "SecTwoBlock");
-            ActionManage.GetInstance.Register(ThreeBlock, "SecThreeBlock");
-            ActionManage.GetInstance.Register(OverTurnOff, "SecOverTurnOff");
-            ActionManage.GetInstance.Register(OverOneBlock, "SecOverOneBlock");
-            ActionManage.GetInstance.Register(OverTwoBlock, "SecOverTwoBlock");
-            ActionManage.GetInstance.Register(OverThreeBlock, "SecOverThreeBlock");
-            ActionManage.GetInstance.Register(OverGoOn, "SecOverGoOn");
-            ActionManage.GetInstance.Register(OverGoDown, "SecOverGoDown");
-            ActionManage.GetInstance.Register(AutoModel, "SecAutoModel");
-            ActionManage.GetInstance.Register(ManualModel, "SecManualModel");
+            ActionManage.GetInstance.Register(StartFire, "StartFire");
+            ActionManage.GetInstance.Register(StopFire, "StopFire");
+            ActionManage.GetInstance.Register(StartStir, "StartStir");
+            ActionManage.GetInstance.Register(StopStir, "StopStir");
+            ActionManage.GetInstance.Register(OutFood, "OutFood");
+            ActionManage.GetInstance.Register(StirArmGoOrigin, "StirArmGoOrigin");
+            ActionManage.GetInstance.Register(StirArmGoWork, "StirArmGoWork");
+            ActionManage.GetInstance.Register(HBOTGoWork, "HBOTGoWork");
+            ActionManage.GetInstance.Register(OutMeal, "OutMeal");
+            ActionManage.GetInstance.Register(SetFire, "SetFire");
+            ActionManage.GetInstance.Register(SetStir, "SetStir");
+            #endregion
+
+           
         }
+
+        
         /// <summary>
         /// 手撕包菜流程
         /// </summary>
@@ -161,160 +144,91 @@ namespace BPASmartClient.MorkF
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T6, PotActions = new List<StirFryPotAction>() { StirFryPotAction.搅拌臂下位, StirFryPotAction.快速旋转 }, During = 55 });
             stirFryBom.AddAction(new StirFryAction() { Time = StirFryTime.T11, RobotActions = new List<StirFryRobotAction>() { StirFryRobotAction.灶取锅 } });
         }
-        public void StartQX(object obj)
+        //出配料
+        public void OutMaterials(object o)
         {
-
-            if ((int)obj == 1)
-                WriteData("M1.4", true);
-            if ((int)obj == 2)
-                WriteData("M1.7", true);
-        }
-        public void ManualOpenExhaust()
-        {
-            WriteData("M0.7", true);
-        }
-        public void CloseExhaust()
-        {
-            WriteData("M0.7", false);
+            if (o == null) return;
+            if (o is List<int> ints && ints.Count == 2)
+            {
+                WriteControl(morkF.PassWayValue[ints[0]], ints[1]);//写入通道值
+                Thread.Sleep(500);
+                WriteControl(morkF.StartPassWay[ints[0]], true);//开启通道
+            }
         }
-        public void TakeMaterial()
+
+        #region 炒锅1
+        //加热启动
+        public void StartFire()
         {
-            WriteData("M14.1", true);
+            WriteControl("M0.1", true);
         }
-        public void ManualOutMeal()
+        //加热停止
+        public void StopFire()
         {
-            WriteData("M14.2", true);
+            WriteControl("M0.1", false);
         }
-        public void MaterialOne()
+        //搅拌启动
+        public void StartStir()
         {
-            WriteData("M13.0", true);
+            WriteControl("M0.2", true);
         }
-
-        public void MaterialTwo()
+        //搅拌启停止
+        public void StopStir()
         {
-            WriteData("M13.1", true);
+            WriteControl("M0.2", false);
         }
-        public void MaterialThree()
+        //倒菜
+        public void OutFood()
         {
-            WriteData("M13.2", true);
+            WriteControl("M0.3", true);
         }
-        public void MaterialFour()
+        //搅拌臂去原点位
+        public void StirArmGoOrigin()
         {
-            WriteData("M13.3", true);
+            WriteControl("M0.5", true);
         }
-        public void MaterialFive()
+
+        //搅拌臂去炒制位
+        public void StirArmGoWork()
         {
-            WriteData("M13.4", true);
+            WriteControl("M0.6", true);
         }
-        public void AutoModel(object obj)
+        //HBOT放盒子到位
+        public void HBOTGoWork()
         {
-
-            WriteData("0.3", true);
-
+            WriteControl("M0.7", true);
         }
-        public void ManualModel()
+        //出餐启动
+        public void OutMeal()
         {
-            WriteData("0.2", true);
+            WriteControl("M0.4", true);
         }
-        public void AddOil(object obj)
+        //加热挡位设定
+        public void SetFire(object o)
         {
-            if ((int)obj == 1)
+            if(o == null) return;
+            if(o is List<int> ints&&ints.Count == 1)
             {
-                Task.Run(() => { WriteData("M2.7", true); Task.Delay(4000).Wait(); WriteData("M2.7", false); });
+                WriteControl("VW228",ints[0]);
+              
             }
-
-            if ((int)obj == 2)
-            {
-                Task.Run(() => { WriteData("M3.1", true); Task.Delay(4000).Wait(); WriteData("M3.1", false); });
-            }
-        }
-        public void TakePot(object obj)
-        {
-            WriteData("M14.0", true);
-        }
-
-        public void TakePotReset(object obj)
-        {
-            WriteData("M14.0", false);
+            
         }
-        public void TakeOff(object obj)
+        //搅拌挡位设定
+        public void SetStir(object o)
         {
-            if ((int)obj == 1)
-                WriteData("M4.0", new bool[] { false, false, false, false, false, false, false, false });//0000 0000
-            if ((int)obj == 2)
-                WriteData("M5.0", new bool[] { false, false, false, false, false, false, false, false });//0000 0000
+            if (o == null) return;
+            if (o is List<int> ints && ints.Count == 1)
+            {
+                WriteControl("VW230", ints[0]);
+                
+            }
         }
 
-        public void OneBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M4.0", new bool[] { true, false, false, false, false, false, false, false });//0000 0001
-            if ((int)obj == 2)
-                WriteData("M5.0", new bool[] { true, false, false, false, false, false, false, false });//0000 0001
-
+        #endregion
 
-        }
-        public void TwoBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M4.0", new bool[] { false, true, false, false, false, false, false, false });//0000 0010
-            if ((int)obj == 2)
-                WriteData("M5.0", new bool[] { false, true, false, false, false, false, false, false });//0000 0010
-        }
-        public void ThreeBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M4.0", new bool[] { true, true, false, false, false, false, false, false });//0000 0011
-            if ((int)obj == 2)
-                WriteData("M5.0", new bool[] { true, true, false, false, false, false, false, false });//0000 0011
-        }
-        public void OverTurnOff(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M7.0", true);
-            if ((int)obj == 2)
-                WriteData("M7.4", true);
-        }
-        public void OverOneBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M7.1", true);
-            if ((int)obj == 2)
-                WriteData("M7.5", true);
-        }
-        public void OverTwoBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M7.2", true);
-            if ((int)obj == 2)
-                WriteData("M7.6", true);
-        }
-        public void OverThreeBlock(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M7.3", true);
-            if ((int)obj == 2)
-                WriteData("M7.7", true);
-        }
-        public void OverGoOn(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M8.0", true);
-            if ((int)obj == 2)
-                WriteData("M8.4", true);
-        }
 
-        public void OverGoDown(object obj)
-        {
-            if ((int)obj == 1)
-                WriteData("M8.2", true);
-            if ((int)obj == 2)
-                WriteData("M8.6", true);
-        }
-        public void FlowInite()
-        {
 
-        }
         /// <summary>
         /// 订单初始化
         /// </summary>
@@ -594,7 +508,6 @@ namespace BPASmartClient.MorkF
                             morkF.TakePlateQueue.Enqueue(new OrderLocInfo()
                             {
                                 SuborderId = order.MorkOrder.SuborderId,
-
                             });
                         }
                         //}
diff --git a/BPASmartClient.MorkF/GVL_MorkF.cs b/BPASmartClient.MorkF/GVL_MorkF.cs
index 3aa23c03..c2734d8a 100644
--- a/BPASmartClient.MorkF/GVL_MorkF.cs
+++ b/BPASmartClient.MorkF/GVL_MorkF.cs
@@ -299,6 +299,44 @@ namespace BPASmartClient.MorkF
         /// </summary>
         public string CurrentOrderId { get; set; }
         #endregion
+
+
+        public Dictionary<int,string> StartPassWay { get; set; } = new Dictionary<int, string>()
+        {
+            {1,"M3.0" },
+            {2,"M3.1" },
+            {3,"M3.2" },
+            {4,"M3.3" },
+            {5,"M3.4" },
+            {6,"M3.5" },
+            {7,"M3.6" },
+            {8,"M3.7" },
+            {9,"M4.0" },
+            {10,"M4.1" },
+            {11,"M4.2" },
+            {12,"M4.3" },
+            {13,"M4.4" },
+            {13,"M4.5" },
+
+        };
+
+        public Dictionary<int, string> PassWayValue { get; set; } = new Dictionary<int, string>()
+        {
+            {1,"VW200" },
+            {2,"VW202" },
+            {3,"VW204" },
+            {4,"VW206" },
+            {5,"VW208" },
+            {6,"VW210" },
+            {7,"VW212" },
+            {8,"VW214" },
+            {9,"VW216" },
+            {10,"VW218" },
+            {11,"VW220" },
+            {12,"VW222" },
+            {13,"VW224" },
+            {13,"VW226" },
+        };
     }
 }
 
diff --git a/BPASmartClient.MorkF/View/DebugView.xaml b/BPASmartClient.MorkF/View/DebugView.xaml
index b498f462..4d07a7b9 100644
--- a/BPASmartClient.MorkF/View/DebugView.xaml
+++ b/BPASmartClient.MorkF/View/DebugView.xaml
@@ -47,29 +47,49 @@
             </WrapPanel>
         </GroupBox>
         <StackPanel Orientation="Vertical" Grid.Row="2">
-            <GroupBox Header="机器人控制" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="95">
+            <GroupBox Header="配料仓控制" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="95">
                 <WrapPanel Orientation="Horizontal" Grid.RowSpan="2" VerticalAlignment="Top" Margin="0,5,0,0" >
-                    <Button Content="取锅" Command="{Binding TakePot}"  Margin="10,0,10,0"></Button>
-                    <!--<Button Content="取锅复位" Command="{Binding TakePotReset}"  Margin="10,0,10,0"></Button>-->
-                    <Button Content="取料" Command="{Binding TakeMaterial}"  Margin="10,0,10,0"></Button>
-                    <Button Content="出餐" Command="{Binding OutMeal}"  Margin="10,0,10,0"></Button>
+                    <TextBlock Text="通道号" Margin="5,0"/>
+                    <ComboBox ItemsSource="{Binding PassageWays}" Width="120"  Margin="5,0"
+                              SelectedIndex="{Binding PassagePosition}"/>
+                    <TextBlock Text="出料量" Margin="5,0"/>
+                    <TextBox Text="{Binding Weight}" Margin="5,0" Width="100"/>
+                    <TextBlock Text="g" Margin="0,0,10,0"/>
+                    <Button Content="出料" Margin="10,0" Command="{Binding OutMaterials}"/>
                 </WrapPanel>
             </GroupBox>
 
             <GroupBox Header="炒锅1" FontSize="15" Foreground="Aqua" VerticalAlignment="Center" Height="140">
-                <WrapPanel VerticalAlignment="Top" Margin="0,5,0,0">
-                    <Button Content="注油" Command="{Binding AddOil}"  Margin="10,0,10,0"></Button>
-                    <Button Content="加热关闭" Command="{Binding TempTurnOff}"   Margin="10,0,10,0"></Button>
-                    <Button Content="加热1挡" Command="{Binding OneBlock}" Margin="10,0,10,0"></Button>
-                    <Button Content="加热2挡" Command="{Binding TwoBlock}"  Margin="10,0,10,0"></Button>
-                    <Button Content="加热3挡" Command="{Binding ThreeBlock}"  Margin="10,0,10,0"></Button>
-                    <Button Content="翻炒机关闭" Command="{Binding OverTurnOff}"  Margin="10,0,10,0" Cursor="Hand"></Button>
-                    <Button Content="翻炒机上升" Command="{Binding OverGoOn}"  Margin="10,0,15,0" Cursor="Hand"></Button>
-                    <Button Content="翻炒机下降" Command="{Binding OverGoDown}"  Margin="10,0,10,0"></Button>
-                    <Button Content="翻炒机1挡" Command="{Binding OverOneBlock}"  Margin="10,0,10,0"></Button>
-                    <Button Content="翻炒机2挡" Command="{Binding OverTwoBlock}"   Margin="10,0,10,0"></Button>
-                    <Button Content="翻炒机3挡" Command="{Binding OverThreeBlock}"   Margin="10,0,10,0"></Button>
-                </WrapPanel>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
+                    <WrapPanel VerticalAlignment="Top" Margin="0,5,0,0">
+                        <Button Content="注油" Command="{Binding AddOil}"  Margin="10,0,10,0"></Button>
+                        <Button Content="加热启动" Command="{Binding StartFire}"   Margin="10,0,10,0"></Button>
+                        <Button Content="加热停止" Command="{Binding StopFire}"   Margin="10,0,10,0"></Button>
+                        <Button Content="搅拌启动" Command="{Binding StartStir}"  Margin="10,0,10,0" Cursor="Hand"></Button>
+                        <Button Content="搅拌停止" Command="{Binding StopStir}"  Margin="10,0,15,0" Cursor="Hand"></Button>
+                        <Button Content="倒菜启动" Command="{Binding OutFood}"  Margin="10,0,15,0" Cursor="Hand"/>
+                        <Button Content="搅拌臂去原点位" Command="{Binding StirArmGoOrigin}"  Margin="10,0,10,0"></Button>
+                        <Button Content="搅拌臂去炒制位" Command="{Binding StirArmGoWork}"  Margin="10,0,10,0"></Button>
+                        <Button Content="HBOT放盒子到位" Command="{Binding HBOTGoWork}"   Margin="10,0,10,0"></Button>
+                        <Button Content="出餐启动" Command="{Binding OutMeal}"   Margin="10,0,10,0"></Button>
+                    </WrapPanel>
+                  
+                    <WrapPanel Grid.Row="2">
+                        <TextBlock Text="加热挡位:"  Margin="10,0,0,0" />
+                        <ComboBox ItemsSource="{Binding lstFire}" Width="80" Margin="10,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                  SelectedValue="{Binding FireGear}"/>
+                        <Button Content="设定" Margin="0,0,30,0" Command="{Binding SetFire}"/>
+                        <TextBlock Text="搅拌挡位:"  Margin="10,0,0,0" />
+                        <ComboBox ItemsSource="{Binding lstStir}" Width="80" Margin="10,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                  SelectedValue="{Binding StirGear}"/>
+                        <Button Content="设定" Margin="0,0,30,0" Command="{Binding SetStir}"/>
+                    </WrapPanel>
+                </Grid>
+                
             </GroupBox>
             <GroupBox Header="炒锅2" FontSize="15" Foreground="Aqua"  VerticalAlignment="Center" Height="140">
                 <WrapPanel VerticalAlignment="Top" Margin="0,5,0,0">
diff --git a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
index 3ddf16ab..e11d25a0 100644
--- a/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
+++ b/BPASmartClient.MorkF/ViewModel/DebugViewModel.cs
@@ -13,7 +13,7 @@ namespace BPASmartClient.MorkF.ViewModel
     internal class DebugViewModel : ObservableObject
     {
         public bool SimOrderEnable { get { return General_Config.SimOrderAllow; } set { General_Config.SimOrderAllow = value; OnPropertyChanged(); } }
-
+        #region 设备控制
         public RelayCommand PlcInite { get; set; }
         public RelayCommand SimulateOrder { get; set; }
         public RelayCommand MaterialOne { get; set; }
@@ -25,31 +25,64 @@ namespace BPASmartClient.MorkF.ViewModel
         public RelayCommand CloaseExhaust { get; set; }
         public RelayCommand StartQXOne { get; set; }
         public RelayCommand StartQXTwo { get; set; }
+        #endregion
 
+        #region 菜品控制
 
         public RelayCommand ShreddCabbage { get; set; }
         public RelayCommand FryPork { get; set; }
         public RelayCommand XingBaoGu { get; set; }
+        #endregion
 
-        public RelayCommand TakePot { get; set; }
-        public RelayCommand TakePotReset { get; set; }
-        public RelayCommand TakeMaterial { get; set; }
-        public RelayCommand OutMeal { get; set; }
 
+        #region 配料仓控制
+        public List<string> PassageWays = new List<string>() 
+        { 
+            "通道1",
+            "通道2",
+            "通道3",
+            "通道4",
+            "通道5",
+            "通道6",
+            "通道7",
+            "通道8",
+            "通道9",
+            "通道10",
+            "通道11",
+            "通道12",
+            "通道13",
+            "通道14",
+        };
+        public int PassagePosition { get { return _passagePosition; } set { _passagePosition = value; OnPropertyChanged(); } }
+        private int _passagePosition;
+        public int Weight { get { return _weight; } set { _weight = value; OnPropertyChanged(); } }
+        private int _weight;
+        public RelayCommand OutMaterials { get; set; }
+        #endregion
+
+        #region 炒锅1
         public RelayCommand AddOil { get; set; }
-        public RelayCommand TempTurnOff { get; set; }
-        public RelayCommand OneBlock { get; set; }
-        public RelayCommand TwoBlock { get; set; }
-        public RelayCommand ThreeBlock { get; set; }
-        public RelayCommand OverTurnOff { get; set; }
-        public RelayCommand OverOneBlock { get; set; }
-        public RelayCommand OverTwoBlock { get; set; }
-        public RelayCommand OverThreeBlock { get; set; }
-        public RelayCommand OverGoOn { get; set; }
-        public RelayCommand OverGoDown { get; set; }
-        public RelayCommand AutoModel { get; set; }
-        public RelayCommand ManualModel { get; set; }
+        public RelayCommand StartFire { get; set; }
+        public RelayCommand StopFire { get; set; }
+        public RelayCommand StartStir { get; set; }
+        public RelayCommand StopStir { get; set; }
+        public RelayCommand OutFood { get; set; }
+        public RelayCommand StirArmGoOrigin { get; set; }
+        public RelayCommand StirArmGoWork { get; set; }
+        public RelayCommand HBOTGoWork { get; set; }
+        public RelayCommand OutMeal { get; set; }
+        public RelayCommand SetFire { get; set; }
+        public RelayCommand SetStir { get; set; }
+        public List<int> lstFire { get; set; } = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+        public List<int> lstStir { get; set; } = new List<int>() { 1, 2, 3 };
+        public int FireGear { get { return _fireGear; } set { _fireGear = value; OnPropertyChanged(); } }
+        private int _fireGear;
+        public int StirGear { get { return _stirGear; } set { _stirGear = value; OnPropertyChanged(); } }
+        private int _stirGear;
+        #endregion
 
+
+        #region 炒锅2
         public RelayCommand SecAddOil { get; set; }
         public RelayCommand SecTempTurnOff { get; set; }
         public RelayCommand SecOneBlock { get; set; }
@@ -63,44 +96,51 @@ namespace BPASmartClient.MorkF.ViewModel
         public RelayCommand SecOverGoDown { get; set; }
         public RelayCommand SecAutoModel { get; set; }
         public RelayCommand SecManualModel { get; set; }
+        #endregion
+
         public DebugViewModel()
         {
+            #region 设备控制
             PlcInite = new RelayCommand(() => { ActionManage.GetInstance.Send("InitCommand"); });
-
-            SimulateOrder = new RelayCommand(() => {ActionManage.GetInstance.Send("SimultaorOrder"); });
-            MaterialOne= new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialOne"); });
+            SimulateOrder = new RelayCommand(() => { ActionManage.GetInstance.Send("SimultaorOrder"); });
+            MaterialOne = new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialOne"); });
             MaterialTwo = new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialTwo"); });
             MaterialThree = new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialThree"); });
             MaterialFour = new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialFour"); });
             MaterialFive = new RelayCommand(() => { ActionManage.GetInstance.Send("MaterialFive"); });
             OpenExhaust = new RelayCommand(() => { ActionManage.GetInstance.Send("OpenExhaust"); });
             CloaseExhaust = new RelayCommand(() => { ActionManage.GetInstance.Send("CloseExhaust"); });
-            StartQXOne=new RelayCommand(() => { ActionManage.GetInstance.Send("StartQXOne",1); });
-            StartQXTwo = new RelayCommand(() => { ActionManage.GetInstance.Send("StartQXTwo",2); });
-
+            StartQXOne = new RelayCommand(() => { ActionManage.GetInstance.Send("StartQXOne", 1); });
+            StartQXTwo = new RelayCommand(() => { ActionManage.GetInstance.Send("StartQXTwo", 2); });
+            #endregion
             ShreddCabbage = new RelayCommand(() => { ActionManage.GetInstance.Send("ShreddCabbage"); });
             FryPork = new RelayCommand(() => { ActionManage.GetInstance.Send("FryPork"); });
             XingBaoGu = new RelayCommand(() => { ActionManage.GetInstance.Send("XingBaoGu"); });
 
-            TakePot = new RelayCommand(() => { ActionManage.GetInstance.Send("TakePot"); });
-            TakePotReset = new RelayCommand(() => { ActionManage.GetInstance.Send("TakePotReset"); });
-            TakeMaterial= new RelayCommand(() => { ActionManage.GetInstance.Send("TakeMaterial"); });
-            OutMeal = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMeal"); });
-
-            AddOil = new RelayCommand(() => { ActionManage.GetInstance.Send("AddOil", 1); });
-            TempTurnOff = new RelayCommand(() => { ActionManage.GetInstance.Send("TakeOff", 1); });
-            OneBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("OneBlock",1); });
-            TwoBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("TwoBlock",1); });
-            ThreeBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("ThreeBlock",1); });
-            OverTurnOff = new RelayCommand(() => { ActionManage.GetInstance.Send("OverTurnOff",1); });
-            OverOneBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("OverOneBlock",1); });
-            OverTwoBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("OverTwoBlock",1); });
-            OverThreeBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("OverThreeBlock",1); });
-            OverGoOn = new RelayCommand(() => { ActionManage.GetInstance.Send("OverGoOn",1); });
-            OverGoDown = new RelayCommand(() => { ActionManage.GetInstance.Send("OverGoDown",1); });
-            AutoModel = new RelayCommand(()=>{ActionManage.GetInstance.Send("AutoModel",1); });
-            ManualModel = new RelayCommand(() => { ActionManage.GetInstance.Send("ManualModel",1); });
 
+            #region 配料仓控制
+            OutMaterials = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMaterials" ,new List<int> { PassagePosition,Weight } ); });
+            #endregion
+
+
+            #region 炒锅1
+            AddOil = new RelayCommand(() => { ActionManage.GetInstance.Send("AddOil", 1); });//加油
+            StartFire = new RelayCommand(() => { ActionManage.GetInstance.Send("StartFire"); });//加热启动
+            StopFire = new RelayCommand(() => { ActionManage.GetInstance.Send("StopFire"); });//加热停止
+            StartStir = new RelayCommand(() => { ActionManage.GetInstance.Send("StartStir"); });//搅拌启动
+            StopStir = new RelayCommand(() => { ActionManage.GetInstance.Send("StopStir"); });//搅拌停止
+            OutFood = new RelayCommand(() => { ActionManage.GetInstance.Send("OutFood"); });//倒菜启动
+            StirArmGoOrigin = new RelayCommand(() => { ActionManage.GetInstance.Send("StirArmGoOrigin"); });//搅拌臂去原点位
+            StirArmGoWork = new RelayCommand(() => { ActionManage.GetInstance.Send("StirArmGoWork"); });//搅拌臂去炒制位
+            HBOTGoWork = new RelayCommand(() => { ActionManage.GetInstance.Send("HBOTGoWork"); });//放盒子到位
+            OutMeal = new RelayCommand(() => { ActionManage.GetInstance.Send("OutMeal"); });//出餐启动
+            SetFire = new RelayCommand(() => { ActionManage.GetInstance.Send("SetFire", new List<int> { FireGear }); });//加热挡位设定
+            SetStir = new RelayCommand(() => { ActionManage.GetInstance.Send("SetStir", new List<int> { StirGear }); });//搅拌挡位设定
+            #endregion
+
+
+
+            #region 炒锅2
             SecAddOil = new RelayCommand(() => { ActionManage.GetInstance.Send("AddOil", 2); });
             SecTempTurnOff = new RelayCommand(() => { ActionManage.GetInstance.Send("TakeOff", 2); });
             SecOneBlock = new RelayCommand(() => { ActionManage.GetInstance.Send("OneBlock", 2); });
@@ -114,7 +154,8 @@ namespace BPASmartClient.MorkF.ViewModel
             SecOverGoDown = new RelayCommand(() => { ActionManage.GetInstance.Send("OverGoDown", 2); });
             SecAutoModel = new RelayCommand(() => { ActionManage.GetInstance.Send("AutoModel", 2); });
             SecManualModel = new RelayCommand(() => { ActionManage.GetInstance.Send("ManualModel", 2); });
+            #endregion
         }
-       
+
     }
 }
diff --git a/BPASmartClient.MorkMOC/BPASmartClient.MorkMOC.csproj b/BPASmartClient.MorkMOC/BPASmartClient.MorkMOC.csproj
index f7208f75..ffb381c2 100644
--- a/BPASmartClient.MorkMOC/BPASmartClient.MorkMOC.csproj
+++ b/BPASmartClient.MorkMOC/BPASmartClient.MorkMOC.csproj
@@ -1,11 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\BPASmartClient.Device\BPASmartClient.Device.csproj" />
   </ItemGroup>
diff --git a/BPASmartClient.MorkMOC/Control_MorkMOC.cs b/BPASmartClient.MorkMOC/Control_MorkMOC.cs
index 9c773547..1b06589b 100644
--- a/BPASmartClient.MorkMOC/Control_MorkMOC.cs
+++ b/BPASmartClient.MorkMOC/Control_MorkMOC.cs
@@ -1,6 +1,7 @@
 using BPA.Message.Enum;
 using BPASmartClient.Device;
 using BPASmartClient.EventBus;
+using BPASmartClient.Helper;
 using BPASmartClient.Model;
 using System;
 using System.Collections.Generic;
@@ -13,15 +14,15 @@ namespace BPASmartClient.MorkMOC
 {
     public class Control_MorkMOC : BaseDevice
     {
+        public override global::BPA.Message.Enum.DeviceClientType DeviceType { get { return BPA.Message.Enum.DeviceClientType.TMC_MT; } }
+
         GVL_MorkMOC morkMoc = new GVL_MorkMOC();
 
         PolymerBatching polymerBatching = new PolymerBatching();
 
         //放大倍数
         const int expand = 10;
-
-        public override DeviceClientType DeviceType => throw new NotImplementedException();
-
+        
         public override void DoMain()
         {
             ServerInit();
@@ -178,7 +179,25 @@ namespace BPASmartClient.MorkMOC
 
         public override void SimOrder()
         {
-            throw new NotImplementedException();
+            ActionManage.GetInstance.Register(new Action<object>((o) =>
+            {
+                if (o == null) return;
+                if(o is LocalRecipe recipe)
+                {
+                    Dictionary<int, int> OrderPushes = new Dictionary<int, int>();
+                    foreach(var item in recipe.localMaterails)
+                    {
+                        OrderPushes.Add(Convert.ToInt32(item.MaterialPosition), Convert.ToInt32(item.MaterialWeight));
+                    }
+                    
+                    morkMoc.morkOrderPushes.Enqueue(new OrderLocInfo()
+                    {
+                        GoodName = recipe.RecipeName,
+                        SuborderId = Guid.NewGuid().ToString(),
+                        GoodPushes = OrderPushes
+                    });
+                }
+            }),"MakeGoods");
         }
 
         public override void Stop()
diff --git a/BPASmartClient.MorkMOC/Model/LocalMaterail.cs b/BPASmartClient.MorkMOC/Model/LocalMaterail.cs
new file mode 100644
index 00000000..bb0595a8
--- /dev/null
+++ b/BPASmartClient.MorkMOC/Model/LocalMaterail.cs
@@ -0,0 +1,55 @@
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.MorkMOC
+{
+    public partial class LocalMaterail:ObservableObject
+    {
+        /// <summary>
+        /// 物料ID
+        /// </summary>
+        [ObservableProperty]
+        private string? _materialID;
+       /// <summary>
+       /// 物料本地名称
+       /// </summary>
+        [ObservableProperty]
+        private string? _materialName;
+        /// <summary>
+        /// 物料位置
+        /// </summary>
+        [ObservableProperty]
+        private int? _materialPosition;
+        /// <summary>
+        /// 物料重量
+        /// </summary>
+        [ObservableProperty]
+        private string? _materialWeight;
+
+       
+
+    }
+
+    public partial class LocalRecipe:ObservableObject
+    {
+        /// <summary>
+        /// 配方ID
+        /// </summary>
+        [ObservableProperty]
+        private string? _recipeID;
+        /// <summary>
+        /// 配方名称
+        /// </summary>
+        [ObservableProperty]
+        private string? _recipeName;
+        /// <summary>
+        /// 原料集合
+        /// </summary>
+        public ObservableCollection<LocalMaterail> localMaterails { get; set; } = new ObservableCollection<LocalMaterail>();
+    }
+}
diff --git a/BPASmartClient.MorkMOC/OrderLocInfo.cs b/BPASmartClient.MorkMOC/OrderLocInfo.cs
index 47b4e0bb..3caa55d6 100644
--- a/BPASmartClient.MorkMOC/OrderLocInfo.cs
+++ b/BPASmartClient.MorkMOC/OrderLocInfo.cs
@@ -10,6 +10,9 @@ namespace BPASmartClient.MorkMOC
         public string SuborderId { get; set; }
         public ushort RecipeNumber { get; set; }
         public string GoodName { get; set; }
+        /// <summary>
+        /// 物料位置，物料重量
+        /// </summary>
         public Dictionary<int, int> GoodPushes { get; set; }
     }
 
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index c9825e30..a04aea4f 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -271,9 +271,11 @@ namespace BPASmartClient.MorkS
                  {
                      mORKS.doOrderEvents.Add(order);
                      if (order.MorkOrder.GoodBatchings == null) return;
+                     if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
                      OrderCount++;
                      OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
                      DeviceProcessLogShow($"接收到{OrderCount}次订单，订单ID：{order.MorkOrder.SuborderId}");
+                     mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
                      foreach (var item in order.MorkOrder.GoodBatchings)
                      {
                          var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
diff --git a/BPASmartClient.MorkS/GVL_MORKS.cs b/BPASmartClient.MorkS/GVL_MORKS.cs
index 84007e12..5a16dc8c 100644
--- a/BPASmartClient.MorkS/GVL_MORKS.cs
+++ b/BPASmartClient.MorkS/GVL_MORKS.cs
@@ -12,6 +12,7 @@ namespace BPASmartClient.MorkS
 {
     public class GVL_MORKS : IStatus
     {
+        public List<string> HistorySuborderId { get; set; } = new List<string>();
         /// <summary>
         /// 机器人取面
         /// PLC -> M0.3
diff --git a/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs b/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs
index 63350bfb..f807b408 100644
--- a/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs
+++ b/BPASmartClient.MorkTM/Model/LocalTeaWithMilkConfig.cs
@@ -29,6 +29,10 @@ namespace Model
         public int MaterialID { get { return _materialID; } set { _materialID = value; OnPropertyChanged(); } }
         private int _materialID =1;
         /// <summary>
+        /// 物料本地名称
+        /// </summary>
+        public string MaterialName;
+        /// <summary>
         /// 物料位置
         /// </summary>
         public string Material { get { return _material; } set { _material = value; OnPropertyChanged(); } } 
diff --git a/BPASmartClient/App.config b/BPASmartClient/App.config
index 1576a7da..74ca865b 100644
--- a/BPASmartClient/App.config
+++ b/BPASmartClient/App.config
@@ -6,20 +6,19 @@
     <!--<add key="ClientId" value="43"/>-->
     <add key="IsEnableTest" value="false"/>
 
-    <!--测试环境--><!--
-    <add key="apollouri" value="http://10.2.1.21:28080/"/>
-    <add key="AppId" value="test1_HostComputer"/>
-    <add key ="Namespaces" value="DEV.test1.Config"/>-->
-
+    <!--测试环境-->
+	  <!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
+	  <add key="AppId" value="test1_HostComputer"/>
+	  <add key ="Namespaces" value="DEV.test1.Config"/>-->
     <!--开发环境-->
-    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
-    <add key="AppId" value="HostComputer"/>
-    <add key ="Namespaces" value="DEV.Config"/>-->
+	  <add key="apollouri" value="http://10.2.1.21:28080/"/>
+	  <add key="AppId" value="HostComputer"/>
+	  <add key ="Namespaces" value="DEV.Config"/>
 
 	  <!--正式环境-->
-    <add key="apollouri" value="http://47.108.65.220:28080/"/>
+    <!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
     <add key="appid" value="hostcomputer"/>
-    <add key ="namespaces" value="test1.config"/>
+    <add key ="namespaces" value="test1.config"/>-->
 
     <!--阿里云上报启动方式:API 或者 LOCAL-->
     <!--API  :通过客户端ID,调用接口查询“设备连接信息”-->

From cd94acbf7e02477c7b52f949b12c7f987357e567 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 14:29:39 +0800
Subject: [PATCH 15/19] 1

---
 WPFDemo/TheListBox.xaml    | 9 +++++++++
 WPFDemo/TheListBox.xaml.cs | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/WPFDemo/TheListBox.xaml b/WPFDemo/TheListBox.xaml
index 2c6eddc9..423dd812 100644
--- a/WPFDemo/TheListBox.xaml
+++ b/WPFDemo/TheListBox.xaml
@@ -10,6 +10,7 @@
               ItemsSource="{Binding ViewItems,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   
               Background="{x:Null}" Foreground="White" 
               PreviewMouseMove="ListView_PreviewMouseMove"
+              MouseMove="listView_MouseMove"
               PreviewMouseLeftButtonUp="lisbox_PreviewMouseLeftButtonUp">
         <ListBox.ItemTemplate>
             <ItemContainerTemplate>
@@ -18,9 +19,17 @@
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="60"/>
                             <ColumnDefinition/>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="60"/>
                         </Grid.ColumnDefinitions>
                         <TextBlock Margin="10,0,10,0" Grid.Column="0" Text="{Binding Name,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
                         <TextBlock Grid.Column="1" Text="{Binding Ph,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                        <TextBox Width="100" Grid.Column="1"></TextBox>
+                        <ComboBox Grid.Column="2" Width="60">
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                        </ComboBox>
                     </Grid>
                 </Border>
             </ItemContainerTemplate>
diff --git a/WPFDemo/TheListBox.xaml.cs b/WPFDemo/TheListBox.xaml.cs
index 9b016e32..e14b9eb4 100644
--- a/WPFDemo/TheListBox.xaml.cs
+++ b/WPFDemo/TheListBox.xaml.cs
@@ -249,6 +249,12 @@ namespace WPFDemo
             this.DropPopup.IsOpen = true;
         }
         #endregion
+
+        private void listView_MouseMove(object sender, MouseEventArgs e)
+        {
+            if (isDown == false) return;
+            ;
+        }
     }
     /// <summary>
     /// 当前项数据Model

From 94e248b18bd7e5b55c4d65775778a2321c40c4d9 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 15:25:01 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomerControls/FYFTheListBox.xaml       |  37 ++
 .../CustomerControls/FYFTheListBox.xaml.cs    | 391 ++++++++++++++++++
 BeDesignerSCADA/BeDesignerSCADA.csproj        |   1 +
 .../Controls/CanvasPanelNew.xaml.cs           |  12 +-
 BeDesignerSCADA/Helper/SystemHelper.cs        |  62 +++
 WPFDemo/TheListBox.xaml                       |   1 -
 WPFDemo/TheListBox.xaml.cs                    |   5 -
 7 files changed, 502 insertions(+), 7 deletions(-)
 create mode 100644 BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml
 create mode 100644 BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml.cs

diff --git a/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml b/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml
new file mode 100644
index 00000000..1d5f0f01
--- /dev/null
+++ b/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml
@@ -0,0 +1,37 @@
+<UserControl x:Class="BPASmartClient.SCADAControl.CustomerControls.FYFTheListBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BPASmartClient.SCADAControl.CustomerControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <ListView 
+              ItemsSource="{Binding ViewItems,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   
+              Background="{x:Null}" Foreground="White" 
+              PreviewMouseMove="ListView_PreviewMouseMove"
+              PreviewMouseLeftButtonUp="lisbox_PreviewMouseLeftButtonUp">
+        <ListBox.ItemTemplate>
+            <ItemContainerTemplate>
+                <Border x:Name="border" Tag="border" BorderBrush="Aquamarine" MouseLeftButtonDown="Border_MouseLeftButtonDown" BorderThickness="1" Padding="5" Background="#FF18888A">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="60"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="100"/>
+                            <ColumnDefinition Width="60"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Margin="10,0,10,0" Grid.Column="0" Text="{Binding Name,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                        <TextBlock Grid.Column="1" Text="{Binding Ph,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"></TextBlock>
+                        <TextBox Width="100" Grid.Column="1"></TextBox>
+                        <ComboBox Grid.Column="2" Width="60">
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                            <ComboBoxItem>sdsds</ComboBoxItem>
+                        </ComboBox>
+                    </Grid>
+                </Border>
+            </ItemContainerTemplate>
+        </ListBox.ItemTemplate>
+    </ListView>
+</UserControl>
diff --git a/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml.cs b/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml.cs
new file mode 100644
index 00000000..a72fba62
--- /dev/null
+++ b/BPASmartClient.SCADAControl/CustomerControls/FYFTheListBox.xaml.cs
@@ -0,0 +1,391 @@
+using BPASmartClient.Compiler;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+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.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.SCADAControl.CustomerControls
+{
+    /// <summary>
+    /// FYFTheListBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class FYFTheListBox : UserControl
+    {
+        /// <summary>
+        /// 数据model
+        /// </summary>
+        public ListBoxDataModel TheListBoxModel = new ListBoxDataModel();
+        public event EventHandler PropertyChange;  //声明一个事件
+        ListView listView = null;
+        public FYFTheListBox()
+        {
+            InitializeComponent();
+            this.DataContext = TheListBoxModel;
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "张三", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "李四", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "王麻子", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "二货", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "张三1", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "李四2", Ph = "125486545" });
+            TheListBoxModel.ViewItems.Add(new ItemModel { Name = "王麻子3", Ph = "125486545" });
+            this.SizeChanged += Silos_SizeChanged; ;
+        }
+        private void Silos_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (listView == null)
+            {
+                foreach (ListView tb in Utils.FindVisualChildren<ListView>(this))
+                {
+                    // do something with tb here
+                    listView = tb;
+                }
+            }
+        }
+
+        public string ControlType => "控件";
+
+        private bool isExecuteState;
+        public bool IsExecuteState
+        {
+            get { return isExecuteState; }
+            set
+            {
+                isExecuteState = value;
+                if (IsExecuteState)
+                {
+                    Register();
+                }
+            }
+        }
+        public void Register()
+        {
+
+        }
+
+        #region 移动事件
+        /// <summary>
+        /// 当前拖动子控件流
+        /// </summary>
+        private UIElement ChildElement;
+        /// <summary>
+        /// 当前拖拽子控件Item
+        /// </summary>
+        private ListBoxItem ChildListBoxItem;
+        /// <summary>
+        /// 是否已经按下
+        /// </summary>
+        private bool isDown = false;
+        /// <summary>
+        /// 当前拖动的Pop窗体
+        /// </summary>
+        private Popup DropPopup = null;
+        /// <summary>
+        /// 鼠标按下事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                //isDown变量是防止多次操作。
+                if (isDown)
+                {
+                    isDown = false;
+                    return;
+                }
+
+                ChildElement = (UIElement)sender;
+                ChildElement.CaptureMouse();//设置了鼠标捕获，这样它可以不受到其它控件的影响。
+                ChildListBoxItem = Utils.FindVisualParent<ListBoxItem>(VisualTreeHelper.HitTest(ChildElement, e.GetPosition(ChildElement)).VisualHit);
+
+                //创建一个Pop,表明拖拽开始
+                CreatePopup(ChildElement, e);
+
+                isDown = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 鼠标抬起事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void lisbox_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                //鼠标未按下返回
+                if (!isDown) return;
+
+                isDown = false;
+
+                //关闭Pop窗体
+                if (this.DropPopup != null)
+                {
+                    this.DropPopup.IsOpen = false;
+                    this.DropPopup.Child = null;
+                    this.DropPopup = null;
+                }
+
+                //蒙层关闭,表明结束拖拽
+                MoveListBoxStyle(null, false);
+
+                //当控件具有鼠标捕获的话，则释放该捕获。
+                ChildElement.ReleaseMouseCapture();
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        /// <summary>
+        /// 鼠标移动事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ListView_PreviewMouseMove(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (isDown == false) return;
+
+                if (e.LeftButton != MouseButtonState.Pressed)
+                    lisbox_PreviewMouseLeftButtonUp(null, null);
+
+                Point ptLeftUp = new Point(0, 0);
+                Point ptRightDown = new Point(this.ActualWidth, this.ActualHeight);
+
+                ptLeftUp = this.PointToScreen(ptLeftUp);
+                ptRightDown = this.PointToScreen(ptRightDown);
+
+                double y = e.GetPosition(this).Y;
+                double x = e.GetPosition(this).X;
+
+                if (DropPopup != null)//下面两句是设置Popup控件的位置除以2是想让鼠标在它的中心
+                {
+                    DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)ChildElement).ActualWidth / 2;
+                    DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)ChildElement).ActualHeight / 2;
+                }
+
+                //蒙层打开,表明拖拽开始，设置透明度和显示状态
+                MoveListBoxStyle(e, true);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+        /// <summary>
+        /// 移动效果
+        /// </summary>
+        /// <param name="boxItem"></param>
+        private void MoveListBoxStyle(MouseEventArgs e, bool isBool)
+        {
+            try
+            {
+                if (isBool)//为真，根据鼠标位置设置行透明度和显示状态
+                {
+                    //移动到某行减轻某行 暗黑
+                    foreach (ListBoxItem item in Utils.FindVisualChildren<ListBoxItem>(listView))
+                    {
+                        if (item != ChildListBoxItem)//这就是其他控件
+                        {
+                            double item_width = item.ActualWidth;   //当前行宽
+                            double item_height = item.ActualHeight; //当前行高
+                            double item_x = e.GetPosition(item).X;  //鼠标相对当前行X位移
+                            double item_y = e.GetPosition(item).Y;  //鼠标相对当前行Y位移
+
+                            if (item_y <= item_height && item_y > 0 && item_x > 0 && item_x <= item_width)//鼠标进入哪一行,则将那一行变灰
+                            {
+                                item.Opacity = 0.5;
+                                int lao_index = TheListBoxModel.ViewItems.IndexOf(item.Content as ItemModel);
+                                int new_index = TheListBoxModel.ViewItems.IndexOf(ChildListBoxItem.Content as ItemModel);
+                                TheListBoxModel.ViewItems.Move(lao_index, new_index);
+                            }
+                            else //鼠标没在哪一行，则保持原状
+                            {
+                                item.Opacity = 1;
+                            }
+                        }
+                        else
+                        {
+                            item.Visibility = Visibility.Hidden;
+                        }
+                    }
+                }
+                else//为假 恢复所有行透明度和显示状态
+                {
+                    //移动到某行减轻某行 暗黑
+                    foreach (ListBoxItem item in Utils.FindVisualChildren<ListBoxItem>(listView))
+                    {
+                        item.Opacity = 1;
+                        item.Visibility = Visibility.Visible;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+        /// <summary>
+        /// 创建浮动窗口
+        /// </summary>
+        /// <param name="dragElement"></param>
+        /// <param name="e"></param>
+        private void CreatePopup(Visual dragElement, MouseButtonEventArgs e)
+        {
+            //使用PointToScreen函数可以将点转换为屏幕坐标
+            //首先获取当前窗体的左上角和右下角两点的坐标
+            Point ptLeftUp = new Point(0, 0);
+            //转换获取到这个窗口相对于屏幕两个坐标
+            ptLeftUp = this.PointToScreen(ptLeftUp);
+            //获取myGrid的实际宽高，主
+            double y = e.GetPosition(this).Y;
+            double x = e.GetPosition(this).X;
+
+            //拖拽Popup框
+            this.DropPopup = new Popup();
+            Border border = new Border();
+            border.Margin = new Thickness(0, 0, 8, 8);
+            DropShadowEffect effect = new DropShadowEffect();
+            effect.Opacity = 1;
+            effect.ShadowDepth = -14;
+            effect.BlurRadius = 9;
+            effect.Color = Color.FromArgb(100, 0, 0, 0);
+            border.Effect = effect;
+
+            //矩阵框
+            Rectangle r = new Rectangle();
+            r.Width = ((FrameworkElement)dragElement).ActualWidth;
+            r.Height = ((FrameworkElement)dragElement).ActualHeight;
+            r.Fill = new VisualBrush(dragElement);
+            border.Child = r;
+            this.DropPopup.Child = border;
+            DropPopup.AllowsTransparency = true;
+            DropPopup.HorizontalOffset = ptLeftUp.X + x - ((FrameworkElement)dragElement).ActualWidth / 2;
+            DropPopup.VerticalOffset = ptLeftUp.Y + y - ((FrameworkElement)dragElement).ActualHeight / 2;
+            this.DropPopup.IsOpen = true;
+        }
+        #endregion
+    }
+    /// <summary>
+    /// 当前项数据Model
+    /// </summary>
+    public class ListBoxDataModel : ObservableObject
+    {
+        private ObservableCollection<ItemModel> _ViewItems;
+        public ObservableCollection<ItemModel> ViewItems
+        {
+            get
+            {
+                return _ViewItems;
+            }
+            set
+            {
+                _ViewItems = value;
+                OnPropertyChanged("ViewItems");
+            }
+        }
+        public ListBoxDataModel()
+        {
+            ViewItems = new ObservableCollection<ItemModel>();
+        }
+    }
+    /// <summary>
+    /// 行数据Model
+    /// </summary>
+    public class ItemModel : ObservableObject
+    {
+        private string _Name;
+        public string Name
+        {
+            get
+            {
+                return _Name;
+            }
+            set
+            {
+                _Name = value;
+                OnPropertyChanged("Name");
+            }
+        }
+        private string _Ph;
+        public string Ph
+        {
+            get
+            {
+                return _Ph;
+            }
+            set
+            {
+                _Ph = value;
+                OnPropertyChanged("Ph");
+            }
+        }
+    }
+    /// <summary>
+    /// 帮助类
+    /// </summary>
+    internal static class Utils
+    {
+        /// <summary>
+        /// 根据子元素查找父元素
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static T FindVisualParent<T>(DependencyObject obj) where T : class
+        {
+            while (obj != null)
+            {
+                if (obj is T)
+                    return obj as T;
+
+                obj = VisualTreeHelper.GetParent(obj);
+            }
+            return null;
+        }
+        /// <summary>
+        /// 查询子控件
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
+        {
+            if (depObj != null)
+            {
+                for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++)
+                {
+                    DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
+                    if (child != null && child is T)
+                    {
+                        yield return (T)child;
+                    }
+
+                    foreach (T childOfChild in FindVisualChildren<T>(child))
+                    {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/BeDesignerSCADA/BeDesignerSCADA.csproj b/BeDesignerSCADA/BeDesignerSCADA.csproj
index 59a1df02..6144742d 100644
--- a/BeDesignerSCADA/BeDesignerSCADA.csproj
+++ b/BeDesignerSCADA/BeDesignerSCADA.csproj
@@ -87,6 +87,7 @@
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="MQTTnet" Version="3.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NPinyinPro" Version="0.3.3" />
     <PackageReference Include="StackExchange.Redis" Version="2.6.66" />
   </ItemGroup>
 
diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
index a7220f10..5eab451c 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml.cs
@@ -45,9 +45,19 @@ namespace BeDesignerSCADA.Controls
             viewModel.LayoutsPath = _Path;
             this.DataContext = viewModel;
             viewModel.Loaded(cav, runCanvas);
+
             //控件加载
             Assembly assembly = Assembly.LoadFile($"{System.AppDomain.CurrentDomain.BaseDirectory}\\BPASmartClient.SCADAControl.dll"); //Assembly.GetExecutingAssembly();
-            CtlList.ItemsSource = assembly.GetTypes().Where(t => t.GetInterface("IExecutable") != null).OrderBy(o => o.Name)?.ToList();
+            List<Type> types = assembly.GetTypes().Where(t => t.GetInterface("IExecutable") != null)?.ToList();
+            List<Type> typesView = new List<Type>();
+            viewModel.ControlsNameValues.ToList().OrderBy(o => o.Value)?.ToList().ForEach(par => 
+            {
+                Type type= types?.Find(p => p.Name == par.Key);
+                if (type != null)
+                    typesView.Add(type);
+            });
+            CtlList.ItemsSource = typesView;
+
             //读取文件
             FileRead(_Path);
         }
diff --git a/BeDesignerSCADA/Helper/SystemHelper.cs b/BeDesignerSCADA/Helper/SystemHelper.cs
index e8ec91ac..45e9a2d7 100644
--- a/BeDesignerSCADA/Helper/SystemHelper.cs
+++ b/BeDesignerSCADA/Helper/SystemHelper.cs
@@ -247,6 +247,68 @@ namespace BeDesignerSCADA.Helper
             scrollViewer.ScrollToHorizontalOffset(tarPos.X);
         }
 
+        private static Encoding gb2312 = Encoding.GetEncoding("GB2312");
+
+        /// <summary>
+        /// 汉字转全拼
+        /// </summary>
+        /// <param name="strChinese"></param>
+        /// <returns></returns>
+        public static string ConvertToAllSpell(string strChinese)
+        {
+            try
+            {
+                if (strChinese.Length != 0)
+                {
+                    StringBuilder fullSpell = new StringBuilder();
+                    for (int i = 0; i < strChinese.Length; i++)
+                    {
+                        var chr = strChinese[i];
+                        fullSpell.Append(GetSpell(chr));
+                    }
+                    return fullSpell.ToString().ToUpper();
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("出错！" + e.Message);
+            }
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// 汉字转首字母
+        /// </summary>
+        /// <param name="strChinese"></param>
+        /// <returns></returns>
+        public static string GetFirstSpell(string strChinese)
+        {
+            try
+            {
+                if (strChinese.Length != 0)
+                {
+                    StringBuilder fullSpell = new StringBuilder();
+                    for (int i = 0; i < strChinese.Length; i++)
+                    {
+                        var chr = strChinese[i];
+                        fullSpell.Append(GetSpell(chr)[0]);
+                    }
+                    return fullSpell.ToString().ToUpper();
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine("出错！" + e.Message);
+            }
+
+            return string.Empty;
+        }
+
+        private static string GetSpell(char chr)
+        {
+            var coverchr = NPinyin.Pinyin.GetPinyin(chr);
+            return coverchr;
+        }
     }
 
     [StructLayout(LayoutKind.Sequential)]
diff --git a/WPFDemo/TheListBox.xaml b/WPFDemo/TheListBox.xaml
index 423dd812..433f3c9e 100644
--- a/WPFDemo/TheListBox.xaml
+++ b/WPFDemo/TheListBox.xaml
@@ -10,7 +10,6 @@
               ItemsSource="{Binding ViewItems,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   
               Background="{x:Null}" Foreground="White" 
               PreviewMouseMove="ListView_PreviewMouseMove"
-              MouseMove="listView_MouseMove"
               PreviewMouseLeftButtonUp="lisbox_PreviewMouseLeftButtonUp">
         <ListBox.ItemTemplate>
             <ItemContainerTemplate>
diff --git a/WPFDemo/TheListBox.xaml.cs b/WPFDemo/TheListBox.xaml.cs
index e14b9eb4..0deb7f72 100644
--- a/WPFDemo/TheListBox.xaml.cs
+++ b/WPFDemo/TheListBox.xaml.cs
@@ -250,11 +250,6 @@ namespace WPFDemo
         }
         #endregion
 
-        private void listView_MouseMove(object sender, MouseEventArgs e)
-        {
-            if (isDown == false) return;
-            ;
-        }
     }
     /// <summary>
     /// 当前项数据Model

From c0d796873404870e0134b733b323fbe6088e009a Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 15:36:50 +0800
Subject: [PATCH 17/19] 1

---
 BeDesignerSCADA/Helper/SystemHelper.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/BeDesignerSCADA/Helper/SystemHelper.cs b/BeDesignerSCADA/Helper/SystemHelper.cs
index 45e9a2d7..b8466704 100644
--- a/BeDesignerSCADA/Helper/SystemHelper.cs
+++ b/BeDesignerSCADA/Helper/SystemHelper.cs
@@ -142,7 +142,6 @@ namespace BeDesignerSCADA.Helper
         private const int DBT_DEVICEREMOVECOMPLETE = 0x8004; //移除设备
         public const int DBT_DEVTYP_PORT = 0x00000003;
         public const int DBT_DEVTYP_VOLUME = 0x00000002;
-
         public IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             if (msg == WM_DEVICECHANGE)
@@ -217,8 +216,6 @@ namespace BeDesignerSCADA.Helper
                 return drives[i];
             return nona;
         }
-
-
         #endregion
 
         /// <summary>
@@ -247,8 +244,6 @@ namespace BeDesignerSCADA.Helper
             scrollViewer.ScrollToHorizontalOffset(tarPos.X);
         }
 
-        private static Encoding gb2312 = Encoding.GetEncoding("GB2312");
-
         /// <summary>
         /// 汉字转全拼
         /// </summary>

From 635b418b6059140f176c118fe2beb8aa94d081a1 Mon Sep 17 00:00:00 2001
From: fyf <FYF@FENGYOUFU>
Date: Sat, 15 Oct 2022 16:16:59 +0800
Subject: [PATCH 18/19] 1

---
 BeDesignerSCADA/Controls/CanvasPanelNew.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
index 1b28f4a1..0ed2cf8f 100644
--- a/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
+++ b/BeDesignerSCADA/Controls/CanvasPanelNew.xaml
@@ -175,7 +175,7 @@
                                 <Setter.Value>
                                     <StackPanel Orientation="Horizontal" Margin="8 0">
                                         <icon:PackIconModern Kind="ControlPlay" VerticalAlignment="Center" Foreground="#28B60F" Width="8"/>
-                                        <TextBlock Text="运行" Margin="4 0" VerticalAlignment="Center"/>
+                                        <TextBlock Text="当前页" Margin="4 0" VerticalAlignment="Center"/>
                                     </StackPanel>
                                 </Setter.Value>
                             </Setter>
@@ -186,7 +186,7 @@
                                         <Setter.Value>
                                             <StackPanel Orientation="Horizontal" Margin="8 0">
                                                 <icon:PackIconModern Kind="ControlStop" VerticalAlignment="Center" Foreground="#B60F0F" Width="8"/>
-                                                <TextBlock Text="停止" Margin="4 0" VerticalAlignment="Center"/>
+                                                <TextBlock Text="当前页" Margin="4 0" VerticalAlignment="Center"/>
                                             </StackPanel>
                                         </Setter.Value>
                                     </Setter>
@@ -198,7 +198,7 @@
                 <Button x:Name="Run1Btn" Margin="4 0 0 0" Padding="0" Click="MNRunBtn_Click">
                     <StackPanel Orientation="Horizontal" Margin="8 0">
                         <icon:PackIconModern Kind="ControlPlay" VerticalAlignment="Center" Foreground="#28B60F" Width="8"/>
-                        <TextBlock Text="模拟运行" Margin="4 0" VerticalAlignment="Center"/>
+                        <TextBlock Text="运行程序" Margin="4 0" VerticalAlignment="Center"/>
                     </StackPanel>
                 </Button>
                 <Button x:Name="SaveBtn" Margin="16 0 0 0" Padding="0" Click="SaveBtn_Click">

From 18aa1a0b6ba74094917c9bd6843658c5551e0630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Sat, 15 Oct 2022 17:30:29 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Model/MessageLog.cs                 |  14 +-
 .../Pages/View/PromptView.xaml                |  26 +-
 .../Pages/View/PromptView.xaml.cs             |   1 +
 .../UserControls/ConveyBelt2.xaml             | 119 ++--
 .../UserControls/MaterialStock.xaml           | 321 +++++----
 .../Model/RawMaterial/DeviceInquire.cs        |   2 +-
 BPASmartClient.Modbus/ModbusTcp.cs            |   2 +-
 .../柔性味魔方/RawMaterialModel.cs       |   9 +
 .../ViewModels/NewRecipeViewModel.cs          |   2 +-
 DosingSystem/App.xaml.cs                      |   5 +-
 DosingSystem/Model/ActionMenu.cs              |  28 -
 DosingSystem/Model/AlarmInfo.cs               |   2 +-
 DosingSystem/Model/ConveyorServer.cs          |  17 -
 DosingSystem/Model/CylinderStatusModel.cs     |   2 +-
 DosingSystem/Model/DeviceAddress.cs           |   2 +-
 DosingSystem/Model/DeviceCurrentStatus.cs     |   2 +-
 DosingSystem/Model/DeviceInquire.cs           |  16 +-
 DosingSystem/Model/DevicePar.cs               |   2 +-
 DosingSystem/Model/DeviceParModel.cs          |   2 +-
 DosingSystem/Model/GlobalData.cs              |  15 -
 DosingSystem/Model/LocaPar.cs                 |   4 +-
 DosingSystem/Model/RawMaterialDeviceStatus.cs |   2 +-
 DosingSystem/Model/RecipeModel.cs             |   2 +-
 DosingSystem/Model/RecipeProcess.cs           |   2 +-
 DosingSystem/Model/StockStatusModel.cs        |  13 +-
 DosingSystem/Model/ViewModelBase.cs           |  27 +
 DosingSystem/View/ChangeDeviceNameView.xaml   |   4 +-
 DosingSystem/View/DeviceListView.xaml         |   2 +-
 DosingSystem/View/ManualControlView.xaml      | 619 +++++++++---------
 DosingSystem/View/ManualControlView.xaml.cs   |   8 +
 DosingSystem/View/NewRecipeView.xaml          |   2 +-
 DosingSystem/View/RecipeSettingsView.xaml     |  10 +-
 DosingSystem/View/RecipeSettingsView.xaml.cs  |   9 +-
 DosingSystem/View/StockControlView.xaml       | 324 +++++----
 .../ViewModel/ChangeDeviceNameViewModel.cs    |  16 +-
 DosingSystem/ViewModel/DeviceListViewModel.cs |   8 +-
 .../ViewModel/DeviceMaterialParViewModel.cs   |  10 +-
 .../ViewModel/HardwareStatusViewModel.cs      |   2 +-
 .../ViewModel/NewMaterialViewModel.cs         |  24 +-
 DosingSystem/ViewModel/NewRecipeViewModel.cs  | 139 ++--
 .../ViewModel/RecipeControlViewModel.cs       |   2 +-
 .../ViewModel/RecipeSettingsViewModel.cs      |  27 +-
 .../ViewModel/StockControViewModel.cs         |  47 +-
 43 files changed, 1036 insertions(+), 856 deletions(-)
 delete mode 100644 DosingSystem/Model/ActionMenu.cs
 delete mode 100644 DosingSystem/Model/ConveyorServer.cs
 delete mode 100644 DosingSystem/Model/GlobalData.cs
 create mode 100644 DosingSystem/Model/ViewModelBase.cs

diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
index afc3925a..cd9263f6 100644
--- a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
+++ b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs
@@ -102,29 +102,31 @@ namespace BPASmartClient.CustomResource.Pages.Model
         public bool ShowDialog(string info, DialogType dialogType = DialogType.Information)
         {
             PromptView PV = new PromptView();
+            PV.TextBlockInfo = info;
             switch (dialogType)
             {
                 case DialogType.Warning:
                     PV.TextBlockIcon = "&#xe61f;";
                     PV.TextBlockForeground = Brushes.Yellow;
-                    PV.TextBlockInfo = $"警告：{info}";
-                    PV.Cancel.Visibility = Visibility.Collapsed;
+                    PV.infoType.Text = "警告：";
+                    //PV.Cancel.Visibility = Visibility.Collapsed;
                     break;
                 case DialogType.Error:
                     PV.TextBlockIcon = "&#xed1a;";
                     PV.TextBlockForeground = Brushes.Red;
-                    PV.TextBlockInfo = $"错误：{info}";
-                    PV.Cancel.Visibility = Visibility.Collapsed;
+                    PV.infoType.Text = "错误：";
+                    //PV.Cancel.Visibility = Visibility.Collapsed;
                     break;
                 case DialogType.Information:
                     PV.TextBlockIcon = "&#xe657;";
                     PV.TextBlockForeground = Brushes.DeepSkyBlue;
-                    PV.TextBlockInfo = $"提示：{info}";
-                    PV.Cancel.Visibility = Visibility.Visible;
+                    PV.infoType.Text = "提示：";
+                    //PV.Cancel.Visibility = Visibility.Visible;
                     break;
                 default:
                     break;
             }
+            PV.infoType.Foreground = PV.TextBlockForeground;
             var res = PV.ShowDialog();
             return res == null ? false : (bool)res;
         }
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
index 1892c83b..f3e888b0 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml
@@ -29,7 +29,7 @@
         </Style>
     </Window.Resources>
 
-    <Grid>
+    <Grid Name="main">
         <Grid.Background>
             <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/弹窗.png" Stretch="Fill" />
         </Grid.Background>
@@ -44,24 +44,31 @@
                 BorderThickness="0"
                 Click="Button_Click" />
 
-            <Grid>
+            <Grid Margin="0,40,0,0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="0.2*" />
+                    <ColumnDefinition Width="0.15*" />
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
-
+                <TextBlock
+                    Name="infoType"
+                    Grid.Column="1"
+                    VerticalAlignment="Top"
+                    FontSize="16"
+                    Foreground="DeepSkyBlue" />
                 <TextBlock
                     Name="icon"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
+                    VerticalAlignment="Top"
                     FontFamily="../../Fonts/#iconfont"
                     FontSize="30"
                     Foreground="DeepSkyBlue"
                     Text="&#xe61f;" />
                 <TextBlock
                     Name="info"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
+                    Grid.Column="2"
+                    Margin="10,0,0,0"
+                    VerticalAlignment="Top"
                     Foreground="DeepSkyBlue"
                     Text="警告:"
                     TextWrapping="Wrap" />
@@ -77,7 +84,7 @@
                     Width="90"
                     Height="30"
                     Margin="5,0,5,0"
-                 Click="Cancel_Click"
+                    Click="Cancel_Click"
                     Content="取消"
                     FontSize="20"
                     Style="{StaticResource ImageButtonStyle}" />
@@ -98,10 +105,5 @@
                 <RowDefinition Height="0.5*" />
             </Grid.RowDefinitions>
         </Grid>
-
-
-
-
-
     </Grid>
 </Window>
diff --git a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
index e8d5fc3e..ffef6c16 100644
--- a/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
+++ b/BPASmartClient.CustomResource/Pages/View/PromptView.xaml.cs
@@ -23,6 +23,7 @@ namespace BPASmartClient.CustomResource.Pages.View
         public PromptView()
         {
             InitializeComponent();
+            this.main.MouseLeftButtonDown += (o, e) => { if (e.LeftButton == MouseButtonState.Pressed) this.DragMove(); };
         }
 
         public string TextBlockIcon
diff --git a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
index 19924a19..b75ede12 100644
--- a/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
+++ b/BPASmartClient.CustomResource/UserControls/ConveyBelt2.xaml
@@ -1,16 +1,73 @@
-<UserControl x:Class="BPASmartClient.CustomResource.UserControls.ConveyBelt2"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Border x:Name="br" >
+<UserControl
+    x:Class="BPASmartClient.CustomResource.UserControls.ConveyBelt2"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Border x:Name="br">
+        <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+
+            <Canvas
+                Width="{Binding ElementName=br, Path=ActualWidth}"
+                Height="{Binding ElementName=br, Path=ActualHeight}"
+                Margin="5">
+
+                <Rectangle
+                    Canvas.Top="20"
+                    Width="{Binding ElementName=br, Path=ActualWidth}"
+                    Height="5"
+                    HorizontalAlignment="Center"
+                    RadiusX="1"
+                    RadiusY="1">
+                    <Rectangle.Fill>
+                        <LinearGradientBrush>
+                            <GradientStop Offset="0" Color="LightGray" />
+                            <GradientStop Offset="0.5" Color="White" />
+                            <GradientStop Offset="1" Color="LightGray" />
+                        </LinearGradientBrush>
+                    </Rectangle.Fill>
+                </Rectangle>
+                <Rectangle
+                    x:Name="recDown"
+                    Width="{Binding ElementName=br, Path=ActualWidth}"
+                    Height="5"
+                    Margin="0,80,0,0"
+                    HorizontalAlignment="Center"
+                    RadiusX="1"
+                    RadiusY="1">
+                    <Rectangle.Fill>
+                        <LinearGradientBrush>
+                            <GradientStop Offset="0" Color="LightGray" />
+                            <GradientStop Offset="0.5" Color="White" />
+                            <GradientStop Offset="1" Color="LightGray" />
+                        </LinearGradientBrush>
+                    </Rectangle.Fill>
+                </Rectangle>
+                <Path
+                    x:Name="belt"
+                    Canvas.Left="10"
+                    Canvas.Top="20"
+                    StrokeDashArray="2"
+                    StrokeThickness="20">
+                    <Path.Stroke>
+                        <LinearGradientBrush>
+                            <GradientStop Offset="0" Color="SlateGray" />
+                            <GradientStop Offset="0.5" Color="White" />
+                            <GradientStop Offset="1" Color="SlateGray" />
+                        </LinearGradientBrush>
+                    </Path.Stroke>
+                </Path>
+
+            </Canvas>
+        </Viewbox>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup Name="StockGroup">
                 <VisualState Name="RunState">
-                    <Storyboard  RepeatBehavior="Forever">
+                    <Storyboard RepeatBehavior="Forever">
                         <DoubleAnimation
                             Storyboard.TargetName="belt"
                             Storyboard.TargetProperty="StrokeDashOffset"
@@ -19,12 +76,11 @@
                             Duration="0:0:20" />
                     </Storyboard>
                 </VisualState>
-                <VisualState Name="Stop">
-                </VisualState>
+                <VisualState Name="Stop" />
             </VisualStateGroup>
             <VisualStateGroup Name="DirectionGroup">
                 <VisualState Name="LeftState">
-                    <Storyboard  RepeatBehavior="Forever">
+                    <Storyboard RepeatBehavior="Forever">
                         <DoubleAnimation
                             Storyboard.TargetName="belt"
                             Storyboard.TargetProperty="StrokeDashOffset"
@@ -34,7 +90,7 @@
                     </Storyboard>
                 </VisualState>
                 <VisualState Name="RightState">
-                    <Storyboard  RepeatBehavior="Forever">
+                    <Storyboard RepeatBehavior="Forever">
                         <DoubleAnimation
                             Storyboard.TargetName="belt"
                             Storyboard.TargetProperty="StrokeDashOffset"
@@ -45,40 +101,5 @@
                 </VisualState>
             </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
-        <Viewbox HorizontalAlignment="Center"  VerticalAlignment="Center">
-
-            <Canvas Width="{Binding ElementName=br, Path=ActualWidth}" Height="{Binding ElementName=br, Path=ActualHeight}" Margin="5">
-
-                <Rectangle HorizontalAlignment="Center" Width="{Binding ElementName=br, Path=ActualWidth}" Height="5" Canvas.Top="20" RadiusX="1" RadiusY="1">
-                    <Rectangle.Fill>
-                        <LinearGradientBrush >
-                            <GradientStop Color="LightGray" Offset="0"/>
-                            <GradientStop Color="White" Offset="0.5"/>
-                            <GradientStop Color="LightGray" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Rectangle.Fill>
-                </Rectangle>
-                <Rectangle HorizontalAlignment="Center" x:Name="recDown" Width="{Binding ElementName=br, Path=ActualWidth}" Height="5" RadiusX="1" RadiusY="1" Margin="0,80,0,0">
-                    <Rectangle.Fill>
-                        <LinearGradientBrush >
-                            <GradientStop Color="LightGray" Offset="0"/>
-                            <GradientStop Color="White" Offset="0.5"/>
-                            <GradientStop Color="LightGray" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Rectangle.Fill>
-                </Rectangle>
-                <Path x:Name="belt" Canvas.Top="20" Canvas.Left="10"  
-                    StrokeDashArray="2" StrokeThickness="20">
-                    <Path.Stroke>
-                        <LinearGradientBrush>
-                            <GradientStop Color="SlateGray" Offset="0"/>
-                            <GradientStop Color="White" Offset="0.5"/>
-                            <GradientStop Color="SlateGray" Offset="1"/>
-                        </LinearGradientBrush>
-                    </Path.Stroke>
-                </Path>
-            
-            </Canvas>
-        </Viewbox>
     </Border>
 </UserControl>
diff --git a/BPASmartClient.CustomResource/UserControls/MaterialStock.xaml b/BPASmartClient.CustomResource/UserControls/MaterialStock.xaml
index bde8d31a..5c1e433b 100644
--- a/BPASmartClient.CustomResource/UserControls/MaterialStock.xaml
+++ b/BPASmartClient.CustomResource/UserControls/MaterialStock.xaml
@@ -1,80 +1,25 @@
-<UserControl x:Class="BPASmartClient.CustomResource.UserControls.MaterialStock"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.CustomResource.UserControls.MaterialStock"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.CustomResource.UserControls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
-        <PathGeometry x:Key="move" Figures="M 0,0  L 0,10"/>
-        
+        <PathGeometry x:Key="move" Figures="M 0,0  L 0,10" />
+
     </UserControl.Resources>
     <Border HorizontalAlignment="Center">
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup Name="StockGroup">
-                <VisualState Name="OpenState">
-                    <Storyboard>
-                        <DoubleAnimation Duration="00:0:1" From="0" To="200"
-                                     Storyboard.TargetProperty="Width"
-                                     Storyboard.TargetName="stock"/>
-                        <DoubleAnimation Duration="00:0:1" From="0" To="70"
-                                     Storyboard.TargetProperty="Height"
-                                     Storyboard.TargetName="stock"/>
-                    </Storyboard>
-                </VisualState>
-                <VisualState Name="CloseState">
-                    <Storyboard>
-                        <DoubleAnimation Duration="00:0:1" From="200" To="0" 
-                                     Storyboard.TargetProperty="Width"
-                                     Storyboard.TargetName="stock"/>
-                        <DoubleAnimation Duration="00:0:1" From="70" To="0"
-                                     Storyboard.TargetProperty="Height"
-                                     Storyboard.TargetName="stock"/>
-                    </Storyboard>
-                </VisualState>
-            </VisualStateGroup>
-            <VisualStateGroup Name="RunStateGroup">
-                <VisualState Name="RunState">
-                    <Storyboard>
-                        <ColorAnimationUsingKeyFrames
-                                    Storyboard.TargetName="gsGreen"
-                                    Storyboard.TargetProperty="Color">
-                            <DiscreteColorKeyFrame Value="Green" KeyTime="0"/>
-                        </ColorAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-                <VisualState Name="Stop"/>
-            </VisualStateGroup>
-            <VisualStateGroup x:Name="FaultStateGroup">
-                <VisualState Name="FaultState">
-                    <Storyboard>
-                        <ColorAnimationUsingKeyFrames RepeatBehavior="Forever"
-                                    Storyboard.TargetName="gsRed1"
-                                    Storyboard.TargetProperty="Color">
-                            <DiscreteColorKeyFrame Value="Red" KeyTime="0:0:0.5"/>
-                            <DiscreteColorKeyFrame Value="Gray" KeyTime="0:0:1"/>
-                        </ColorAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-                <VisualState Name="NormalState"/>
-            </VisualStateGroup>
-            <VisualStateGroup x:Name="LayOffStateGroup">
-                <VisualState Name="LayOffState">
-                    <Storyboard>
-                        <DoubleAnimationUsingPath Duration="0:0:1" PathGeometry="{StaticResource move}"  RepeatBehavior="Forever" 
-                     Storyboard.TargetName="arrow"                   Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[1].(Y)" Source="Y"></DoubleAnimationUsingPath>
-                    </Storyboard>
-                </VisualState>
-                <VisualState Name="LayStopState">
-                </VisualState>
-                    
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-        <Viewbox VerticalAlignment="Center" HorizontalAlignment="Center">
+        <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
 
-            <Canvas Width="205" Height="245" Margin="5">
-                <Polygon Points="0,80 20,40 205,40 185,80" Canvas.Left="67">
+            <Canvas
+                Width="205"
+                Height="245"
+                Margin="5">
+                <Polygon Canvas.Left="67" Points="0,80 20,40 205,40 185,80">
                     <Polygon.RenderTransform>
                         <SkewTransform AngleX="-40" />
                     </Polygon.RenderTransform>
@@ -84,35 +29,49 @@
                             <GradientStop Color="WhiteSmoke" Offset="0.85"/>
                             <GradientStop Color="LightGray" Offset="1"/>
                         </LinearGradientBrush>-->
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理2.jpeg"  Stretch="Fill"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理2.jpeg" Stretch="Fill" />
                     </Polygon.Fill>
                 </Polygon>
-                <Polygon Width="200" Height="70" Points="45,70 60,50 170,50 155,70" Stroke="Gray" StrokeThickness="2" Canvas.Left="67">
+                <Polygon
+                    Canvas.Left="67"
+                    Width="200"
+                    Height="70"
+                    Points="45,70 60,50 170,50 155,70"
+                    Stroke="Gray"
+                    StrokeThickness="2">
                     <Polygon.RenderTransform>
                         <SkewTransform AngleX="-40" />
                     </Polygon.RenderTransform>
                 </Polygon>
-                <Polygon x:Name="stock" Width="0" Height="0" Points="45,70 60,50 170,50 155,70" Canvas.Left="67"  >
+                <Polygon
+                    x:Name="stock"
+                    Canvas.Left="67"
+                    Width="0"
+                    Height="0"
+                    Points="45,70 60,50 170,50 155,70">
                     <Polygon.Fill>
-                        <SolidColorBrush Color="DimGray"/>
+                        <SolidColorBrush Color="DimGray" />
                     </Polygon.Fill>
                     <Polygon.RenderTransform>
                         <SkewTransform AngleX="-40" />
                     </Polygon.RenderTransform>
                 </Polygon>
-                <Polygon Points="-5,90 0,80 185,80 180,90" Panel.ZIndex="1" >
+                <Polygon Panel.ZIndex="1" Points="-5,90 0,80 185,80 180,90">
                     <Polygon.Fill>
                         <LinearGradientBrush>
-                            <GradientStop Color="LightGray" Offset="0"/>
-                            <GradientStop Color="White" Offset="0.66"/>
-                            <GradientStop Color="LightGray" Offset="0.95"/>
+                            <GradientStop Offset="0" Color="LightGray" />
+                            <GradientStop Offset="0.66" Color="White" />
+                            <GradientStop Offset="0.95" Color="LightGray" />
                         </LinearGradientBrush>
                     </Polygon.Fill>
 
                 </Polygon>
-                <Grid Width="185" Height="160" Canvas.Top="80">
+                <Grid
+                    Canvas.Top="80"
+                    Width="185"
+                    Height="160">
                     <Grid.Background>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理.jpg" Stretch="Fill"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理.jpg" Stretch="Fill" />
                     </Grid.Background>
                     <!--<Grid VerticalAlignment="Bottom" Height="20" Margin="5">
                         <Grid.ColumnDefinitions>
@@ -134,7 +93,7 @@
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>
-                                
+
                             </Button.Template>
                         </Button>
                         <Button Width="60" Grid.Column="1">
@@ -156,37 +115,65 @@
                         </Button>
                     </Grid>-->
                 </Grid>
-                <Grid Width="185" Height="60"  Canvas.Top="90">
+                <Grid
+                    Canvas.Top="90"
+                    Width="185"
+                    Height="60">
                     <Grid.Background>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理2.jpeg"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理2.jpeg" />
                     </Grid.Background>
                     <Grid.RenderTransform>
-                        <TranslateTransform X="-5"/>
+                        <TranslateTransform X="-5" />
                     </Grid.RenderTransform>
-                    <TextBox x:Name="stockName" Width="58" Height="50" HorizontalAlignment="Left" HorizontalContentAlignment="Center" Background="Transparent"
-                              BorderThickness="0" VerticalContentAlignment="Center" FontSize="13" Foreground="DarkSlateGray">
-                       
-                    </TextBox>
+                    <TextBox
+                        x:Name="stockName"
+                        Width="58"
+                        Height="50"
+                        HorizontalAlignment="Left"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        FontSize="13"
+                        Foreground="DarkSlateGray" />
 
 
-                    <Border Width="80" Height="50" BorderBrush="DimGray " BorderThickness="2" CornerRadius="5" Margin="15,0,0,0">
-                        <StackPanel >
-                            <TextBlock HorizontalAlignment="Center" FontSize="12" Text="剩余重量" FontFamily="幼圆" Margin="0,2,0,5"/>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                            <TextBlock x:Name="stockWeight" HorizontalAlignment="Center"  FontSize="16" />
-                            <TextBlock   Text="Kg" FontSize="16"/>
+                    <Border
+                        Width="80"
+                        Height="50"
+                        Margin="15,0,0,0"
+                        BorderBrush="DimGray "
+                        BorderThickness="2"
+                        CornerRadius="5">
+                        <StackPanel>
+                            <TextBlock
+                                Margin="0,2,0,5"
+                                HorizontalAlignment="Center"
+                                FontFamily="幼圆"
+                                FontSize="12"
+                                Text="剩余重量" />
+                            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                                <TextBlock
+                                    x:Name="stockWeight"
+                                    HorizontalAlignment="Center"
+                                    FontSize="16" />
+                                <TextBlock FontSize="16" Text="Kg" />
                             </StackPanel>
                         </StackPanel>
                     </Border>
                 </Grid>
-                <Grid  Width="40" Height="60"  Canvas.Top="90" Canvas.Left="180">
+                <Grid
+                    Canvas.Left="180"
+                    Canvas.Top="90"
+                    Width="40"
+                    Height="60">
                     <Grid.Background>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理3.jpeg" Stretch="UniformToFill"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理3.jpeg" Stretch="UniformToFill" />
                     </Grid.Background>
                     <Grid.RenderTransform>
                         <TransformGroup>
-                            <ScaleTransform ScaleX="0.119"/>
-                            <SkewTransform AngleY="-65.5"/>
+                            <ScaleTransform ScaleX="0.119" />
+                            <SkewTransform AngleY="-65.5" />
                         </TransformGroup>
                     </Grid.RenderTransform>
                     <!--<Border VerticalAlignment="Top" Height="140" BorderThickness="10">
@@ -202,35 +189,44 @@
                     <Border Background="#FFAAAAAA" Margin="2"/>
                     <Border Background="#FFAAAAAA" Margin="2" Grid.Column="1"/>
                 </Grid>-->
-                </Grid >
-                <Path x:Name="arrow"  Canvas.Top="175" Canvas.Left="113"  Visibility="Collapsed"   Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z">
+                </Grid>
+                <Path
+                    x:Name="arrow"
+                    Canvas.Left="113"
+                    Canvas.Top="175"
+                    Data="M -15,8 L 17,17 C 17,17 19,18 17,19 L 17,19 L -15,28 C -15,28 -17,28.2 -16,26 L -16,26 L -5,18 L -16,10 C -16,10 -17,8.5 -15,8 Z"
+                    Visibility="Collapsed">
                     <Path.RenderTransform>
                         <TransformGroup>
-                            <RotateTransform Angle="90"/>
-                            <TranslateTransform  Y="0"/>
+                            <RotateTransform Angle="90" />
+                            <TranslateTransform Y="0" />
                         </TransformGroup>
                     </Path.RenderTransform>
                     <Path.Fill>
                         <LinearGradientBrush>
                             <LinearGradientBrush.RelativeTransform>
-                                <RotateTransform Angle="-15"/>
+                                <RotateTransform Angle="-15" />
                             </LinearGradientBrush.RelativeTransform>
-                            <GradientStop Color="LightGray" Offset="0"/>
-                            <GradientStop Color="White" Offset="0.4"/>
-                            <GradientStop Color="AntiqueWhite" Offset="1"/>
+                            <GradientStop Offset="0" Color="LightGray" />
+                            <GradientStop Offset="0.4" Color="White" />
+                            <GradientStop Offset="1" Color="AntiqueWhite" />
                         </LinearGradientBrush>
                     </Path.Fill>
                 </Path>
                 <!--<Path Data="M 95,190  L 95,200" Stroke="Red"/>-->
 
-                <Grid  Width="185" Height="160"  Canvas.Top="80" Canvas.Left="185">
+                <Grid
+                    Canvas.Left="185"
+                    Canvas.Top="80"
+                    Width="185"
+                    Height="160">
                     <Grid.Background>
-                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理.jpg"/>
+                        <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/不锈钢纹理.jpg" />
                     </Grid.Background>
                     <Grid.RenderTransform>
                         <TransformGroup>
-                            <ScaleTransform ScaleX="0.288"/>
-                            <SkewTransform AngleY="-36.8"/>
+                            <ScaleTransform ScaleX="0.288" />
+                            <SkewTransform AngleY="-36.8" />
                         </TransformGroup>
                     </Grid.RenderTransform>
                     <!--<Border VerticalAlignment="Top" Height="140" BorderThickness="10">
@@ -264,24 +260,109 @@
                     </Grid>-->
                 </Grid>
 
-                <Border Width="18" Height="18" CornerRadius="10" Canvas.Left="150" Canvas.Top="100">
+                <Border
+                    Canvas.Left="150"
+                    Canvas.Top="100"
+                    Width="18"
+                    Height="18"
+                    CornerRadius="10">
                     <Border.Background>
                         <RadialGradientBrush>
-                            <GradientStop Color="Gray" Offset="0.6" x:Name="gsGreen"/>
-                            <GradientStop Color="White"/>
+                            <GradientStop x:Name="gsGreen" Offset="0.6" Color="Gray" />
+                            <GradientStop Color="White" />
                         </RadialGradientBrush>
                     </Border.Background>
                 </Border>
-                <Border Width="18" Height="18" CornerRadius="10" Canvas.Left="150" Canvas.Top="125" >
+                <Border
+                    Canvas.Left="150"
+                    Canvas.Top="125"
+                    Width="18"
+                    Height="18"
+                    CornerRadius="10">
                     <Border.Background>
                         <RadialGradientBrush>
-                            <GradientStop Color="Gray" Offset="0.6" x:Name="gsRed1"/>
-                            <GradientStop Color="White"/>
+                            <GradientStop x:Name="gsRed1" Offset="0.6" Color="Gray" />
+                            <GradientStop Color="White" />
                         </RadialGradientBrush>
                     </Border.Background>
                 </Border>
-                
+
             </Canvas>
         </Viewbox>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup Name="StockGroup">
+                <VisualState Name="OpenState">
+                    <Storyboard>
+                        <DoubleAnimation
+                            Storyboard.TargetName="stock"
+                            Storyboard.TargetProperty="Width"
+                            From="0"
+                            To="200"
+                            Duration="00:0:1" />
+                        <DoubleAnimation
+                            Storyboard.TargetName="stock"
+                            Storyboard.TargetProperty="Height"
+                            From="0"
+                            To="70"
+                            Duration="00:0:1" />
+                    </Storyboard>
+                </VisualState>
+                <VisualState Name="CloseState">
+                    <Storyboard>
+                        <DoubleAnimation
+                            Storyboard.TargetName="stock"
+                            Storyboard.TargetProperty="Width"
+                            From="200"
+                            To="0"
+                            Duration="00:0:1" />
+                        <DoubleAnimation
+                            Storyboard.TargetName="stock"
+                            Storyboard.TargetProperty="Height"
+                            From="70"
+                            To="0"
+                            Duration="00:0:1" />
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+            <VisualStateGroup Name="RunStateGroup">
+                <VisualState Name="RunState">
+                    <Storyboard>
+                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="gsGreen" Storyboard.TargetProperty="Color">
+                            <DiscreteColorKeyFrame KeyTime="0" Value="Green" />
+                        </ColorAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <VisualState Name="Stop" />
+            </VisualStateGroup>
+            <VisualStateGroup x:Name="FaultStateGroup">
+                <VisualState Name="FaultState">
+                    <Storyboard>
+                        <ColorAnimationUsingKeyFrames
+                            RepeatBehavior="Forever"
+                            Storyboard.TargetName="gsRed1"
+                            Storyboard.TargetProperty="Color">
+                            <DiscreteColorKeyFrame KeyTime="0:0:0.5" Value="Red" />
+                            <DiscreteColorKeyFrame KeyTime="0:0:1" Value="Gray" />
+                        </ColorAnimationUsingKeyFrames>
+                    </Storyboard>
+                </VisualState>
+                <VisualState Name="NormalState" />
+            </VisualStateGroup>
+            <VisualStateGroup x:Name="LayOffStateGroup">
+                <VisualState Name="LayOffState">
+                    <Storyboard>
+                        <DoubleAnimationUsingPath
+                            PathGeometry="{StaticResource move}"
+                            RepeatBehavior="Forever"
+                            Source="Y"
+                            Storyboard.TargetName="arrow"
+                            Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[1].(Y)"
+                            Duration="0:0:1" />
+                    </Storyboard>
+                </VisualState>
+                <VisualState Name="LayStopState" />
+
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Border>
 </UserControl>
diff --git a/BPASmartClient.DosingProject/Model/RawMaterial/DeviceInquire.cs b/BPASmartClient.DosingProject/Model/RawMaterial/DeviceInquire.cs
index 56040b5c..c4ff9f55 100644
--- a/BPASmartClient.DosingProject/Model/RawMaterial/DeviceInquire.cs
+++ b/BPASmartClient.DosingProject/Model/RawMaterial/DeviceInquire.cs
@@ -210,7 +210,7 @@ namespace BPASmartClient.DosingHKProject.Model
                                 {
                                     if (Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == DeviceName) == null)
                                     {
-                                        Global.DeviceRawMaterials.Add(new RawMaterialModel() { RawMaterialName = DeviceName, DeviceIp = ip, RawMaterialSource = 1});
+                                        Global.DeviceRawMaterials.Add(new RawMaterialModel() { RawMaterialName = DeviceName, DeviceIp = ip, RawMaterialSource = 1 });
                                     }
                                 }
                                 else
diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index 8734228e..fac46761 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -567,7 +567,7 @@ namespace BPASmartClient.Modbus
             }
             catch (Exception ex)
             {
-                MessageLog.GetInstance.Show(ex.ToString());
+                ShowEx?.Invoke(ex.ToString());
                 tcpClient = null;
                 Connect();
             }
diff --git a/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs b/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs
index 71f0229f..ef1173e2 100644
--- a/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs
+++ b/BPASmartClient.Model/柔性味魔方/RawMaterialModel.cs
@@ -38,6 +38,15 @@ namespace BPASmartClient.Model
         public ushort RawMaterialSource { get { return _mRawMaterialSource; } set { _mRawMaterialSource = value; OnPropertyChanged(); } }
         private ushort _mRawMaterialSource;
 
+
+        /// <summary>
+        /// 选中索引
+        /// </summary>
+        [Newtonsoft.Json.JsonIgnore]
+        public int SelectIndex { get { return _mSelectIndex; } set { _mSelectIndex = value; OnPropertyChanged(); } }
+        private int _mSelectIndex;
+
+
         /// <summary>
         /// 原料类型 MW18
         /// 1：液体
diff --git a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
index 5764539e..6c49bdd9 100644
--- a/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
+++ b/BPASmartClient.SmallBatchingSystem/ViewModels/NewRecipeViewModel.cs
@@ -22,7 +22,7 @@ namespace BPASmartClient.SmallBatchingSystem.ViewModels
                     RecipeName = tempRecipeInfo.RecipeName;
                     tempRecipeInfo.SiloInfoModels.ToList()?.ForEach(item =>
                     {
-                        int tempIndex = Array.FindIndex(SileName.ToArray(), p => p.Contains(item.SiloName));
+                        int tempIndex = Array.FindIndex(SileName.ToArray(), p => p == item.SiloName);
                         SiloInfos.Add(new RecipeRawMaterialInfo() { SiloName = item.SiloName, SiloWeight = item.SiloWeight, SelectIndex = tempIndex });
                     });
                     Index = Array.FindIndex(Json<ConfigInfoModel>.Data.Recipes.ToArray(), p => p.RecipeName == tempRecipeInfo.RecipeName);
diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs
index c082611c..1d35aca8 100644
--- a/DosingSystem/App.xaml.cs
+++ b/DosingSystem/App.xaml.cs
@@ -11,7 +11,6 @@ using BPASmartClient.CustomResource.Pages.Enums;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.CustomResource.Pages.View;
 using BPASmartClient.CustomResource.Pages.ViewModel;
-using BPASmartClient.DosingSystem.Model;
 using BPASmartClient.DosingSystem.View;
 using BPASmartClient.Helper;
 using BPASmartClient.Nfc;
@@ -27,10 +26,12 @@ namespace BPASmartClient.DosingSystem
         protected override void OnStartup(StartupEventArgs e)
         {
             base.OnStartup(e);
+            BPASmartClient.Helper.SystemHelper.GetInstance.CreateDesktopShortcut();
             MenuInit();
             DataInit();
             DeviceInquire.GetInstance.Init();//配料机设备上线监听，设备列表初始化
             MainView mv = new MainView();
+
             //mv.Show();
             LoginView lv = new LoginView();
             var res = lv.ShowDialog();
@@ -55,7 +56,7 @@ namespace BPASmartClient.DosingSystem
 
         private void MenuInit()
         {
-            NfcServer.GetInstance.Init();
+            //NfcServer.GetInstance.Init();
 
             #region 配方管理菜单
             ObservableCollection<SubMenumodel> RecipeManage = new ObservableCollection<SubMenumodel>();
diff --git a/DosingSystem/Model/ActionMenu.cs b/DosingSystem/Model/ActionMenu.cs
deleted file mode 100644
index 00113337..00000000
--- a/DosingSystem/Model/ActionMenu.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
-
-namespace BPASmartClient.DosingSystem.Model
-{
-    public class ActionMenu : ObservableObject
-    {
-        public string CommandParameter { get { return _mCommandParameter; } set { _mCommandParameter = value; OnPropertyChanged(); } }
-        private string _mCommandParameter;
-
-        //public Permission[] permission { get { return _mpermission; } set { _mpermission = value; OnPropertyChanged(); } }
-        //private Permission[] _mpermission;
-
-        public string MenuName { get { return _mMenuName; } set { _mMenuName = value; OnPropertyChanged(); } }
-        private string _mMenuName;
-
-
-        //public string NameSpace { get { return _mNameSpace; } set { _mNameSpace = value; OnPropertyChanged(); } }
-        //private string _mNameSpace;
-
-
-    }
-}
diff --git a/DosingSystem/Model/AlarmInfo.cs b/DosingSystem/Model/AlarmInfo.cs
index 00dd0772..7944fa96 100644
--- a/DosingSystem/Model/AlarmInfo.cs
+++ b/DosingSystem/Model/AlarmInfo.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class AlarmInfo
     {
diff --git a/DosingSystem/Model/ConveyorServer.cs b/DosingSystem/Model/ConveyorServer.cs
deleted file mode 100644
index f2b36ed3..00000000
--- a/DosingSystem/Model/ConveyorServer.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-
-namespace BPASmartClient.DosingSystem.Model
-{
-    public class ConveyorServer
-    {
-        public ConveyorServer()
-        {
-
-        }
-    }
-}
diff --git a/DosingSystem/Model/CylinderStatusModel.cs b/DosingSystem/Model/CylinderStatusModel.cs
index 6c43e5b6..8e94d96b 100644
--- a/DosingSystem/Model/CylinderStatusModel.cs
+++ b/DosingSystem/Model/CylinderStatusModel.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class CylinderStatusModel : ObservableObject
     {
diff --git a/DosingSystem/Model/DeviceAddress.cs b/DosingSystem/Model/DeviceAddress.cs
index e0653f23..e2d5530f 100644
--- a/DosingSystem/Model/DeviceAddress.cs
+++ b/DosingSystem/Model/DeviceAddress.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class DeviceAddress
     {
diff --git a/DosingSystem/Model/DeviceCurrentStatus.cs b/DosingSystem/Model/DeviceCurrentStatus.cs
index 6a727d95..e1854196 100644
--- a/DosingSystem/Model/DeviceCurrentStatus.cs
+++ b/DosingSystem/Model/DeviceCurrentStatus.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class DeviceCurrentStatus : ObservableObject
     {
diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs
index 6472b679..a6570bd1 100644
--- a/DosingSystem/Model/DeviceInquire.cs
+++ b/DosingSystem/Model/DeviceInquire.cs
@@ -12,7 +12,7 @@ using System.Net.NetworkInformation;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class DeviceInquire
     {
@@ -71,7 +71,11 @@ namespace BPASmartClient.DosingSystem.Model
                     DeviceNum = i + 1,
                     Weight = new Random().Next(100, 10000) / 100.0
                 });
-
+                Global.DeviceRawMaterials.Add(new RawMaterialModel()
+                {
+                    DeviceIp = $"192.168.1.{i + 1}",
+                    RawMaterialName = $"测试设备{i + 1}",
+                });
                 devices.Add(new Devices()
                 {
                     DeviceName = $"测试设备{i + 1}",
@@ -87,7 +91,11 @@ namespace BPASmartClient.DosingSystem.Model
                     DeviceNum = i + 1,
                     Weight = new Random().Next(100, 10000) / 100.0
                 });
-
+                Global.DeviceRawMaterials.Add(new RawMaterialModel()
+                {
+                    DeviceIp = $"192.168.1.{i + 1}",
+                    RawMaterialName = $"测试设备{i + 1}",
+                });
                 devices.Add(new Devices()
                 {
                     DeviceName = $"测试设备{i + 1}",
@@ -337,7 +345,7 @@ namespace BPASmartClient.DosingSystem.Model
             if (modbusTcp.Connected)
             {
                 modbusTcp.SetReal(DeviceAddress.WeightSet, Value);//写入配方量
-                string returnValue = modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
+                modbusTcp.Write(DeviceAddress.Start, (ushort)1);//设备启动写入
                 //配料设备参数写入
                 var res = Json<DevicePar>.Data.deviceParModels.FirstOrDefault(p => p.MaterialName == DeviceName);
                 if (res != null)
diff --git a/DosingSystem/Model/DevicePar.cs b/DosingSystem/Model/DevicePar.cs
index 715f4e2b..f59897ad 100644
--- a/DosingSystem/Model/DevicePar.cs
+++ b/DosingSystem/Model/DevicePar.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class DevicePar
     {
diff --git a/DosingSystem/Model/DeviceParModel.cs b/DosingSystem/Model/DeviceParModel.cs
index f7400050..c9dfe67f 100644
--- a/DosingSystem/Model/DeviceParModel.cs
+++ b/DosingSystem/Model/DeviceParModel.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class DeviceParModel : ObservableObject
     {
diff --git a/DosingSystem/Model/GlobalData.cs b/DosingSystem/Model/GlobalData.cs
deleted file mode 100644
index 6a6904de..00000000
--- a/DosingSystem/Model/GlobalData.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using BPASmartClient.Model;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BPASmartClient.DosingSystem.Model
-{
-    public  class GlobalData
-    {
-       
-    }
-}
diff --git a/DosingSystem/Model/LocaPar.cs b/DosingSystem/Model/LocaPar.cs
index cd848da0..992f898f 100644
--- a/DosingSystem/Model/LocaPar.cs
+++ b/DosingSystem/Model/LocaPar.cs
@@ -7,12 +7,12 @@ using System.Collections.ObjectModel;
 using BPASmartClient.DosingSystem.ViewModel;
 using BPASmartClient.Model;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class LocaPar
     {
         public ObservableCollection<RecipeModel> Recipes { get; set; } = new ObservableCollection<RecipeModel>();
 
-       
+
     }
 }
diff --git a/DosingSystem/Model/RawMaterialDeviceStatus.cs b/DosingSystem/Model/RawMaterialDeviceStatus.cs
index 777fe2a3..6d218b33 100644
--- a/DosingSystem/Model/RawMaterialDeviceStatus.cs
+++ b/DosingSystem/Model/RawMaterialDeviceStatus.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class RawMaterialDeviceStatus
     {
diff --git a/DosingSystem/Model/RecipeModel.cs b/DosingSystem/Model/RecipeModel.cs
index a29ee2a5..df6e89b2 100644
--- a/DosingSystem/Model/RecipeModel.cs
+++ b/DosingSystem/Model/RecipeModel.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using BPASmartClient.Model;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     /// <summary>
     /// 配方模块
diff --git a/DosingSystem/Model/RecipeProcess.cs b/DosingSystem/Model/RecipeProcess.cs
index 23864689..9de11200 100644
--- a/DosingSystem/Model/RecipeProcess.cs
+++ b/DosingSystem/Model/RecipeProcess.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
     public class RecipeProcess : ObservableObject
     {
diff --git a/DosingSystem/Model/StockStatusModel.cs b/DosingSystem/Model/StockStatusModel.cs
index 9f41139c..2470c0c0 100644
--- a/DosingSystem/Model/StockStatusModel.cs
+++ b/DosingSystem/Model/StockStatusModel.cs
@@ -5,15 +5,15 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace BPASmartClient.DosingSystem.Model
+namespace BPASmartClient.DosingSystem
 {
-    internal class StockStatusModel:ObservableObject
+    public class StockStatusModel : ObservableObject
     {
         /// <summary>
         /// 料仓物料重量
         /// </summary>
         private double _materialWeight;
-        public double MaterialWeight { get { return _materialWeight; } set { _materialWeight = value;OnPropertyChanged(); } }
+        public double MaterialWeight { get { return _materialWeight; } set { _materialWeight = value; OnPropertyChanged(); } }
         /// <summary>
         /// 料仓物料名称
         /// </summary>
@@ -30,6 +30,13 @@ namespace BPASmartClient.DosingSystem.Model
         private bool _isLayOff;
         public bool IsLayOff { get { return _isLayOff; } set { _isLayOff = value; OnPropertyChanged(); } }
 
+        /// <summary>
+        /// 打开状态
+        /// </summary>
+        public bool IsOpen { get { return _mIsOpen; } set { _mIsOpen = value; OnPropertyChanged(); } }
+        private bool _mIsOpen;
+
+
         /// <summary>
         /// 是否故障报警
         /// </summary>
diff --git a/DosingSystem/Model/ViewModelBase.cs b/DosingSystem/Model/ViewModelBase.cs
new file mode 100644
index 00000000..ae5f8e17
--- /dev/null
+++ b/DosingSystem/Model/ViewModelBase.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
+using System.Collections.ObjectModel;
+
+namespace BPASmartClient.DosingSystem
+{
+    public class ViewModelBase : ObservableObject
+    {
+        public int Index { get; set; } = -1;
+        public RelayCommand AddCommand { get; set; }//添加
+        public RelayCommand CancelCommand { get; set; }//取消
+        public RelayCommand SaveCommand { get; set; }//保存
+        public RelayCommand<object> RemoveCommand { get; set; }//移除
+        public RelayCommand<object> DetailsCommand { get; set; }//编辑
+
+        /// <summary>
+        /// 错误信息
+        /// </summary>
+        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        private string _mErrorInfo = string.Empty;
+    }
+}
diff --git a/DosingSystem/View/ChangeDeviceNameView.xaml b/DosingSystem/View/ChangeDeviceNameView.xaml
index 5538aa49..f44050de 100644
--- a/DosingSystem/View/ChangeDeviceNameView.xaml
+++ b/DosingSystem/View/ChangeDeviceNameView.xaml
@@ -104,14 +104,14 @@
                     Width="148"
                     Height="30"
                     Margin="0,0,7,0"
-                    Command="{Binding ConfirmCommand}"
+                    Command="{Binding AddCommand}"
                     Content="确认" />
 
                 <Button
                     Name="btClose"
                     Width="148"
                     Height="30"
-                    Command="{Binding CancleCommand}"
+                    Command="{Binding CancelCommand}"
                     Content="取消" />
 
             </Grid>
diff --git a/DosingSystem/View/DeviceListView.xaml b/DosingSystem/View/DeviceListView.xaml
index 384d0606..c1713812 100644
--- a/DosingSystem/View/DeviceListView.xaml
+++ b/DosingSystem/View/DeviceListView.xaml
@@ -126,7 +126,7 @@
                                     Height="30"
                                     Margin="0,0,0,0"
                                     VerticalAlignment="Top"
-                                    Command="{Binding DataContext.ChangeNameCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                    Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
                                     CommandParameter="{Binding IpAddress}"
                                     Content="修改原料名称"
                                     FontSize="16"
diff --git a/DosingSystem/View/ManualControlView.xaml b/DosingSystem/View/ManualControlView.xaml
index a4d1114c..0d0a181b 100644
--- a/DosingSystem/View/ManualControlView.xaml
+++ b/DosingSystem/View/ManualControlView.xaml
@@ -52,328 +52,311 @@
     <UserControl.DataContext>
         <vm:ManualControlViewModel />
     </UserControl.DataContext>
-
-    <Grid Margin="8">
-
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition />
-            <RowDefinition />
-        </Grid.RowDefinitions>
-
-        <!--#region 升降气缸-->
-        <Grid
-            Name="cy"
-            Grid.Row="0"
-            Margin="5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <pry:ImageBorder
-                Grid.RowSpan="2"
-                Width="{Binding ElementName=cy, Path=ActualWidth}"
-                Height="{Binding ElementName=cy, Path=ActualHeight}" />
-
-            <Image
-                Margin="2,3,0,0"
-                HorizontalAlignment="Left"
-                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
-            <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                FontSize="16"
-                Foreground="Aqua"
-                Text="升降气缸控制" />
-            <ListView
-                Grid.Row="1"
-                Background="Transparent"
-                BorderBrush="#00BEFA"
-                BorderThickness="0"
-                ItemsSource="{Binding cylinderModels}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <UniformGrid
+    <ScrollViewer>
+        <StackPanel Margin="8">
+
+            <!--#region 升降气缸-->
+            <Grid
+                Name="cy"
+                Grid.Row="0"
+                Margin="5">
+                <pry:ImageBorder
+                    Grid.RowSpan="2"
+                    Width="{Binding ElementName=cy, Path=ActualWidth}"
+                    Height="{Binding ElementName=cy, Path=ActualHeight}" />
+
+                <StackPanel Background="Transparent">
+                    <Grid Height="40">
+                        <Image
+                            Margin="2,3,0,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Top"
-                            Columns="8" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid
-                            Width="200"
-                            Height="100"
-                            Margin="0,0,0,15"
-                            Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="30" />
-                                <RowDefinition />
-                                <RowDefinition Height="30" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.5*" />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Foreground="Aqua"
-                                Text="{Binding Name}" />
-
-                            <pry:Cylinder
-                                Grid.Row="1"
-                                Grid.ColumnSpan="3"
-                                Width="200"
-                                Height="50"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                LeftTogIsChecked="{Binding LeftTog}"
-                                RightTogIsChecked="{Binding RightTog}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="伸出"
-                                Foreground="Aqua"
-                                IsChecked="True"
-                                Style="{StaticResource radioButtonStyle}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="缩回"
-                                Foreground="Aqua"
-                                IsChecked="False"
-                                Style="{StaticResource radioButtonStyle}" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-        </Grid>
-        <!--#endregion-->
-
-        <!--#region 阻挡气缸-->
-        <Grid
-            Name="zd"
-            Grid.Row="1"
-            Margin="5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <pry:ImageBorder
-                Grid.RowSpan="2"
-                Width="{Binding ElementName=zd, Path=ActualWidth}"
-                Height="{Binding ElementName=zd, Path=ActualHeight}" />
-
-            <Image
-                Margin="2,3,0,0"
-                HorizontalAlignment="Left"
-                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
-            <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                FontSize="16"
-                Foreground="Aqua"
-                Text="阻挡气缸控制" />
-            <ListView
+                            Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+                        <TextBlock
+                            Margin="10,10,0,0"
+                            VerticalAlignment="Top"
+                            FontSize="16"
+                            Foreground="Aqua"
+                            Text="升降气缸控制" />
+                    </Grid>
+                    <ListView
+                        Name="list1"
+                        Grid.Row="1"
+                        Margin="0,0,0,20"
+                        Background="Transparent"
+                        BorderBrush="#00BEFA"
+                        BorderThickness="0"
+                        ItemsSource="{Binding cylinderModels}"
+                        ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid
+                                    Width="200"
+                                    Height="100"
+                                    Margin="0,0,0,15"
+                                    Background="Transparent">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="30" />
+                                        <RowDefinition />
+                                        <RowDefinition Height="30" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="0.5*" />
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Foreground="Aqua"
+                                        Text="{Binding Name}" />
+
+                                    <pry:Cylinder
+                                        Grid.Row="1"
+                                        Grid.ColumnSpan="3"
+                                        Width="200"
+                                        Height="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        LeftTogIsChecked="{Binding LeftTog}"
+                                        RightTogIsChecked="{Binding RightTog}" />
+
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="伸出"
+                                        Foreground="Aqua"
+                                        IsChecked="True"
+                                        Style="{StaticResource radioButtonStyle}" />
+
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="缩回"
+                                        Foreground="Aqua"
+                                        IsChecked="False"
+                                        Style="{StaticResource radioButtonStyle}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+            </Grid>
+            <!--#endregion-->
+
+            <!--#region 阻挡气缸-->
+            <Grid
+                Name="zd"
                 Grid.Row="1"
-                Margin="10"
-                Background="Transparent"
-                BorderBrush="#00BEFA"
-                BorderThickness="0"
-                ItemsSource="{Binding BlockCylinders}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <UniformGrid
+                Margin="5">
+                <pry:ImageBorder Width="{Binding ElementName=zd, Path=ActualWidth}" Height="{Binding ElementName=zd, Path=ActualHeight}" />
+                <StackPanel>
+                    <Grid Height="40">
+                        <Image
+                            Margin="2,3,0,0"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Columns="8" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid
-                            Width="200"
-                            Height="100"
-                            Margin="0,0,0,15"
-                            Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="30" />
-                                <RowDefinition />
-                                <RowDefinition Height="30" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.5*" />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Foreground="Aqua"
-                                Text="{Binding Name}" />
-
-                            <pry:Cylinder
-                                Grid.Row="1"
-                                Grid.ColumnSpan="3"
-                                Width="200"
-                                Height="50"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                LeftTogIsChecked="{Binding LeftTog}"
-                                RightTogIsChecked="{Binding RightTog}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="伸出"
-                                Foreground="Aqua"
-                                IsChecked="True"
-                                Style="{StaticResource radioButtonStyle}" />
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="缩回"
-                                Foreground="Aqua"
-                                IsChecked="False"
-                                Style="{StaticResource radioButtonStyle}" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-        </Grid>
-        <!--#endregion-->
-
-        <!--#region 托盘气缸-->
-        <Grid
-            Name="tp"
-            Grid.Row="2"
-            Margin="5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="40" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-            <pry:ImageBorder
-                Grid.RowSpan="2"
-                Width="{Binding ElementName=tp, Path=ActualWidth}"
-                Height="{Binding ElementName=tp, Path=ActualHeight}" />
-
-            <Image
-                Margin="2,3,0,0"
-                HorizontalAlignment="Left"
-                Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
-            <TextBlock
-                Margin="10,0,0,0"
-                VerticalAlignment="Center"
-                FontSize="16"
-                Foreground="Aqua"
-                Text="托盘气缸控制" />
-            <ListView
+                            Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+                        <TextBlock
+                            Margin="10,0,0,0"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="Aqua"
+                            Text="阻挡气缸控制" />
+                    </Grid>
+                    <ListView
+                        Name="list2"
+                        Grid.Row="1"
+                        Margin="0,0,0,20"
+                        Background="Transparent"
+                        BorderBrush="#00BEFA"
+                        BorderThickness="0"
+                        ItemsSource="{Binding BlockCylinders}"
+                        ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid
+                                    Width="200"
+                                    Height="100"
+                                    Margin="0,0,0,15"
+                                    Background="Transparent">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="30" />
+                                        <RowDefinition />
+                                        <RowDefinition Height="30" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="0.5*" />
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Foreground="Aqua"
+                                        Text="{Binding Name}" />
+
+                                    <pry:Cylinder
+                                        Grid.Row="1"
+                                        Grid.ColumnSpan="3"
+                                        Width="200"
+                                        Height="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        LeftTogIsChecked="{Binding LeftTog}"
+                                        RightTogIsChecked="{Binding RightTog}" />
+
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="伸出"
+                                        Foreground="Aqua"
+                                        IsChecked="True"
+                                        Style="{StaticResource radioButtonStyle}" />
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="缩回"
+                                        Foreground="Aqua"
+                                        IsChecked="False"
+                                        Style="{StaticResource radioButtonStyle}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+
+
+            </Grid>
+            <!--#endregion-->
+
+            <!--#region 托盘气缸-->
+            <Grid
+                Name="tp"
                 Grid.Row="2"
-                Margin="10"
-                Background="Transparent"
-                BorderBrush="#00BEFA"
-                BorderThickness="0"
-                ItemsSource="{Binding PalletCylinders}"
-                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                <ListView.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <UniformGrid
+                Margin="5">
+                <pry:ImageBorder
+                    Grid.RowSpan="2"
+                    Width="{Binding ElementName=tp, Path=ActualWidth}"
+                    Height="{Binding ElementName=tp, Path=ActualHeight}" />
+                <StackPanel>
+                    <Grid Height="40">
+                        <Image
+                            Margin="2,3,0,0"
                             HorizontalAlignment="Left"
-                            VerticalAlignment="Top"
-                            Columns="8" />
-                    </ItemsPanelTemplate>
-                </ListView.ItemsPanel>
-
-                <ListView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid
-                            Width="200"
-                            Height="100"
-                            Margin="0,0,0,15"
-                            Background="Transparent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="30" />
-                                <RowDefinition />
-                                <RowDefinition Height="30" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="0.5*" />
-                                <ColumnDefinition />
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock
-                                Grid.Column="1"
-                                Grid.ColumnSpan="2"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Foreground="Aqua"
-                                Text="{Binding Name}" />
-
-                            <pry:Cylinder
-                                Grid.Row="1"
-                                Grid.ColumnSpan="3"
-                                Width="200"
-                                Height="50"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                LeftTogIsChecked="{Binding LeftTog}"
-                                RightTogIsChecked="{Binding RightTog}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="伸出"
-                                Foreground="Aqua"
-                                IsChecked="True"
-                                Style="{StaticResource radioButtonStyle}" />
-
-                            <RadioButton
-                                Grid.Row="2"
-                                Grid.Column="2"
-                                Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
-                                CommandParameter="{Binding Name}"
-                                Content="缩回"
-                                Foreground="Aqua"
-                                IsChecked="False"
-                                Style="{StaticResource radioButtonStyle}" />
-                        </Grid>
-                    </DataTemplate>
-                </ListView.ItemTemplate>
-            </ListView>
-        </Grid>
-        <!--#endregion-->
-
-
-
-
-
-
-
-
-    </Grid>
+                            Source="/BPASmartClient.CustomResource;component/Image/标签.png" />
+                        <TextBlock
+                            Margin="10,0,0,0"
+                            VerticalAlignment="Center"
+                            FontSize="16"
+                            Foreground="Aqua"
+                            Text="托盘气缸控制" />
+                    </Grid>
+                    <ListView
+                        Name="list3"
+                        Grid.Row="2"
+                        Margin="0,0,0,20"
+                        Background="Transparent"
+                        BorderBrush="#00BEFA"
+                        BorderThickness="0"
+                        ItemsSource="{Binding PalletCylinders}"
+                        ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                        <ListView.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ListView.ItemsPanel>
+
+                        <ListView.ItemTemplate>
+                            <DataTemplate>
+                                <Grid
+                                    Width="200"
+                                    Height="100"
+                                    Margin="0,0,0,15"
+                                    Background="Transparent">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="30" />
+                                        <RowDefinition />
+                                        <RowDefinition Height="30" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="0.5*" />
+                                        <ColumnDefinition />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        Foreground="Aqua"
+                                        Text="{Binding Name}" />
+
+                                    <pry:Cylinder
+                                        Grid.Row="1"
+                                        Grid.ColumnSpan="3"
+                                        Width="200"
+                                        Height="50"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        LeftTogIsChecked="{Binding LeftTog}"
+                                        RightTogIsChecked="{Binding RightTog}" />
+
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="伸出"
+                                        Foreground="Aqua"
+                                        IsChecked="True"
+                                        Style="{StaticResource radioButtonStyle}" />
+
+                                    <RadioButton
+                                        Grid.Row="2"
+                                        Grid.Column="2"
+                                        Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                                        CommandParameter="{Binding Name}"
+                                        Content="缩回"
+                                        Foreground="Aqua"
+                                        IsChecked="False"
+                                        Style="{StaticResource radioButtonStyle}" />
+                                </Grid>
+                            </DataTemplate>
+                        </ListView.ItemTemplate>
+                    </ListView>
+                </StackPanel>
+
+
+            </Grid>
+            <!--#endregion-->
+
+        </StackPanel>
+    </ScrollViewer>
 </UserControl>
diff --git a/DosingSystem/View/ManualControlView.xaml.cs b/DosingSystem/View/ManualControlView.xaml.cs
index 3cd21a96..9922bd73 100644
--- a/DosingSystem/View/ManualControlView.xaml.cs
+++ b/DosingSystem/View/ManualControlView.xaml.cs
@@ -23,6 +23,14 @@ namespace BPASmartClient.DosingSystem.View
         public ManualControlView()
         {
             InitializeComponent();
+            this.SizeChanged += ManualControlView_SizeChanged;
+        }
+
+        private void ManualControlView_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            this.cy.Height = this.list1.ActualHeight + 40;
+            this.zd.Height = this.list2.ActualHeight + 40;
+            this.tp.Height = this.list3.ActualHeight + 40;
         }
     }
 }
diff --git a/DosingSystem/View/NewRecipeView.xaml b/DosingSystem/View/NewRecipeView.xaml
index bd04e1ed..605bb4fa 100644
--- a/DosingSystem/View/NewRecipeView.xaml
+++ b/DosingSystem/View/NewRecipeView.xaml
@@ -173,7 +173,7 @@
                                                     Foreground="#FF2AB2E7"
                                                     IsEditable="False"
                                                     ItemsSource="{Binding DataContext.RawMaterialNames, RelativeSource={RelativeSource AncestorType=ItemsControl, Mode=FindAncestor}}"
-                                                    SelectedIndex="0"
+                                                    SelectedIndex="{Binding SelectIndex}"
                                                     Style="{StaticResource ComboBoxStyle}"
                                                     Text="{Binding RawMaterialName}" />
 
diff --git a/DosingSystem/View/RecipeSettingsView.xaml b/DosingSystem/View/RecipeSettingsView.xaml
index 1b77b734..dfeb3154 100644
--- a/DosingSystem/View/RecipeSettingsView.xaml
+++ b/DosingSystem/View/RecipeSettingsView.xaml
@@ -101,10 +101,11 @@
             ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
-                    <UniformGrid
+                    <!--<UniformGrid
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
-                        Columns="8" />
+                        Columns="8" />-->
+                    <WrapPanel Orientation="Horizontal" />
                 </ItemsPanelTemplate>
             </ListBox.ItemsPanel>
 
@@ -113,6 +114,7 @@
 
                     <Grid
                         Name="tt"
+                        Width="180"
                         Height="220"
                         Margin="5">
                         <Grid.RowDefinitions>
@@ -252,7 +254,7 @@
                                 Background="#11F53F62"
                                 BorderThickness="0"
                                 Command="{Binding DataContext.RemoveCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
-                                CommandParameter="{Binding RecipCode}"
+                                CommandParameter="{Binding RecipeName}"
                                 Content="删除"
                                 EnterBackground="#22F53F62"
                                 FontStyle="Normal"
@@ -270,7 +272,7 @@
                                 Background="#112AB2E7"
                                 BorderThickness="0"
                                 Command="{Binding DataContext.DetailsCommand, RelativeSource={RelativeSource AncestorType=ListBox, Mode=FindAncestor}}"
-                                CommandParameter="{Binding RecipCode}"
+                                CommandParameter="{Binding RecipeName}"
                                 Content="编辑"
                                 EnterBackground="#222AB2E7"
                                 Foreground="#FF2AB2E7"
diff --git a/DosingSystem/View/RecipeSettingsView.xaml.cs b/DosingSystem/View/RecipeSettingsView.xaml.cs
index d13a3baa..55bf6e65 100644
--- a/DosingSystem/View/RecipeSettingsView.xaml.cs
+++ b/DosingSystem/View/RecipeSettingsView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using BPA.Helper;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -24,6 +25,12 @@ namespace BPASmartClient.DosingSystem.View
         public RecipeSettingsView()
         {
             InitializeComponent();
+            this.Unloaded += RecipeSettingsView_Unloaded;
+        }
+
+        private void RecipeSettingsView_Unloaded(object sender, RoutedEventArgs e)
+        {
+            Json<LocaPar>.Save();
         }
 
         //public static void SetAlignment()
diff --git a/DosingSystem/View/StockControlView.xaml b/DosingSystem/View/StockControlView.xaml
index e0d10533..2431bb98 100644
--- a/DosingSystem/View/StockControlView.xaml
+++ b/DosingSystem/View/StockControlView.xaml
@@ -1,37 +1,82 @@
-<UserControl x:Class="BPASmartClient.DosingSystem.View.StockControlView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:BPASmartClient.DosingSystem.View"
-              xmlns:vm="clr-namespace:BPASmartClient.DosingSystem.ViewModel"
-             xmlns:define="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BPASmartClient.DosingSystem.View.StockControlView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:define="clr-namespace:BPASmartClient.CustomResource.UserControls;assembly=BPASmartClient.CustomResource"
+    xmlns:local="clr-namespace:BPASmartClient.DosingSystem.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="clr-namespace:BPASmartClient.DosingSystem.ViewModel"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <Style x:Key="radioButtonStyle" TargetType="RadioButton">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="RadioButton">
+                        <Grid Name="gr" Opacity="0.8">
+                            <ContentControl
+                                Margin="{TemplateBinding Margin}"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Content="{TemplateBinding Content}"
+                                FontSize="{TemplateBinding FontSize}"
+                                Foreground="{TemplateBinding Foreground}" />
+                            <Image
+                                Name="image"
+                                Source="/BPASmartClient.CustomResource;component/Image/边框线.png"
+                                Stretch="Fill" />
+
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsChecked" Value="False">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/边框线.png" />
+                            </Trigger>
+                            <Trigger Property="IsChecked" Value="True">
+                                <Setter TargetName="image" Property="Source" Value="/BPASmartClient.CustomResource;component/Image/透明背景.png" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="gr" Property="Opacity" Value="1" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
     <UserControl.DataContext>
-        <vm:StockControViewModel/>
+        <vm:StockControViewModel />
     </UserControl.DataContext>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-            <RowDefinition/>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid x:Name="TopGrid">
             <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="0.2*"/>
+                <RowDefinition Height="0.2*" />
+                <RowDefinition />
             </Grid.RowDefinitions>
             <ListView
+                Grid.Row="1"
                 VerticalAlignment="Center"
                 Background="Transparent"
                 BorderThickness="0"
-                  ScrollViewer.HorizontalScrollBarVisibility="Disabled" 
-                      ScrollViewer.VerticalScrollBarVisibility="Disabled"  ItemsSource="{Binding statusTop}">
+                ItemsSource="{Binding statusTop}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <UniformGrid  Columns="6" HorizontalAlignment="Left"
-                            VerticalAlignment="Top"     
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="6"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -39,107 +84,109 @@
                     <DataTemplate>
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="0.8*"/>
-                                <RowDefinition Height="0.2*"/>
+                                <RowDefinition Height="0.8*" />
+                                <RowDefinition Height="0.2*" />
                             </Grid.RowDefinitions>
-                            <define:MaterialStock Margin="0,0,70,0" IsOpenState="False"  IsFaultState="False" IsRunning="False" IsLayOffState="False"/>
-                            <Grid VerticalAlignment="Bottom"  Margin="5,5,70,0" Grid.Row="1" >
+                            <define:MaterialStock
+                                Margin="35,0,35,0"
+                                IsFaultState="{Binding IsFault}"
+                                IsLayOffState="{Binding IsLayOff}"
+                                IsOpenState="{Binding IsOpen}"
+                                IsRunning="{Binding IsRunning}" />
+                            <Grid Grid.Row="1" VerticalAlignment="Bottom">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Button Margin="0,0,10,0">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border x:Name="br3" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="Orange">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                    <TextBlock VerticalAlignment="Center" Text="&#xe79e;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                                    <TextBlock Text="开盖" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                                                </StackPanel>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background" Value="yellow" TargetName="br3"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
 
-                                    </Button.Template>
-                                </Button>
-                                <Button  Grid.Column="1">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border x:Name="br2" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="yellowgreen">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
-                                                    <TextBlock VerticalAlignment="Center" Text="&#xe63f;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                                    <TextBlock Text="出料" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                                                </StackPanel>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background" Value="lawngreen" TargetName="br2"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                </Button>
+                                <Button
+                                    Height="30"
+                                    Margin="5,0,5,0"
+                                    Command="{Binding AddCommand}"
+                                    Content="开盖"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+
+                                <Button
+                                    Grid.Column="1"
+                                    Height="30"
+                                    Margin="5,0,5,0"
+                                    Command="{Binding AddCommand}"
+                                    Content="出料"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
                             </Grid>
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
         </Grid>
-        <Grid Grid.Row="1" x:Name="midGrid" Margin="0,0,0,0">
-            <define:ConveyBelt2  IsRun="True"  BeltWidth="{Binding ElementName=midGrid, Path=ActualWidth}" BeltHeight="{Binding ElementName=midGrid, Path=ActualHeight}" Margin="-12,0,10,0" BeltDashThickess="50"/>
+        <Grid
+            x:Name="midGrid"
+            Grid.Row="1"
+            Margin="0,0,0,0"
+            Background="Transparent">
+
+            <Grid.RowDefinitions>
+                <RowDefinition />
+
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <define:ConveyBelt2
+                Grid.RowSpan="2"
+                Margin="-12,0,10,0"
+                BeltDashThickess="50"
+                BeltHeight="{Binding ElementName=midGrid, Path=ActualHeight}"
+                BeltWidth="{Binding ElementName=midGrid, Path=ActualWidth}"
+                IsRun="False" />
+
+            <StackPanel
+                Margin="10,0,0,0"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                Orientation="Horizontal">
+                <RadioButton
+                    Width="130"
+                    Height="50"
+                    Command="{Binding DataContext.Open, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                    CommandParameter="{Binding Name}"
+                    Content="输送带启动"
+                    Foreground="Aqua"
+                    IsChecked="True"
+                    Style="{StaticResource radioButtonStyle}" />
+
+                <RadioButton
+                    Width="130"
+                    Height="50"
+                    Command="{Binding DataContext.Close, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}"
+                    CommandParameter="{Binding Name}"
+                    Content="输送带停止"
+                    Foreground="Aqua"
+                    IsChecked="False"
+                    Style="{StaticResource radioButtonStyle}" />
+            </StackPanel>
+
         </Grid>
         <Grid Grid.Row="2">
             <Grid.RowDefinitions>
-                <RowDefinition Height="0.2*"/>
-                <RowDefinition/>
+                <RowDefinition />
+                <RowDefinition Height="0.2*" />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,40,0">
-            <Button HorizontalAlignment="Right" Margin="0,0,10,0">
-                <Button.Template>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="br5" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="yellowgreen">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
-                                    <TextBlock VerticalAlignment="Center" Text="&#xe746;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                <TextBlock Text="启动线体" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                            </StackPanel>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="lawngreen" TargetName="br5"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Button.Template>
-            </Button>
-                <Button HorizontalAlignment="Right" Margin="0,0,10,0">
-                    <Button.Template>
-                        <ControlTemplate TargetType="{x:Type Button}">
-                            <Border x:Name="br5" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="Red">
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
-                                    <TextBlock VerticalAlignment="Center" Text="&#xe631;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                    <TextBlock Text="停止线体" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                                </StackPanel>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsPressed" Value="True">
-                                    <Setter Property="Background" Value="PaleVioletRed" TargetName="br5"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Button.Template>
-                </Button>
-            </StackPanel>
-            <ListView Grid.Row="1"  Background="Transparent" VerticalAlignment="Center"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                BorderThickness="0" ScrollViewer.VerticalScrollBarVisibility="Disabled" ItemsSource="{Binding statusDown}">
+            <ListView
+                Grid.Row="0"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{Binding statusDown}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollBarVisibility="Disabled">
                 <ListView.ItemsPanel>
                     <ItemsPanelTemplate>
-                        <UniformGrid Columns="6" HorizontalAlignment="Left"
-                            VerticalAlignment="Top"       
+                        <UniformGrid
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Top"
+                            Columns="6"
                             Rows="1" />
                     </ItemsPanelTemplate>
                 </ListView.ItemsPanel>
@@ -147,50 +194,37 @@
                     <DataTemplate>
                         <Grid>
                             <Grid.RowDefinitions>
-                                <RowDefinition Height="0.8*"/>
-                                <RowDefinition Height="0.2*"/>
+                                <RowDefinition Height="0.8*" />
+                                <RowDefinition Height="0.2*" />
                             </Grid.RowDefinitions>
-                            <define:MaterialStock Margin="0,0,70,0" IsOpenState="False" IsFaultState="False" IsRunning="True" />
-                            <Grid VerticalAlignment="Bottom"  Margin="5,5,70,0" Grid.Row="1" >
+                            <define:MaterialStock
+                                Margin="35,0,35,0"
+                                IsFaultState="{Binding IsFault}"
+                                IsLayOffState="{Binding IsLayOff}"
+                                IsOpenState="{Binding IsOpen}"
+                                IsRunning="{Binding IsRunning}" />
+                            <Grid Grid.Row="1" VerticalAlignment="Bottom">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
                                 </Grid.ColumnDefinitions>
-                                <Button Margin="0,0,10,0">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border x:Name="br" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="Orange">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                    <TextBlock VerticalAlignment="Center" Text="&#xe79e;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                                    <TextBlock Text="开盖" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                                                </StackPanel>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background" Value="yellow" TargetName="br"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
 
-                                    </Button.Template>
-                                </Button>
-                                <Button  Grid.Column="1">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border x:Name="br1" BorderThickness="2" BorderBrush="DimGray" CornerRadius="5" Background="yellowgreen">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" >
-                                                    <TextBlock VerticalAlignment="Center" Text="&#xe63f;" FontFamily="/BPASmartClient.CustomResource;component/Fonts/new/#iconfont" Margin="0,0,5,0"/>
-                                                    <TextBlock Text="出料" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14"/>
-                                                </StackPanel>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background" Value="lawngreen" TargetName="br1"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                </Button>
+                                <Button
+                                    Height="30"
+                                    Margin="5,0,5,0"
+                                    Command="{Binding AddCommand}"
+                                    Content="开盖"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
+
+                                <Button
+                                    Grid.Column="1"
+                                    Height="30"
+                                    Margin="5,0,5,0"
+                                    Command="{Binding AddCommand}"
+                                    Content="出料"
+                                    FontSize="20"
+                                    Style="{StaticResource ImageButtonStyle}" />
                             </Grid>
                         </Grid>
                     </DataTemplate>
diff --git a/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs b/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
index 2d011145..d51d91bc 100644
--- a/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
+++ b/DosingSystem/ViewModel/ChangeDeviceNameViewModel.cs
@@ -4,14 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using BPASmartClient.Helper;
-using BPASmartClient.DosingSystem.Model;
+
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.CustomResource.Pages.Model;
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
-    public class ChangeDeviceNameViewModel : ObservableObject
+    public class ChangeDeviceNameViewModel : ViewModelBase
     {
         public ChangeDeviceNameViewModel()
         {
@@ -20,8 +20,8 @@ namespace BPASmartClient.DosingSystem.ViewModel
                 if (o != null && o is string str) IpAddress = str;
             }), "ChangeDeviceNameViewOpen");
 
-            CancleCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("ChangeDeviceNameViewClose"); });
-            ConfirmCommand = new RelayCommand(() =>
+            CancelCommand = new RelayCommand(() => { ActionManage.GetInstance.Send("ChangeDeviceNameViewClose"); });
+            AddCommand = new RelayCommand(() =>
             {
                 if (string.IsNullOrEmpty(DeviceName))
                 {
@@ -58,13 +58,13 @@ namespace BPASmartClient.DosingSystem.ViewModel
 
         private static string IpAddress = string.Empty;
 
-        public RelayCommand ConfirmCommand { get; set; }
+        //public RelayCommand ConfirmCommand { get; set; }
 
-        public RelayCommand CancleCommand { get; set; }
+        //public RelayCommand CancleCommand { get; set; }
 
 
-        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
-        private string _mErrorInfo;
+        //public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        //private string _mErrorInfo;
 
 
         public string DeviceName { get { return _mDeviceName; } set { _mDeviceName = value; OnPropertyChanged(); } }
diff --git a/DosingSystem/ViewModel/DeviceListViewModel.cs b/DosingSystem/ViewModel/DeviceListViewModel.cs
index bcefd24d..234a50fd 100644
--- a/DosingSystem/ViewModel/DeviceListViewModel.cs
+++ b/DosingSystem/ViewModel/DeviceListViewModel.cs
@@ -10,15 +10,15 @@ using System.Windows;
 using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.DosingSystem.View;
-using BPASmartClient.DosingSystem.Model;
+
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
-    public class DeviceListViewModel : ObservableObject
+    public class DeviceListViewModel : ViewModelBase
     {
         public DeviceListViewModel()
         {
-            ChangeNameCommand = new RelayCommand<object>((o) =>
+            DetailsCommand = new RelayCommand<object>((o) =>
             {
                 if (o != null && o is string str)
                 {
@@ -30,7 +30,7 @@ namespace BPASmartClient.DosingSystem.ViewModel
             devices = DeviceInquire.GetInstance.devices;
         }
 
-        public RelayCommand<object> ChangeNameCommand { get; set; }
+        //public RelayCommand<object> ChangeNameCommand { get; set; }
 
         //public static ObservableCollection<Devices> devices { get; set; } = new ObservableCollection<Devices>();
         public ObservableCollection<Devices> devices { get; set; }
diff --git a/DosingSystem/ViewModel/DeviceMaterialParViewModel.cs b/DosingSystem/ViewModel/DeviceMaterialParViewModel.cs
index c71fbe5d..e4f02028 100644
--- a/DosingSystem/ViewModel/DeviceMaterialParViewModel.cs
+++ b/DosingSystem/ViewModel/DeviceMaterialParViewModel.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
-using BPASmartClient.DosingSystem.Model;
+
 using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
@@ -14,7 +14,7 @@ using System.Diagnostics;
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
-    public class DeviceMaterialParViewModel : ObservableObject
+    public class DeviceMaterialParViewModel : ViewModelBase
     {
         public DeviceMaterialParViewModel()
         {
@@ -60,10 +60,10 @@ namespace BPASmartClient.DosingSystem.ViewModel
 
         public ObservableCollection<DeviceParModel> deviceParModels { get; set; }
 
-        public RelayCommand<object> RemoveCommand { get; set; }
+        //public RelayCommand<object> RemoveCommand { get; set; }
 
-        public RelayCommand AddCommand { get; set; }
-        public RelayCommand SaveCommand { get; set; }
+        //public RelayCommand AddCommand { get; set; }
+        //public RelayCommand SaveCommand { get; set; }
 
     }
 }
diff --git a/DosingSystem/ViewModel/HardwareStatusViewModel.cs b/DosingSystem/ViewModel/HardwareStatusViewModel.cs
index cd722046..35f77703 100644
--- a/DosingSystem/ViewModel/HardwareStatusViewModel.cs
+++ b/DosingSystem/ViewModel/HardwareStatusViewModel.cs
@@ -9,7 +9,7 @@ using System.Collections.ObjectModel;
 using System.Windows;
 using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
-using BPASmartClient.DosingSystem.Model;
+
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
diff --git a/DosingSystem/ViewModel/NewMaterialViewModel.cs b/DosingSystem/ViewModel/NewMaterialViewModel.cs
index 2443d389..590b6eca 100644
--- a/DosingSystem/ViewModel/NewMaterialViewModel.cs
+++ b/DosingSystem/ViewModel/NewMaterialViewModel.cs
@@ -1,5 +1,5 @@
 using BPASmartClient.CustomResource.Pages.Model;
-using BPASmartClient.DosingSystem.Model;
+
 using BPASmartClient.Helper;
 using BPASmartClient.Model;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
@@ -13,28 +13,28 @@ using System.Threading.Tasks;
 
 namespace BPASmartClient.DosingSystem.ViewModel;
 
-public class NewMaterialViewModel:ObservableObject
+public class NewMaterialViewModel : ViewModelBase
 {
     public ObservableCollection<RawMaterialModel> Materials { get; set; } = Json<LocaMaterial>.Data.LocalMaterails;
 
     public string MaterialName { get { return _materialName; } set { _materialName = value; OnPropertyChanged(); } }
     private string _materialName = string.Empty;
 
-    public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
-    private string _mErrorInfo;
+    //public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+    //private string _mErrorInfo;
 
-    public RelayCommand<object> RemoveCommand { get; set; }
+    //public RelayCommand<object> RemoveCommand { get; set; }
 
-    public RelayCommand SaveCommand { get; set; }
+    //public RelayCommand SaveCommand { get; set; }
 
 
 
     private void Remove(object o)
     {
         if (o == null) return;
-        if(o is string id)
+        if (o is string id)
         {
-            var res  = Materials.FirstOrDefault(p=>p.RawMaterialId == id);
+            var res = Materials.FirstOrDefault(p => p.RawMaterialId == id);
             Materials.Remove(res);
             Json<LocaMaterial>.Save();
             MessageLog.GetInstance.ShowUserLog($"删除原料--{res.RawMaterialName}");
@@ -47,10 +47,10 @@ public class NewMaterialViewModel:ObservableObject
 
         SaveCommand = new RelayCommand(() =>
         {
-            if(MaterialName == String.Empty) { ErrorInfo = "原料名称不能为空";return; }
-            if(Global.DeviceRawMaterials.FirstOrDefault(p=>p.RawMaterialName == MaterialName) != null) { ErrorInfo = "设备中已存在该原料名称";return;}
-            if(Json<LocaMaterial>.Data.LocalMaterails.FirstOrDefault(p=>p.RawMaterialName == MaterialName) != null) { ErrorInfo = "本地原料名称重复";return ;}
-            Json<LocaMaterial>.Data.LocalMaterails.Add(new RawMaterialModel { RawMaterialName = MaterialName, RawMaterialId = Guid.NewGuid().ToString() , RawMaterialSource = 0 });
+            if (MaterialName == String.Empty) { ErrorInfo = "原料名称不能为空"; return; }
+            if (Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == MaterialName) != null) { ErrorInfo = "设备中已存在该原料名称"; return; }
+            if (Json<LocaMaterial>.Data.LocalMaterails.FirstOrDefault(p => p.RawMaterialName == MaterialName) != null) { ErrorInfo = "本地原料名称重复"; return; }
+            Json<LocaMaterial>.Data.LocalMaterails.Add(new RawMaterialModel { RawMaterialName = MaterialName, RawMaterialId = Guid.NewGuid().ToString(), RawMaterialSource = 0 });
             Json<LocaMaterial>.Save();
             MessageLog.GetInstance.ShowUserLog($"添加原料--{MaterialName}");
         });
diff --git a/DosingSystem/ViewModel/NewRecipeViewModel.cs b/DosingSystem/ViewModel/NewRecipeViewModel.cs
index 4e51c28a..cc72812b 100644
--- a/DosingSystem/ViewModel/NewRecipeViewModel.cs
+++ b/DosingSystem/ViewModel/NewRecipeViewModel.cs
@@ -7,13 +7,14 @@ using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System.Collections.ObjectModel;
 using Microsoft.Toolkit.Mvvm.Input;
 using BPASmartClient.Helper;
-using BPASmartClient.DosingSystem.Model;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.Model;
+using BPASmartClient.CustomResource.UserControls.MessageShow;
+using BPASmartClient.CustomResource.UserControls;
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
-    public class NewRecipeViewModel : ObservableObject
+    public class NewRecipeViewModel : ViewModelBase
     {
         public NewRecipeViewModel()
         {
@@ -24,11 +25,13 @@ namespace BPASmartClient.DosingSystem.ViewModel
                     RecipeName = rm.RecipeName;
                     foreach (var item in rm.RawMaterials)
                     {
+                        item.SelectIndex = Array.FindIndex(RawMaterialNames.ToArray(), p => p == item.RawMaterialName);
                         RawMaterials.Add(item);
                     }
                     RecipCode = rm.RecipCode;
+                    Index = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
                 }
-            }), "Details");
+            }), "Details", true);
 
             AddCommand = new RelayCommand(() =>
             {
@@ -55,72 +58,88 @@ namespace BPASmartClient.DosingSystem.ViewModel
 
             SaveCommand = new RelayCommand(() =>
             {
-                ErrorInfo = String.Empty;
-                if (RecipeName == String.Empty) { ErrorInfo = "配方名称未填写"; return; }
-                for (int i = 0; i < RawMaterials.Count; i++)
-                {
-                    var res = DeviceInquire.GetInstance.devices.FirstOrDefault(p => p.DeviceName == RawMaterials.ElementAt(i).RawMaterialName);
-                    if (res != null)
-                    {
-                        RawMaterials.ElementAt(i).DeviceIp = res.IpAddress;//根据设备名称和原料名称的唯一匹配关系，给原料配置IP
-                        RawMaterials.ElementAt(i).RawMaterialSource = 1;
-                    }
-                    var su = Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == RawMaterials.ElementAt(i).RawMaterialName);
-                    if (su != null)
-                    {
-                        RawMaterials.ElementAt(i).RawMaterialSource = su.RawMaterialSource;
-                    }
-
-                }
+                if (string.IsNullOrEmpty(RecipeName)) { ErrorInfo = "请输入配方名称"; return; }
 
-                if (RecipCode.Length <= 0)//新建配方
+                //编辑配方
+                if (Index >= 0 && Index < Json<LocaPar>.Data.Recipes.Count)
                 {
                     var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
-
-                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    if (res >= 0 && res != Index)
                     {
-                        ErrorInfo = "该配方已存在，请重新输入";
+                        ErrorInfo = "配方名称已经存在！";
+                        return;
                     }
-                    else
+                    Json<LocaPar>.Data.Recipes.ElementAt(Index).RecipeName = RecipeName;
+                    Json<LocaPar>.Data.Recipes.ElementAt(Index).RawMaterials.Clear();
+                    RawMaterials.ToList()?.ForEach(item =>
                     {
-                        AddRecipes();
-                    }
+                        Json<LocaPar>.Data.Recipes.ElementAt(Index).RawMaterials.Add(item);
+                    });
+                    Json<LocaPar>.Save();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"{RecipeName} 配方编辑完成");
                 }
-                else//修改配方
+                else //新建配方
                 {
-                    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipCode == RecipCode);
-                    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                    if (Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == RecipeName) != null)
                     {
-                        Json<LocaPar>.Data.Recipes.ElementAt(res).RecipeName = RecipeName;
-                        Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Clear();
-                        foreach (var item in RawMaterials)
-                        {
-                            Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
-                        }
+                        ErrorInfo = "配方名称已存在！";
+                        return;
                     }
+
+                    Json<LocaPar>.Data.Recipes.Add(new RecipeModel()
+                    {
+                        RecipeName = RecipeName,
+                        RawMaterials = RawMaterials,
+                    });
+                    Json<LocaPar>.Save();
+                    NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"新建配方成功!");
                 }
+
+                //for (int i = 0; i < RawMaterials.Count; i++)
+                //{
+                //    var res = DeviceInquire.GetInstance.devices.FirstOrDefault(p => p.DeviceName == RawMaterials.ElementAt(i).RawMaterialName);
+                //    if (res != null)
+                //    {
+                //        RawMaterials.ElementAt(i).DeviceIp = res.IpAddress;//根据设备名称和原料名称的唯一匹配关系，给原料配置IP
+                //        RawMaterials.ElementAt(i).RawMaterialSource = 1;
+                //    }
+                //    var su = Global.DeviceRawMaterials.FirstOrDefault(p => p.RawMaterialName == RawMaterials.ElementAt(i).RawMaterialName);
+                //    if (su != null)
+                //    {
+                //        RawMaterials.ElementAt(i).RawMaterialSource = su.RawMaterialSource;
+                //    }
+
+                //}
+
+                //if (RecipCode.Length <= 0)//新建配方
+                //{
+                //    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipeName == RecipeName);
+
+                //    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                //    {
+                //        ErrorInfo = "该配方已存在，请重新输入";
+                //    }
+                //    else
+                //    {
+                //        AddRecipes();
+                //    }
+                //}
+                //else//修改配方
+                //{
+                //    var res = Array.FindIndex(Json<LocaPar>.Data.Recipes.ToArray(), p => p.RecipCode == RecipCode);
+                //    if (res >= 0 && res < Json<LocaPar>.Data.Recipes.Count)
+                //    {
+                //        Json<LocaPar>.Data.Recipes.ElementAt(res).RecipeName = RecipeName;
+                //        Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Clear();
+                //        foreach (var item in RawMaterials)
+                //        {
+                //            Json<LocaPar>.Data.Recipes.ElementAt(res).RawMaterials.Add(item);
+                //        }
+                //    }
+                //}
                 ActionManage.GetInstance.Send("CloseNewRecipeView");
             });
 
-            //RawMaterialNames.Add("乳化剂");
-            //RawMaterialNames.Add("酶制剂");
-            //RawMaterialNames.Add("增味剂");
-
-
-            //RawMaterialNames.Add("营养强化剂");
-            //RawMaterialNames.Add("抗结剂");
-            //RawMaterialNames.Add("消泡剂");
-            //RawMaterialNames.Add("膨松剂");
-            //RawMaterialNames.Add("防腐剂");
-            //RawMaterialNames.Add("着色剂");
-            //RawMaterialNames.Add("甜味剂");
-            //RawMaterialNames.Add("酸味剂");
-            //RawMaterialNames.Add("增白剂");
-            //RawMaterialNames.Add("香料");
-            //RawMaterialNames.Add("抗氧化剂");
-            //RawMaterialNames.Add("食用香料");
-            //RawMaterialNames.Add("增稠剂");
-
             if (Global.userInfo.permission == CustomResource.Pages.Enums.Permission.管理员)
             {
                 foreach (var item in Global.DeviceRawMaterials)
@@ -170,14 +189,14 @@ namespace BPASmartClient.DosingSystem.ViewModel
         public string RecipeName { get { return _mRecipeName; } set { _mRecipeName = value; OnPropertyChanged(); } }
         private string _mRecipeName = string.Empty;
 
-        public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
-        private string _mErrorInfo;
+        //public string ErrorInfo { get { return _mErrorInfo; } set { _mErrorInfo = value; OnPropertyChanged(); } }
+        //private string _mErrorInfo;
 
-        public RelayCommand AddCommand { get; set; }
+        //public RelayCommand AddCommand { get; set; }
 
-        public RelayCommand<object> RemoveCommand { get; set; }
+        //public RelayCommand<object> RemoveCommand { get; set; }
 
-        public RelayCommand SaveCommand { get; set; }
+        //public RelayCommand SaveCommand { get; set; }
 
         public ObservableCollection<RawMaterialModel> RawMaterials { get; set; } = new ObservableCollection<RawMaterialModel>();
 
diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs
index 845eeac3..9d7a22e1 100644
--- a/DosingSystem/ViewModel/RecipeControlViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs
@@ -9,7 +9,7 @@ using System.Collections.ObjectModel;
 using System.Windows;
 using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
-using BPASmartClient.DosingSystem.Model;
+
 using System.Threading;
 using BPASmartClient.CustomResource.Pages.Model;
 using BPASmartClient.CustomResource.UserControls.MessageShow;
diff --git a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
index 076f3a78..8963ce07 100644
--- a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
+++ b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs
@@ -9,7 +9,6 @@ using System.Collections.ObjectModel;
 using System.Windows;
 using BPASmartClient.Helper;
 using Microsoft.Toolkit.Mvvm.Input;
-using BPASmartClient.DosingSystem.Model;
 using BPASmartClient.DosingSystem.View;
 using BPASmartClient.CustomResource.UserControls;
 using BPASmartClient.CustomResource.UserControls.Model;
@@ -46,27 +45,31 @@ namespace BPASmartClient.DosingSystem.ViewModel
             });
             RemoveCommand = new RelayCommand<object>((o) =>
             {
-                if (o is string str)
+                if (!string.IsNullOrEmpty(o?.ToString()))
                 {
-                    if (MessageLog.GetInstance.ShowDialog($"是否删除【{str}】配方"))
+                    if (MessageLog.GetInstance.ShowDialog($"是否删除【{o.ToString()}】配方,删除后数据将永久丢失！无法找回", DialogType.Warning))
                     {
-                        var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
+                        var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
                         if (res != null) Json<LocaPar>.Data.Recipes.Remove(res);
-                        MessageLog.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}");
+                        Json<LocaPar>.Save();
+                        NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方删除成功!");
+                        MessageLog.GetInstance.ShowUserLog($"删除配方 {res.RecipeName}");
                     }
                 }
             });
 
             DetailsCommand = new RelayCommand<object>((o) =>
             {
-                if (o != null && o is string str)
+                if (!string.IsNullOrEmpty(o?.ToString()))
                 {
-                    ActionManage.GetInstance.CancelRegister("Details");
-                    NewRecipeView nrv = new NewRecipeView();
-                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipCode == str);
-                    ActionManage.GetInstance.Send("Details", res);
-                    nrv.ShowDialog();
-                    MessageLog.GetInstance.ShowUserLog($"编辑配方名称——{res.RecipeName}");
+                    var res = Json<LocaPar>.Data.Recipes.FirstOrDefault(p => p.RecipeName == o.ToString());
+                    if (res != null)
+                    {
+                        NewRecipeView nrv = new NewRecipeView();
+                        ActionManage.GetInstance.Send("Details", res);
+                        nrv.ShowDialog();
+                    }
+                    //MessageLog.GetInstance.ShowUserLog($"编辑配方名称——{res.RecipeName}");
                 }
             });
 
diff --git a/DosingSystem/ViewModel/StockControViewModel.cs b/DosingSystem/ViewModel/StockControViewModel.cs
index 23cc1553..68d008b3 100644
--- a/DosingSystem/ViewModel/StockControViewModel.cs
+++ b/DosingSystem/ViewModel/StockControViewModel.cs
@@ -1,29 +1,54 @@
-using BPASmartClient.DosingSystem.Model;
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
+using Microsoft.Toolkit.Mvvm.Input;
 
 namespace BPASmartClient.DosingSystem.ViewModel
 {
-    internal class StockControViewModel
+    public class StockControViewModel : ObservableObject
     {
         public StockControViewModel()
         {
-            for (int i = 0; i < 6; i++)
+            Task.Factory.StartNew(() =>
             {
-                statusTop.Add(new StockStatusModel { IsFault = false, IsLayOff = true, IsRunning = true, MaterialName = $"{i+1}号料仓", MaterialWeight = 85+i });
-            }
-            for (int i =6; i < 12; i++)
-            {
-                statusDown.Add(new StockStatusModel { IsFault = false, IsLayOff = true, IsRunning = true, MaterialName = $"{i+1}号料仓", MaterialWeight = 85 + i });
-            }
-            
+                App.Current.Dispatcher.Invoke(() =>
+                {
+                    for (int i = 0; i < 6; i++)
+                    {
+                        statusTop.Add(new StockStatusModel { IsFault = false, IsLayOff = true, IsRunning = true, MaterialName = $"{i + 1}号料仓", MaterialWeight = 85 + i });
+                    }
+                    for (int i = 6; i < 12; i++)
+                    {
+                        statusDown.Add(new StockStatusModel { IsFault = false, IsLayOff = true, IsRunning = true, MaterialName = $"{i + 1}号料仓", MaterialWeight = 85 + i });
+                    }
+                });
+            });
+
+            StartConveyerBeltCommand = new RelayCommand(() => { ConveyerBeltWork = !ConveyerBeltWork; });
         }
 
-     
+        //启动输送带
+        public RelayCommand StartConveyerBeltCommand { get; set; }
+
+        //停止输送带
+        //public RelayCommand StopConveyerBeltCommand { get; set; }
+
+        //开盖控制
+        public RelayCommand<object> UnCapControlCommand { get; set; }
+
+        //放料控制
+        public RelayCommand<object> BlowingControlCommand { get; set; }
+
+
+        public bool ConveyerBeltWork { get { return _mConveyerBeltWork; } set { _mConveyerBeltWork = value; OnPropertyChanged(); } }
+        private bool _mConveyerBeltWork;
+
+
         public ObservableCollection<StockStatusModel> statusTop { get; set; } = new ObservableCollection<StockStatusModel>();
         public ObservableCollection<StockStatusModel> statusDown { get; set; } = new ObservableCollection<StockStatusModel>();
     }