Browse Source

代码更新

master
pengliangyang 1 year ago
parent
commit
55ea5f43ee
3 changed files with 6 additions and 6 deletions
  1. +1
    -1
      BPASmartClient.JXJFoodBigStation/App.config
  2. +1
    -1
      BPASmartClient.MorkS/Control_Morks.cs
  3. +4
    -4
      BPASmartClient/App.config

+ 1
- 1
BPASmartClient.JXJFoodBigStation/App.config View File

@@ -3,7 +3,7 @@
<appSettings>
<add key="HKPlc_IP" value="107.107.2.17"/>
<add key="Siemens_IP" value="107.107.2.200"/>
<add key="HKPlc_Connect" value="true"/>
<add key="HKPlc_Connect" value="false"/>
<add key="Siemens_Connect" value="false"/>
</appSettings>
</configuration>

+ 1
- 1
BPASmartClient.MorkS/Control_Morks.cs View File

@@ -322,6 +322,7 @@ namespace BPASmartClient.MorkS
if (@event is DoOrderEvent order)
{
mORKS.doOrderEvents.Add(order);
DeviceProcessLogShow($"接收到{order.MorkOrder.SortNum}号订单");
if (order.MorkOrder.GoodBatchings == null) return;
if (mORKS.HistorySuborderId.Contains(order.MorkOrder.SuborderId)) return;
OrderCount++;
@@ -687,7 +688,6 @@ namespace BPASmartClient.MorkS
DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
ResetCookComplete();
DeviceProcessLogShow($"出餐订单【{mORKS.OutMealSortNum.ToString()}】");
//int SerialNum = Convert.ToInt32(mORKS.OutMealSortNum.ToString().Substring(0,(mORKS.OutMealSortNum.ToString().Length-1)));
DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
//DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");


+ 4
- 4
BPASmartClient/App.config View File

@@ -7,9 +7,9 @@
<add key="IsEnableTest" value="false"/>

<!--测试环境-->
<add key="apollouri" value="http://10.2.1.21:28080/"/>
<!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
<add key="AppId" value="test1_HostComputer"/>
<add key ="Namespaces" value="DEV.test1.Config"/>
<add key ="Namespaces" value="DEV.test1.Config"/>-->

<!--开发环境-->
<!--<add key="apollouri" value="http://10.2.1.21:28080/"/>
@@ -17,9 +17,9 @@
<add key ="Namespaces" value="DEV.Config"/>-->

<!--正式环境-->
<!--<add key="apollouri" value="http://47.108.65.220:28080/"/>
<add key="apollouri" value="http://47.108.65.220:28080/"/>
<add key="appid" value="hostcomputer"/>
<add key ="namespaces" value="test1.config"/>-->
<add key ="namespaces" value="test1.config"/>

<!--阿里云上报启动方式:API 或者 LOCAL-->
<!--API :通过客户端ID,调用接口查询“设备连接信息”-->


Loading…
Cancel
Save