1

HBLConsole.MORKIC/Control_MORKIC.cs

@@ -268,7 +268,7 @@ namespace HBLConsole.MORKIC
             SimpleFactory.GetInstance.OrderChanged(subOrderId, BPA.Message.Enum.ORDER_STATUS.COOKING);
             LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_取咖啡杯);
             Wait();
-            //new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+            new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
             Thread.Sleep(3000);
 
             Thread.Sleep(500);
@@ -285,7 +285,7 @@ namespace HBLConsole.MORKIC
                 LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_二次取咖啡杯);
                 Wait();
 
-                //new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
+                new TakeCupEvent() { Cup = IC_CUP.CUP_COFFEE }.Publish();//落碗控制
                 Thread.Sleep(3000);
 
                 LebaiHelper.GetInstance.SetValue(1);
@@ -294,8 +294,8 @@ namespace HBLConsole.MORKIC
             LebaiHelper.GetInstance.Scene(LebaiHelper.SENCE_接咖啡);
             Wait();
 
-            //new MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制
-            //are.WaitOne(1000 * 180);
+            new MakeCoffeeEvent() { DrinkCode = (DrCoffeeDrinksCode)int.Parse(mainMaterialLoc) }.Publish();  //接咖啡控制
+            are.WaitOne(1000 * 180);
 
             Thread.Sleep(3000);
             LebaiHelper.GetInstance.SetValue(1);

HBLConsole/App.config

@@ -11,7 +11,7 @@
 
     <!--客户端ID-->
     <!--MorkD = 2,MorkS 且时且多 = 8,MorkS 珠海 = 9,冰淇淋 = 4,咖啡机 = 13-->
-    <add key="ClientId" value="2"/>
+    <add key="ClientId" value="1"/>
 
     <add key="COM_Coffee" value="COM8"/>
     <add key="BAUD_Coffee" value="115200"/>