包更新

BPASmartClient.Business/BPASmartClient.Business.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
     <PackageReference Include="BPA.Helper" Version="1.0.28" />
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />

BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj

@@ -410,7 +410,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Helper" Version="1.0.28" />
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
     <PackageReference Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>

BPASmartClient.Device/BPASmartClient.Device.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.JXJFoodSmallStation/BPASmartClient.JXJFoodSmallStation.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>

BPASmartClient.Model/BPASmartClient.Model.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
   </ItemGroup>
 

BPASmartClient.MorkBF/GVL_MorkBF.cs

@@ -35,7 +35,7 @@ namespace BPASmartClient.MorkBF
         /// <summary>
         /// 炒锅1当前流程
         /// </summary>
-        public List<FryPotProcess>  FryPot1_CurrentProcess;
+        public List<FryPotProcess> FryPot1_CurrentProcess;
         /// <summary>
         /// 炒锅2当前流程
         /// </summary>
@@ -46,7 +46,7 @@ namespace BPASmartClient.MorkBF
         /// <summary>
         /// 炒锅1锅低温度
         /// </summary>
-        [VariableMonitor("炒锅1锅低温度", "VW120","160")]
+        [VariableMonitor("炒锅1锅低温度", "VW120", "160")]
         public int FirePot1_Temperature { get; set; }
         /// <summary>
         /// 炒锅1脉冲值
@@ -68,87 +68,87 @@ namespace BPASmartClient.MorkBF
         /// 炒锅1急停
         /// </summary>
         [VariableMonitor("炒锅1急停", "M20.2", "482")]
-        public bool FirePot1_Emergencystop{ get; set; }
+        public bool FirePot1_Emergencystop { get; set; }
         /// <summary>
         /// 1#炒锅荤菜盆有无检测
         /// </summary>
         [VariableMonitor("1#炒锅1锅低温度", "M20.3", "483")]
-        public bool FirePot1_MealTubExist{ get; set; }
+        public bool FirePot1_MealTubExist { get; set; }
         /// <summary>
         /// 1#炒锅素菜盆1有无检测
         /// </summary>
         [VariableMonitor("炒锅素菜盆1有无检测", "M20.4", "484")]
-        public bool FirePot1_VegetablesTub1Exist{ get; set; }
+        public bool FirePot1_VegetablesTub1Exist { get; set; }
         /// <summary>
         /// 1#炒锅素菜盆2有无检测
         /// </summary>
         [VariableMonitor("1#炒锅素菜盆2有无检测", "M20.5", "485")]
-        public bool FirePot1_VegetablesTub2Exist{ get; set; }
+        public bool FirePot1_VegetablesTub2Exist { get; set; }
         /// <summary>
         /// 1#炒锅调料盆1有无检测
         /// </summary>
         [VariableMonitor("1#炒锅调料盆1有无检测", "M20.6", "486")]
-        public bool FirePot1_Seasoning1Exist{ get; set; }
+        public bool FirePot1_Seasoning1Exist { get; set; }
         /// <summary>
         /// 1#炒锅调料盆2有无检测
         /// </summary>
         [VariableMonitor("1#炒锅调料盆2有无检测", "M20.7", "487")]
-        public bool FirePot1_Seasoning2Exist{ get; set; }
+        public bool FirePot1_Seasoning2Exist { get; set; }
         /// <summary>
         /// 1#炒锅辅料盆1有无检测
         /// </summary>
         [VariableMonitor("1#炒锅辅料盆1有无检测", "M21.0", "488")]
-        public bool FirePot1_Accessories1Exist{ get; set; }
+        public bool FirePot1_Accessories1Exist { get; set; }
         /// <summary>
         /// 1#炒锅辅料盆2有无检测
         /// </summary>
         [VariableMonitor("1#炒锅辅料盆2有无检测", "M21.1", "489")]
-        public bool FirePot1_Accessories2Exist{ get; set; }
+        public bool FirePot1_Accessories2Exist { get; set; }
         /// <summary>
         /// 1#炒锅出餐空盆有无检测
         /// </summary>
         [VariableMonitor("1#炒锅出餐空盆有无检测", "M21.2", "490")]
-        public bool FirePot1_OutFoodTubExist{ get; set; }
+        public bool FirePot1_OutFoodTubExist { get; set; }
         /// <summary>
         /// 1#炒锅在原点反馈
         /// </summary>
         [VariableMonitor("1#炒锅在原点反馈", "M21.3", "491")]
-        public bool FirePot1_OnOrigin{ get; set; }
+        public bool FirePot1_OnOrigin { get; set; }
         /// <summary>
         /// 1#炒制位置1反馈
         /// </summary>
         [VariableMonitor("1#炒制位置1反馈", "M21.4", "492")]
-        public bool FirePot1_FirePosition1{ get; set; }
+        public bool FirePot1_FirePosition1 { get; set; }
         /// <summary>
         /// 1#炒制位置2反馈
         /// </summary>
         [VariableMonitor("1#炒制位置2反馈", "M21.5", "493")]
-        public bool FirePot1_FirePosition2{ get; set; }
+        public bool FirePot1_FirePosition2 { get; set; }
         /// <summary>
         /// 1#炒制位置3反馈
         /// </summary>
         [VariableMonitor("1#炒制位置3反馈", "M21.6", "494")]
-        public bool FirePot1_FirePosition3{ get; set; }
+        public bool FirePot1_FirePosition3 { get; set; }
         /// <summary>
         /// 1#炒制位置4反馈
         /// </summary>
         [VariableMonitor("1#炒制位置4反馈", "M21.7", "495")]
-        public bool FirePot1_FirePosition4{ get; set; }
+        public bool FirePot1_FirePosition4 { get; set; }
         /// <summary>
         /// 1#炒锅在出餐倒料位置反馈
         /// </summary>
         [VariableMonitor("1#炒锅在出餐倒料位置反馈", "M22.0", "496")]
-        public bool FirePot1_PotOnOutFoodPosition{ get; set; }
+        public bool FirePot1_PotOnOutFoodPosition { get; set; }
         /// <summary>
         /// 1#炒锅在投料位置反馈、
         /// </summary>
         [VariableMonitor("1#炒锅在投料位置反馈", "M22.1", "497")]
-        public bool FirePot1_PotOnIntoFoodPosition{ get; set; }
+        public bool FirePot1_PotOnIntoFoodPosition { get; set; }
         /// <summary>
         /// 1#炒锅在洗锅位置反馈
         /// </summary>
         [VariableMonitor("1#炒锅在洗锅位置反馈", "M22.2", "498")]
-        public bool FirePot1_PotOnCleanPosition{ get; set; }
+        public bool FirePot1_PotOnCleanPosition { get; set; }
 
         public int FirePot1_FireGear { get; set; } = 0;
         public int FirePot1_StirGear { get; set; } = 0;
@@ -161,12 +161,12 @@ namespace BPASmartClient.MorkBF
         /// 炒锅2锅低温度
         /// </summary>
         [VariableMonitor("炒锅2锅低温度", "VW150", "175")]
-        public int FirePot2_Temperature{ get; set; }
+        public int FirePot2_Temperature { get; set; }
         /// <summary>
         /// 炒锅2脉冲值
         /// </summary>
         [VariableMonitor("炒锅2脉冲值", "VW152", "176")]
-        public int FirePot2_Pulse{ get; set; }
+        public int FirePot2_Pulse { get; set; }
         /// <summary>
         /// 炒锅2初始化完成
         /// </summary>
@@ -177,97 +177,98 @@ namespace BPASmartClient.MorkBF
         /// 炒锅2手动自动模式
         /// </summary>
         [VariableMonitor("炒锅2手动自动模式", "M25.1", "521")]
-        public bool FirePot2_IsAuto{ get; set; }
+        public bool FirePot2_IsAuto { get; set; }
         /// <summary>
         /// 炒锅2急停
         /// </summary>
         [VariableMonitor("炒锅2急停", "M25.2", "522")]
-        public bool FirePot2_Emergencystop{ get; set; }
+        public bool FirePot2_Emergencystop { get; set; }
         /// <summary>
         /// 2#炒锅荤菜盆有无检测
         /// </summary>
         [VariableMonitor("2#炒锅荤菜盆有无检测", "M25.3", "523")]
-        public bool FirePot2_MealTubExist{ get; set; }
+        public bool FirePot2_MealTubExist { get; set; }
         /// <summary>
         /// 2#炒锅素菜盆1有无检测
         /// </summary>
         [VariableMonitor("2#炒锅素菜盆1有无检测", "M25.4", "524")]
-        public bool FirePot2_VegetablesTub1Exist{ get; set; }
+        public bool FirePot2_VegetablesTub1Exist { get; set; }
         /// <summary>
         /// 2#炒锅素菜盆2有无检测
         /// </summary>
         [VariableMonitor("2#炒锅素菜盆2有无检测", "M25.5", "525")]
-        public bool FirePot2_VegetablesTub2Exist{ get; set; }
+        public bool FirePot2_VegetablesTub2Exist { get; set; }
         /// <summary>
         /// 2#炒锅调料盆1有无检测
         /// </summary>
         [VariableMonitor("2#炒锅调料盆1有无检测", "M25.6", "526")]
-        public bool FirePot2_Seasoning1Exist{ get; set; }
+        public bool FirePot2_Seasoning1Exist { get; set; }
         /// <summary>
         /// 2#炒锅调料盆2有无检测
         /// </summary>
         [VariableMonitor("2#炒锅调料盆2有无检测", "M25.7", "527")]
-        public bool FirePot2_Seasoning2Exist{ get; set; }
+        public bool FirePot2_Seasoning2Exist { get; set; }
         /// <summary>
         /// 2#炒锅辅料盆1有无检测
         /// </summary>
         [VariableMonitor("2#炒锅1锅低温度", "M26.0", "528")]
-        public bool FirePot2_Accessories1Exist{ get; set; }
+        public bool FirePot2_Accessories1Exist { get; set; }
         /// <summary>
         /// 2#炒锅辅料盆2有无检测
         /// </summary>
         [VariableMonitor("2#炒锅辅料盆2有无检测", "M26.1", "529")]
-        public bool FirePot2_Accessories2Exist{ get; set; }
+        public bool FirePot2_Accessories2Exist { get; set; }
         /// <summary>
         /// 2#炒锅出餐空盆有无检测
         /// </summary>
         [VariableMonitor("2#炒锅出餐空盆有无检测", "M26.2", "530")]
-        public bool FirePot2_OutFoodTubExist{ get; set; }
+        public bool FirePot2_OutFoodTubExist { get; set; }
         /// <summary>
         /// 2#炒锅在原点反馈
         /// </summary>
         [VariableMonitor("2#炒锅在原点反馈", "M26.3", "531")]
-        public bool FirePot2_OnOrigin{ get; set; }
+        public bool FirePot2_OnOrigin { get; set; }
         /// <summary>
         /// 2#炒制位置1反馈
         /// </summary>
         [VariableMonitor("2#炒制位置1反馈", "M26.4", "532")]
-        public bool FirePot2_FirePosition1{ get; set; }
+        public bool FirePot2_FirePosition1 { get; set; }
         /// <summary>
         /// 2#炒制位置2反馈
         /// </summary>
         [VariableMonitor("2#炒制位置2反馈", "M26.5", "533")]
-        public bool FirePot2_FirePosition2{ get; set; }
+        public bool FirePot2_FirePosition2 { get; set; }
         /// <summary>
         /// 2#炒制位置3反馈
         /// </summary>
         [VariableMonitor("2#炒制位置3反馈", "M26.6", "534")]
-        public bool FirePot2_FirePosition3{ get; set; }
+        public bool FirePot2_FirePosition3 { get; set; }
         /// <summary>
         /// 2#炒制位置4反馈
         /// </summary>
         [VariableMonitor("2#炒制位置4反馈", "M26.7", "535")]
-        public bool FirePot2_FirePosition4{ get; set; }
+        public bool FirePot2_FirePosition4 { get; set; }
         /// <summary>
         /// 2#炒锅在出餐倒料位置反馈
         /// </summary>
         [VariableMonitor("2#炒锅在出餐倒料位置反馈", "M27.0", "536")]
-        public bool FirePot2_PotOnOutFoodPosition{ get; set; }
+        public bool FirePot2_PotOnOutFoodPosition { get; set; }
         /// <summary>
         /// 2#炒锅在投料位置反馈、
         /// </summary>
         [VariableMonitor("2#炒锅在投料位置反馈", "M27.1", "537")]
-        public bool FirePot2_PotOnIntoFoodPosition{ get; set; }
+        public bool FirePot2_PotOnIntoFoodPosition { get; set; }
         /// <summary>
         /// 2#炒锅在洗锅位置反馈
         /// </summary>
         [VariableMonitor("2#炒锅在洗锅位置反馈", "M27.2", "538")]
-        public bool FirePot2_PotOnCleanPosition{ get; set; }
+        public bool FirePot2_PotOnCleanPosition { get; set; }
 
         public int FirePot2_FireGear { get; set; } = 0;
         public int FirePot2_StirGear { get; set; } = 0;
 
         public int FirePot2_FlipSpeed { get; set; } = 0;
+        #endregion
 
         #region 机器人数据读取
         public bool Robot_IsBusy;
@@ -283,37 +284,37 @@ namespace BPASmartClient.MorkBF
         /// 1号锅倒荤菜完成
         /// </summary>
         [VariableMonitor("机器人#1号锅倒荤菜完成", "GM500", "4596")]
-        public bool Robot_FirePot1OutMeal{ get; set; }
+        public bool Robot_FirePot1OutMeal { get; set; }
         /// <summary>
         /// 1号炒锅倒素菜1完成
         /// </summary>
         [VariableMonitor("机器人#1号炒锅倒素菜1完成", "GM501", "4597")]
-        public bool Robot_FirePot1OutVegetables1{ get; set; }
+        public bool Robot_FirePot1OutVegetables1 { get; set; }
         /// <summary>
         /// 1号炒锅倒素菜2完成
         /// </summary>
         [VariableMonitor("机器人#1号炒锅倒素菜2完成", "GM502", "4598")]
-        public bool Robot_FirePot1OutVegetables2{ get; set; }
+        public bool Robot_FirePot1OutVegetables2 { get; set; }
         /// <summary>
         /// 1号炒锅倒调料完成
         /// </summary>
         [VariableMonitor("机器人#1号炒锅倒调料完成", "GM503", "4599")]
-        public bool Robot_FirePot1OutSeasoning{ get; set; }
+        public bool Robot_FirePot1OutSeasoning { get; set; }
         /// <summary>
         /// 1号炒锅倒辅料完成
         /// </summary>
         [VariableMonitor("机器人#1号炒锅倒辅料完成", "GM504", "4600")]
-        public bool Robot_FirePot1OutAccessories{ get; set; }
+        public bool Robot_FirePot1OutAccessories { get; set; }
         /// <summary>
         /// 机器人到位，请求1#炒锅倒菜
         /// </summary>
         [VariableMonitor("机器人到位，请求1#炒锅倒菜", "GM505", "4601")]
-        public bool Robot_ArriveFirePot1{ get; set; }
+        public bool Robot_ArriveFirePot1 { get; set; }
         /// <summary>
         /// 1号炒锅出餐完成
         /// </summary>
         [VariableMonitor("机器人#1号炒锅出餐完成", "GM506", "4602")]
-        public bool Robot_FirePot1OutFoodComplete{ get; set; }
+        public bool Robot_FirePot1OutFoodComplete { get; set; }
 
 
 
@@ -328,37 +329,37 @@ namespace BPASmartClient.MorkBF
         /// 2号炒锅倒素菜1完成
         /// </summary>
         [VariableMonitor("机器人#2号炒锅倒素菜1完成", "GM511", "4607")]
-        public bool Robot_FirePot2OutVegetables1{ get; set; }
+        public bool Robot_FirePot2OutVegetables1 { get; set; }
         /// <summary>
         /// 2号炒锅倒素菜2完成
         /// </summary>
         [VariableMonitor("2号炒锅倒素菜2完成", "GM512", "4608")]
-        public bool Robot_FirePot2OutVegetables2{ get; set; }
+        public bool Robot_FirePot2OutVegetables2 { get; set; }
         /// <summary>
         /// 2号炒锅倒调料完成
         /// </summary>
         [VariableMonitor("机器人#2号炒锅倒调料完成", "GM513", "4609")]
-        public bool Robot_FirePot2OutSeasoning{ get; set; }
+        public bool Robot_FirePot2OutSeasoning { get; set; }
         /// <summary>            
         /// 2号炒锅倒辅料完成    
         /// </summary>
         [VariableMonitor("机器人#2号炒锅倒辅料完成", "GM514", "4610")]
-        public bool Robot_FirePot2OutAccessories{ get; set; }
+        public bool Robot_FirePot2OutAccessories { get; set; }
         /// <summary>
         /// 机器人到位，请求1#炒锅倒菜
         /// </summary>
         [VariableMonitor("机器人#机器人到位，请求1#炒锅倒菜", "GM515", "4611")]
-        public bool Robot_ArriveFirePot2{ get; set; }
+        public bool Robot_ArriveFirePot2 { get; set; }
         /// <summary>
         /// 2号炒锅出餐完成
         /// </summary>
         [VariableMonitor("机器人#2号炒锅出餐完成", "GM516", "4612")]
-        public bool Robot_FirePot2OutFoodComplete{ get; set; }
+        public bool Robot_FirePot2OutFoodComplete { get; set; }
         /// <summary>
         /// 机器人动作反馈
         /// </summary>
         [VariableMonitor("机器人动作反馈", "GI5", "5")]
-        public int Robot_ActionCallback{ get; set; }
+        public int Robot_ActionCallback { get; set; }
 
         #endregion
 
@@ -370,7 +371,7 @@ namespace BPASmartClient.MorkBF
         public GVL_MorkBF()
         {
             FirePot1_CompleteSingle = new Dictionary<int, bool>
-            { 
+            {
                 {1,Robot_FirePot1OutMeal },
                 {2,Robot_FirePot1OutVegetables1 },
                 {3,Robot_FirePot1OutVegetables2 },

BPASmartClient.MorkF/BPASmartClient.MorkF.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.MorkS/BPASmartClient.MorkS.csproj

@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.77" />
-    <PackageReference Include="BPA.Models" Version="1.0.34" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
+    <PackageReference Include="BPA.Models" Version="1.0.37" />
     <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
     <PackageReference Include="System.Speech" Version="6.0.0" />
   </ItemGroup>

BPASmartClient.MorkT_HQ/BPASmartClient.MorkTHQ.csproj

@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BPA.Models" Version="1.0.34" />
+		<PackageReference Include="BPA.Models" Version="1.0.37" />
 		<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.2" />
 	</ItemGroup>
 

DosingSystem/BPASmartClient.DosingSystem.csproj

@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.Helper" Version="1.0.28" />
-    <PackageReference Include="BPA.Message" Version="1.0.74" />
+    <PackageReference Include="BPA.Message" Version="1.0.82" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>