Merge branch 'master' of http://111.9.47.105:10244/bpa/BPASmartClient

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.Lebai/LebaiRobot.cs

@@ -57,7 +57,6 @@ namespace BPASmartClient.Lebai
                 LebaiHelper.GetInstance().GetRobotModeStatus();
                 Thread.Sleep(10);
             }, "获取乐白机器人数据");
-
         }
 
         public override void Stop()
@@ -143,9 +142,9 @@ namespace BPASmartClient.Lebai
             EventBus.EventBus.GetInstance().Subscribe<LebaiRobot_SetOutPutEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
             {
                 if (@event == null) return;
-                if (@event is LebaiRobot_LebaiSenceEvent lebaiSenceEvent)
+                if (@event is LebaiRobot_SetOutPutEvent lebaiOutputEvent)
                 {
-                    
+                    LebaiHelper.GetInstance().SetOutput(lebaiOutputEvent.Value,lebaiOutputEvent.Pin);
                 }
             });
 
@@ -158,10 +157,6 @@ namespace BPASmartClient.Lebai
         {
             
         }
-        public void SetDO(bool value, int Ch=0)
-        {
-            LebaiHelper.GetInstance().SetOutput(value,Ch);
-        }
        
     }
 }

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.Model/乐白机器人/LebaiRobotEvent.cs

@@ -48,7 +48,8 @@ namespace BPASmartClient.Model.乐白机器人
 
     public class LebaiRobot_SetOutPutEvent : BaseEvent
     {
-        public int RobotSetOut { get; set; }
+        public int Pin { get; set; }
+        public bool Value { get; set; }
     }
 }
 

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.Lebai.JC/Control_MORKJC2.cs

@@ -117,7 +117,6 @@ namespace BPASmartClient.MorkTLebaiJC
                                             GoodName = order.MorkOrder.GoodsName,
                                         });
                                     }
-                                    //morkTLebaiJC.SuborderId = order.MorkOrder.SuborderId;
                                     break;
                                 case GOODS_TYPE.JUICE:
                                     GuMake = order.MorkOrder.MakeID == "2";//判断果汁的冷热
@@ -165,6 +164,83 @@ namespace BPASmartClient.MorkTLebaiJC
                 }
             });
         }
+
+        private bool bFirstTrig_TeaWater = false;
+        /// <summary>
+        /// 延迟的超时时间
+        /// </summary>
+        DateTime delayTimeOut;
+        private bool bFirstTrig_Coffee = false;
+        DateTime delayTimeOut_Coffee;
+        private bool bFirstTrig_Juice = false;
+        DateTime delayTimeOut_Juice;
+        public override void MainTask()
+        {
+            EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
+            {
+                if (morkTLebaiJC.IsHaveCoffeeCup)
+                    morkTLebaiJC.MakeCoffeeEnd = true;
+            });
+            if (pickUpCoffeeHaveCup)
+            {
+                if (!bFirstTrig_Coffee)
+                {
+                    bFirstTrig_Coffee = true;
+                    delayTimeOut_Coffee = DateTime.Now;
+                }
+                if (DateTime.Now.Subtract(delayTimeOut_Coffee).TotalSeconds > 180 ) 
+                {
+                    bFirstTrig_Coffee = false;
+                    if (morkTLebaiJC.IsHaveCoffeeCup)
+                        morkTLebaiJC.MakeCoffeeEnd = true;
+                }
+            }
+
+            if (morkTLebaiJC.IsHaveJuiceCup)
+            {
+                var Juicestate = GetStatus<int[]>("GetDeviceStatus");
+                if (Juicestate != null)
+                {
+                    if (Juicestate.Length > 0)
+                    {
+                        var Juicestate1 = Convert.ToString(Juicestate[0], 2);
+                        var Juicestate2 = Juicestate[1];
+                        if (Juicestate1.IndexOf("0") == 1 && Juicestate2 == 0)
+                        {
+                            morkTLebaiJC.MakeJuiceEnd = true;
+                        }
+                    }
+                }
+                //若无状态返回 则加延迟
+                if (!bFirstTrig_Juice)
+                {
+                    bFirstTrig_Juice = true;
+                    delayTimeOut_Juice = DateTime.Now;
+                }
+                if (DateTime.Now.Subtract(delayTimeOut_Juice).TotalSeconds > 30)
+                {
+                    bFirstTrig_Juice = false;
+                    morkTLebaiJC.MakeJuiceEnd = true;
+                }
+            }
+            if (morkTLebaiJC.IsHaveTeaWaterCup)
+            {
+                if (!bFirstTrig_TeaWater)
+                {
+                    bFirstTrig_TeaWater = true;
+                    delayTimeOut = DateTime.Now;
+                }
+                if (DateTime.Now.Subtract(delayTimeOut).TotalSeconds >= 50)
+                {
+                    bFirstTrig_TeaWater = false;
+                    morkTLebaiJC.MakeTeaEnd = true;
+                }
+            }
+            DoCoffee();
+            DoJuice();
+            DoBoiledTea();
+            DoBoiledWater();
+        }
         public void Main()
         {
             //开始心跳刷新，根据咖啡机及冰淇淋机来判断
@@ -194,6 +270,10 @@ namespace BPASmartClient.MorkTLebaiJC
                 return batchings[batchingLoc].GoodsType;
             return GOODS_TYPE.NEITHER;
         }
+        /// <summary>
+        /// 乐白的场景结束等待
+        /// </summary>
+        /// <param name="value"></param>
         private void Wait(int value = 101)
         {
             while (!((bool)peripheralStatus["RobotOK"] && (int)peripheralStatus["RobotValue"] == value))
@@ -202,11 +282,23 @@ namespace BPASmartClient.MorkTLebaiJC
             }
             new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
         }
-
+        /// <summary>
+        /// 乐白的场景
+        /// </summary>
+        /// <param name="sen"></param>
         private void Sence(int sen)
         {
             new LebaiRobot_LebaiSenceEvent { DeviceId = DeviceId, LebaiSence = sen }.Publish();
         }
+        /// <summary>
+        /// 乐白的数字量输出
+        /// </summary>
+        /// <param name="value"></param>
+        /// <param name="pin"></param>
+        private void Output(bool value,int pin)
+        {
+            new LebaiRobot_SetOutPutEvent { DeviceId = DeviceId, Pin = pin,Value=value }.Publish();
+        }
 
         private T GetStatus<T>(string key)
         {
@@ -237,25 +329,26 @@ namespace BPASmartClient.MorkTLebaiJC
         /// 传感器的输入信号 0:无意义 1：有信号 2：无信号 3：信号不正确
         /// </summary>
         int bSensorInput;
-        /// <summary>
-        /// 延迟的超时时间
-        /// </summary>
-        DateTime delayTimeOut;
+        
 
         private bool IsMakeCoffee() 
         {
             bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesCoffee.Count > 0 && !morkTLebaiJC.IsHaveCoffeeCup) ? true : false;
             return bMake;
         }
-
         private bool IsMakeJuice()
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesJuicer.Count > 0 && !morkTLebaiJC.IsHaveJuiceCup) ? true : false;
+            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesJuicer.Count > 0  && !morkTLebaiJC.IsHaveJuiceCup) ? true : false;
             return bMake;
         }
         private bool IsMakeTeaWater()
         {
-            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesTea.Count > 0 && morkTLebaiJC.morkOrderPushesWater.Count > 0 && !morkTLebaiJC.IsHaveTeaWaterCup) ? true : false;
+            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesTea.Count > 0  && !morkTLebaiJC.IsHaveTeaWaterCup) ? true : false;
+            return bMake;
+        }
+        private bool IsMakeWater()
+        {
+            bool bMake = (IsHealth && morkTLebaiJC.morkOrderPushesWater.Count > 0  && !morkTLebaiJC.IsHaveTeaWaterCup) ? true : false;
             return bMake;
         }
         /// <summary>
@@ -265,10 +358,10 @@ namespace BPASmartClient.MorkTLebaiJC
         {
             if (IsMakeCoffee())
             {
-                if (morkTLebaiJC.morkOrderPushesCoffee.TryDequeue(out OrderLocInfo orderLoc))
+                if (morkTLebaiJC.morkOrderPushesCoffee.TryDequeue(out OrderLocInfo orderLoc)) 
                 {
-                    morkTLebaiJC.IsHaveCoffeeCup = true;
                     PickUpCoffee();//接咖啡
+                    morkTLebaiJC.IsHaveCoffeeCup = true;
                 }
             }
             else if(morkTLebaiJC.MakeCoffeeEnd)
@@ -284,15 +377,16 @@ namespace BPASmartClient.MorkTLebaiJC
             {
                 if (morkTLebaiJC.morkOrderPushesJuicer.TryDequeue(out OrderLocInfo orderLoc))
                 {
-                    morkTLebaiJC.IsHaveCoffeeCup = true;
                     PickUpJuicer();
+                    morkTLebaiJC.IsHaveJuiceCup = true;
                 }
-                
-            } else if (morkTLebaiJC.MakeJuiceEnd) 
+            }
+            else if (morkTLebaiJC.MakeJuiceEnd) 
             {
+                Thread.Sleep(5000);//延迟五秒，防止接饮料口滴饮料
                 putJuice();
                 pickUpJuiceHaveCup = false;
-                morkTLebaiJC.IsHaveCoffeeCup = false;
+                morkTLebaiJC.IsHaveJuiceCup = false;
                 morkTLebaiJC.MakeJuiceEnd = false;
             }
         }
@@ -302,8 +396,8 @@ namespace BPASmartClient.MorkTLebaiJC
             {
                 if (morkTLebaiJC.morkOrderPushesTea.TryDequeue(out OrderLocInfo orderLoc))
                 {
-                    morkTLebaiJC.IsHaveTeaWaterCup = true;
                     PickUpTea();
+                    morkTLebaiJC.IsHaveTeaWaterCup = true;
                 }
             }
             else if(morkTLebaiJC.MakeTeaEnd)
@@ -316,11 +410,10 @@ namespace BPASmartClient.MorkTLebaiJC
         }
         private void DoBoiledWater() 
         {
-            if (IsMakeTeaWater())
+            if (IsMakeWater())
             {
                 if (morkTLebaiJC.morkOrderPushesWater.TryDequeue(out OrderLocInfo orderLoc))
                 {
-                    morkTLebaiJC.IsHaveTeaWaterCup = true;
                     PickUpWater();
                 }
             }
@@ -348,11 +441,7 @@ namespace BPASmartClient.MorkTLebaiJC
             if (!pickUpCoffeeHaveCup)
             {
                 outCupCheck = false;
-
-                if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-                {
-                    OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                }
+                OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 int resultTakeCup = takeCup();
                 if (resultTakeCup == 1)
                 {
@@ -361,8 +450,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     Sence(JuicerModel.JUICE2_接咖啡);
                     Wait();
                     pickUpCoffeeHaveCup = true;
-                    //new DRCoffee_MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制 //DrCoffeeDrinksCode.热水                                                                                                        //coffeEndCook.Publish();//模拟咖啡制作完成
-                    //are.WaitOne(1000 * 360);
+                    new DRCoffee_MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制 //DrCoffeeDrinksCode.热水
                 }
                 else
                 {
@@ -386,10 +474,7 @@ namespace BPASmartClient.MorkTLebaiJC
             new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
             Sence(JuicerModel.JUICE2_放咖啡杯);
             Wait();
-            if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-            {
-                OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-            }
+            OrderChange(morkTLebaiJC.morkOrderPushesCoffee.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
             DeviceProcessLogShow("咖啡制作完成");
         }
         #endregion
@@ -402,30 +487,26 @@ namespace BPASmartClient.MorkTLebaiJC
             #region 接水流程
             if (!pickUpHotWaterHaveCup)
             {
-                if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-                {
-                    OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                }
+                OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 int resultTakeCup = takeCup();
                 if (resultTakeCup == 1)
                 {
                     new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                     Sence(JuicerModel.JUICE2_接开水);
                     Wait();
-                    new WriteMcu() { TagName = "OutputControl", Address = "1", Value = false }.Publish();
-                    new WriteMcu() { TagName = "OutputControl", Address = "0", Value = false }.Publish();
+                    Output(false, 1);
+                    Output(false, 0);
                     Thread.Sleep(100);
-                    new WriteMcu() { TagName = "OutputControl", Address = "0", Value = true }.Publish();
+                    Output(true, 0);
                     Thread.Sleep(3000);
-                    new WriteMcu() { TagName = "OutputControl", Address = "0", Value = false }.Publish();
+                    Output(false, 0);
                     Thread.Sleep(100);
 
-                    new WriteMcu() { TagName = "OutputControl", Address = "1", Value = false }.Publish();
+                    Output(false, 1);
                     Thread.Sleep(100);
-                    new WriteMcu() { TagName = "OutputControl", Address = "1", Value = true }.Publish();
+                    Output(true, 1);
                     Thread.Sleep(500);
-                    new WriteMcu() { TagName = "OutputControl", Address = "1", Value = false }.Publish();
-                    Thread.Sleep(46000);
+                    Output(false, 1);
                 }
                 else
                 {
@@ -444,10 +525,7 @@ namespace BPASmartClient.MorkTLebaiJC
             #region 接茶流程
             if (!pickUpHotWaterHaveCup)
             {
-                if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-                {
-                    OrderChange(morkTLebaiJC.morkOrderPushesTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                }
+                OrderChange(morkTLebaiJC.morkOrderPushesTea.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 int resultTakeCup = takeCup();
                 if (resultTakeCup == 1)
                 {
@@ -466,6 +544,19 @@ namespace BPASmartClient.MorkTLebaiJC
                     new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                     Sence(JuicerModel.JUICE2_接茶水);
                     Wait();
+                    Output(false, 1);
+                    Output(false, 0);
+                    Thread.Sleep(100);
+                    Output(true, 0);
+                    Thread.Sleep(3000);
+                    Output(false, 0);
+                    Thread.Sleep(100);
+
+                    Output(false, 1);
+                    Thread.Sleep(100);
+                    Output(true, 1);
+                    Thread.Sleep(500);
+                    Output(false, 1);
                     pickUpHotWaterHaveCup = true;
                 }
                 else
@@ -490,10 +581,7 @@ namespace BPASmartClient.MorkTLebaiJC
             new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
             Sence(JuicerModel.JUICE2_放水杯);
             Wait();
-            if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-            {
-                OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-            }
+            OrderChange(morkTLebaiJC.morkOrderPushesWater.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
             DeviceProcessLogShow("茶水制作完成");
         }
 
@@ -512,10 +600,7 @@ namespace BPASmartClient.MorkTLebaiJC
             #region 接果汁流程
             if (!pickUpJuiceHaveCup)
             {
-                if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-                {
-                    OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
-                }
+                OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
                 int resultTakeCup = takeCup();
                 JuiceCH = int.Parse(mainMaterialLoc);
                 if (resultTakeCup == 1)
@@ -565,6 +650,7 @@ namespace BPASmartClient.MorkTLebaiJC
                             Wait();
                             break;
                     }
+                    new WriteJuicer() { Value = JuicerNum }.Publish();
                     pickUpJuiceHaveCup = true;
                 }
                 else
@@ -614,10 +700,7 @@ namespace BPASmartClient.MorkTLebaiJC
                     Wait();
                     break;
             }
-            if (morkTLebaiJC.morkOrderPushesCoffee.Count > 0)
-            {
-                OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
-            }
+            OrderChange(morkTLebaiJC.morkOrderPushesJuicer.ElementAt(0).SuborderId, BPA.Message.Enum.ORDER_STATUS.COMPLETED_TAKE);
             DeviceProcessLogShow("果汁制作完成");
         }
         #endregion
@@ -682,7 +765,6 @@ namespace BPASmartClient.MorkTLebaiJC
                         new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                         Sence(JuicerModel.JUICE2_二次取杯);
                         Wait();
-
                         new LebaiRobot_SetValueEvent { DeviceId = DeviceId, RobotSetValue = 0 }.Publish();
                         Sence(JuicerModel.JUICE2_取纸杯检测);
                         Wait();
@@ -780,45 +862,6 @@ namespace BPASmartClient.MorkTLebaiJC
 
         }
 
-        private bool bFirstTrig = false;
-        public override void MainTask()
-        {
-            EventBus.EventBus.GetInstance().Subscribe<DRCoffee_CoffeEndCookEvent>(DeviceId, delegate (IEvent @event, EventCallBackHandle callBack)
-            {
-                if (morkTLebaiJC.IsHaveCoffeeCup)
-                    morkTLebaiJC.MakeCoffeeEnd = true;
-            });
-            var Juicestate = GetStatus<int[]>("GetDeviceStatus");
-            if (Juicestate != null)
-            { 
-                if (Juicestate.Length > 0)
-                {
-                    var Juicestate1 = Convert.ToString(Juicestate[0], 2);
-                    var Juicestate2 = Juicestate[1];
-                    if (Juicestate1.IndexOf("0") == 1 && Juicestate2 == 0)
-                    {
-                        morkTLebaiJC.MakeJuiceEnd= true;
-                    }
-                }
-            }
-            if (morkTLebaiJC.IsHaveTeaWaterCup) 
-            {
-                if (!bFirstTrig)
-                {
-                    bFirstTrig = true;
-                    delayTimeOut = DateTime.Now;
-                }
-                if (DateTime.Now.Subtract(delayTimeOut).TotalSeconds >= 50)
-                {
-                    bFirstTrig = false;
-                    morkTLebaiJC.MakeTeaEnd = true;
-                }
-            }
-            DoCoffee();
-            DoJuice();
-            DoBoiledTea();
-            DoBoiledTea();
-        }
         public override void ResetProgram()
         {
         }

BPASmartClient.MorkT.Lebai.JC/GVL_MorkTLebeiJC.cs

@@ -70,6 +70,7 @@ namespace BPASmartClient.MorkTLebaiJC
         /// 订单ID
         /// </summary>
         public string SuborderId = null;
+
     }
     
 }

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>