From 31a506542ad99a556e1c90fd510469c918e16099 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 8 Jun 2023 14:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=96=99=E7=AB=99=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E5=8F=8A=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E9=85=8D=E6=96=B9=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BPASmartClient.JXJFoodSmallStation.csproj | 3 +
.../Model/ProcessControl.cs | 39 +++-
.../Model/Siemens/LocalRecipeDataColl.cs | 4 +
.../View/RecipeReceiveView.xaml | 6 +-
.../View/SelectRecipesView.xaml | 221 ++++++++++++++++++
.../View/SelectRecipesView.xaml.cs | 31 +++
.../ViewModel/NewLocalRecipeViewModel.cs | 17 +-
.../ViewModel/RecipeReceiveViewModel.cs | 33 ++-
.../ViewModel/SelectRecipesViewModel.cs | 115 +++++++++
9 files changed, 462 insertions(+), 7 deletions(-)
create mode 100644 BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml
create mode 100644 BPASmartClient.JXJFoodSmallStation/View/SelectRecipesView.xaml.cs
create mode 100644 BPASmartClient.JXJFoodSmallStation/ViewModel/SelectRecipesViewModel.cs
diff --git a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
index 6c3c8aaa..53a1f31f 100644
--- a/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
+++ b/BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj
@@ -35,6 +35,9 @@
Code
+
+ Code
+
Code
diff --git a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
index 2912495d..a7a6fbdf 100644
--- a/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
+++ b/BPASmartClient.JXJFoodSmallStation/Model/ProcessControl.cs
@@ -1340,9 +1340,44 @@ namespace BPASmartClient.JXJFoodSmallStation.Model
//将本地配方发送到西门子配方里,执行配料
ActionManage.GetInstance.Register(new Action