diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv index 76e49c6e..a1c61d02 100644 --- a/sheet/best_seller.tsv +++ b/sheet/best_seller.tsv @@ -25,4 +25,3 @@ 12-03-02-0006 12-02-02-0004 12-05-02-0007 -12-04-02-0002 diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml index 9a4756ee..d38482f7 100644 --- a/xml/page_brewing3Multi.xml +++ b/xml/page_brewing3Multi.xml @@ -296,9 +296,14 @@ Var Timeout = Timeout + 1 - If CountDownBrewing > 0 Then - Var CountDownBrewing = CountDownBrewing - 1 - EndIf + If BREW_COUNT_DOWN_FROM_APP = "on" Then + Var CountDownBrewing = BREW_CNT + Else + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + EndIf + Endif If Simulation = "true" Then If CountDownBrewing = 0 Then diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 7f67c873..94111633 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -158,7 +158,10 @@ 500 - SAVELOG MachineStage + DEBUGVAR MachineStage + DEBUGVAR CupOnArm + DEBUGVAR buttonRemoveCup + DEBUGVAR CART_COUNT If HaveCup = "false" Then @@ -183,7 +186,12 @@ EndIf EndIf - + Else + If CupOnArm = "true" Then + Var buttonRemoveCup = "Enable" + Else + Var buttonRemoveCup = "Invisible" + EndIf EndIf @@ -192,6 +200,9 @@ If CART_COUNT = 0 Then Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" Else + + Var buttonRemoveCup = "Enable" + Var Timeout2 = Timeout2 + 1 @@ -215,6 +226,7 @@ Var Timeout = Timeout + 1 TimerReset + Refresh @@ -253,7 +265,6 @@ ; - +