Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration

BPASmartClient.Business/BPASmartClient.Business.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
-    <PackageReference Include="BPA.Communication" Version="1.0.114" />
+    <PackageReference Include="BPA.Communication" Version="1.0.116" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -463,7 +463,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
   </ItemGroup>

BPASmartClient.FoodStationTest/BPASmartClient.FoodStationTest.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.114" />
+    <PackageReference Include="BPA.Communication" Version="1.0.116" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.JXJFoodBigStation/BPASmartClient.JXJFoodBigStation.csproj

@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.114" />
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Communication" Version="1.0.116" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.JakaRobot/BPASmartClient.JakaRobot.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
   </ItemGroup>
 
 </Project>

BPASmartClient.Modbus/BPASmartClient.Modbus.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="NModbus" Version="3.0.72" />
     <PackageReference Include="System.IO.Ports" Version="6.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />

BPASmartClient.Model/BPASmartClient.Model.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="log4net" Version="2.0.15" />
   </ItemGroup>

BPASmartClient.Nfc/BPASmartClient.Nfc.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
   </ItemGroup>
 
 </Project>

BPASmartClient.S7Net/BPASmartClient.S7Net.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="S7netplus" Version="0.14.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />

BPASmartClient.ScreenLib/BPASmartClient.ScreenLib.csproj

@@ -24,7 +24,7 @@
 	</ItemGroup>
   <ItemGroup>
     <PackageReference Include="BPA.CustomResource" Version="1.0.23" />
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
   </ItemGroup>
   <ItemGroup>

BPASmartClient.SerialPort/BPASmartClient.SerialPort.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
     <PackageReference Include="System.IO.Ports" Version="6.0.0" />
   </ItemGroup>
 

BPASmartClient.SmallBatchingSystem/BPASmartClient.SmallBatchingSystem.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.114" />
+    <PackageReference Include="BPA.Communication" Version="1.0.116" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.Tourism/Control_MorkCL.cs

@@ -44,11 +44,11 @@ namespace BPASmartClient.MorkCL
             devices.TryAdd(EDeviceType.压力锅, new PressureCookerServer());
             devices.TryAdd(EDeviceType.外部设备, new OtherServer());
 
-            //devices[EDeviceType.炒锅1].Init(ConnectPar.FryingPanIP1);
-            //devices[EDeviceType.炒锅2].Init(ConnectPar.FryingPanIP2);
-            //devices[EDeviceType.机器人].Init(ConnectPar.RobotIP);
-            //devices[EDeviceType.压力锅].Init(ConnectPar.PressureCookerIP);
-            //devices[EDeviceType.外部设备].Init(ConnectPar.PPortName);
+            devices[EDeviceType.炒锅1].Init(ConnectPar.FryingPanIP1);
+            devices[EDeviceType.炒锅2].Init(ConnectPar.FryingPanIP2);
+            devices[EDeviceType.机器人].Init(ConnectPar.RobotIP);
+            devices[EDeviceType.压力锅].Init(ConnectPar.PressureCookerIP);
+            devices[EDeviceType.外部设备].Init(ConnectPar.PPortName);
 
             #region 读取本地文件数据
             Json<RecipesInfo>.Read();

BPASmartClient.Tourism/ViewModel/testViewModel.cs

@@ -61,6 +61,36 @@ namespace BPASmartClient.MorkCL.ViewModel
                     funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30, Id = "" } }.ToList()
                 });
 
+                cd.ControlFuncs.Enqueue(new FuncModel()
+                {
+                    eFunc = EFunc.添加辅料,
+                    funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30, Id = "" } }.ToList()
+                });
+
+                cd.ControlFuncs.Enqueue(new FuncModel()
+                {
+                    eFunc = EFunc.添加主料,
+                    funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30, Id = "" } }.ToList()
+                });
+
+                cd.ControlFuncs.Enqueue(new FuncModel()
+                {
+                    eFunc = EFunc.添加主料,
+                    funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30, Id = "" } }.ToList()
+                });
+
+                cd.ControlFuncs.Enqueue(new FuncModel()
+                {
+                    eFunc = EFunc.炒制,
+                    funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30 } }.ToList()
+                });
+
+                cd.ControlFuncs.Enqueue(new FuncModel()
+                {
+                    eFunc = EFunc.出餐启动,
+                    funcPars = new FuncPar[1] { new FuncPar() { ParValue = 30 } }.ToList()
+                });
+
                 ActionManage.GetInstance.Send(NotifyTopic.FormulaDistribution, cd);
                 //ActionManage.GetInstance.Register(new Action<object>(o =>
                 //{

BPASmartClient.Update/BPASmartClient.Update.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
   </ItemGroup>
 
 </Project>

DosingSystem/BPASmartClient.DosingSystem.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Communication" Version="1.0.114" />
+    <PackageReference Include="BPA.Communication" Version="1.0.116" />
     <PackageReference Include="BPA.Message" Version="1.0.86" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

WpfTest/WpfTest.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.CustomResource" Version="1.0.16" />
-    <PackageReference Include="BPA.Helper" Version="1.0.75" />
+    <PackageReference Include="BPA.Helper" Version="1.0.76" />
   </ItemGroup>
 
 </Project>