小炒更新

BPASmartClient.Business/BPASmartClient.Business.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="BPA.ApolloClient" Version="1.0.12" />
-    <PackageReference Include="BPA.Message" Version="1.0.37" />
+    <PackageReference Include="BPA.Message" Version="1.0.41" />
     <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

@@ -229,7 +229,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Message" Version="1.0.37" />
+    <PackageReference Include="BPA.Message" Version="1.0.41" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.Device/BPASmartClient.Device.csproj

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

BPASmartClient.Model/BPASmartClient.Model.csproj

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

BPASmartClient.MorkF/BPASmartClient.MorkF.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BPA.Models" Version="1.0.10" />
+    <PackageReference Include="BPA.Models" Version="1.0.13" />
   </ItemGroup>
 
   <ItemGroup>

BPASmartClient.MorkF/GVL_MorkF.cs

@@ -231,7 +231,11 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 主流程订单取料结束
         /// </summary>
-        public bool MainOrderMaterialCom { get; set; }
+        public bool MainOrderMaterialCom { get; set; } 
+        /// <summary>
+        /// 主流程是否取料判断
+        /// </summary>
+        public bool MainHasTakeMaterial { get; set; }
         /// <summary>
         /// 主流程等待
         /// </summary>
@@ -245,6 +249,10 @@ namespace BPASmartClient.MorkF
         /// </summary>
         public bool MinorOrderMaterialCom { get; set; }
         /// <summary>
+        /// 辅流程是否取料判断
+        /// </summary>
+        public bool MinorHasTakeMaterial { get; set; }
+        /// <summary>
         /// 存储订单对应流程对象
         /// </summary>
         public List<StirFryBom> listStirBom=new List<StirFryBom>();
@@ -269,11 +277,19 @@ namespace BPASmartClient.MorkF
         /// <summary>
         /// 主流程执行状态
         /// </summary>
-        public bool MainProcessStatus { get; set; }
+        public bool MainProcessStatus { get; set; } = true;
         /// <summary>
         /// 当前放锅位置 1：1号锅  2:  2号锅
         /// </summary>
         public int CurrentPutPotLoc { get; set; }
+        /// <summary>
+        /// 主流程所执行的锅位置
+        /// </summary>
+        public int MainProcessPotLoc { get; set; }
+        /// <summary>
+        /// 辅流程所执行的锅位置
+        /// </summary>
+        public int MinorProcessPotLoc { get; set; }
     }
 }
 

BPASmartClient.MorkS/BPASmartClient.MorkS.csproj

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

BPASmartClient.MorkT_HQ/BPASmartClient.MorkT_HQ.csproj

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