itachilee 2 years ago
parent
commit
05688e5a82
2 changed files with 8 additions and 4 deletions
  1. +6
    -2
      HBLConsole.MORKIC/Control_MORKIC.cs
  2. +2
    -2
      HBLConsole/App.config

+ 6
- 2
HBLConsole.MORKIC/Control_MORKIC.cs View File

@@ -53,6 +53,7 @@ namespace HBLConsole.MORKIC
private bool enableFunny = false; private bool enableFunny = false;
private DateTime lastRecvdOrder = DateTime.Now; private DateTime lastRecvdOrder = DateTime.Now;
private bool working = false; private bool working = false;
private bool IceIsOK = true;


public void ConnectOk() public void ConnectOk()
{ {
@@ -176,10 +177,13 @@ namespace HBLConsole.MORKIC
{ {
if (LebaiHelper.GetInstance.GetInput(3)) if (LebaiHelper.GetInstance.GetInput(3))
{ {
MessageLog.GetInstance.Show("请擦拭冰淇淋机出口");
if(IceIsOK) MessageLog.GetInstance.Show("请擦拭冰淇淋机出口");
IceIsOK = false;

} }
else if(morkOrderPushesIceCream.TryDequeue(out SimOrderData order)) else if(morkOrderPushesIceCream.TryDequeue(out SimOrderData order))
{
{
IceIsOK = true;
MessageLog.GetInstance.Show($"开始制作 [冰淇淋] 订单[{order.morkOrder.SortNum}]"); MessageLog.GetInstance.Show($"开始制作 [冰淇淋] 订单[{order.morkOrder.SortNum}]");
DoIceCream(order); DoIceCream(order);
} }


+ 2
- 2
HBLConsole/App.config View File

@@ -14,8 +14,8 @@
<!--<add key="ClientId" value="11"/> <!--<add key="ClientId" value="11"/>
<add key="deviceId" value="13"/>--> <add key="deviceId" value="13"/>-->


<add key="ClientId" value="10"/>
<add key="deviceId" value="10013"/>
<add key="ClientId" value="1420"/>
<add key="deviceId" value="16513"/>


<!--<add key="ApolloUri" value="http://111.9.47.105:28080/"/> <!--<add key="ApolloUri" value="http://111.9.47.105:28080/"/>
<add key="OrderServiceUri" value="http://111.9.47.105:21527/order/"/> <add key="OrderServiceUri" value="http://111.9.47.105:21527/order/"/>


Loading…
Cancel
Save