Browse Source

修改出餐订单序号查找方式。

master
ZhaoGang 1 year ago
parent
commit
282d1efbed
2 changed files with 4 additions and 10 deletions
  1. +4
    -4
      BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs
  2. +0
    -6
      BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs

+ 4
- 4
BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs View File

@@ -411,7 +411,6 @@ namespace BPASmartClient.MorkSUpgradedVer
OrderChange(order.MorkOrder.SuborderId, ORDER_STATUS.WAIT);
DeviceProcessLogShow($"接收到{OrderCount}次订单,订单ID:{order.MorkOrder.SuborderId}");
mORKS.HistorySuborderId.Add(order.MorkOrder.SuborderId);
mORKS.IDSortNums.TryAdd(order.MorkOrder.SuborderId, order.MorkOrder.SortNum);
foreach (var item in order.MorkOrder.GoodBatchings)
{
var res = orderMaterialDelivery?.BatchingInfo?.FirstOrDefault(p => p.BatchingId == item.BatchingId);
@@ -760,9 +759,10 @@ namespace BPASmartClient.MorkSUpgradedVer
OrderChange(mORKS.OutMealId, ORDER_STATUS.COMPLETED_TAKE);
DeviceProcessLogShow($"订单【{mORKS.OutMealId}】取餐完成");
WriteData("M10.1", false);
int takeDinningNum;
mORKS.IDSortNums.TryRemove(mORKS.OutMealId, out takeDinningNum);
mORKS.OutMealSortNum = takeDinningNum;

var orderEvent= mORKS.doOrderEvents.FirstOrDefault(order => order.MorkOrder.SuborderId == mORKS.OutMealId);
mORKS.OutMealSortNum = orderEvent?.MorkOrder.SortNum ?? 0;

DeviceProcessLogShow($"出餐订单序号【{mORKS.OutMealSortNum}】");
VoiceAPI.Speak(mORKS.OutMealSortNum.ToString());
//DeviceProcessLogShow($"叫号系统通知主题【MORKS/VoiceCall/{DeviceId}】");


+ 0
- 6
BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs View File

@@ -108,12 +108,6 @@ namespace BPASmartClient.MorkSUpgradedVer
/// </summary>
public ConcurrentQueue<OrderLocInfo> TakeBowlTask { get; set; } = new ConcurrentQueue<OrderLocInfo>();

/// <summary>
/// 订单ID对应的排序号字典
/// </summary>
public ConcurrentDictionary<string, int> IDSortNums { get; set; } = new ConcurrentDictionary<string, int>();


public List<DoOrderEvent> doOrderEvents { get; set; } = new List<DoOrderEvent>();

public ConcurrentDictionary<string, DoOrderEvent> doe { get; set; } = new ConcurrentDictionary<string, DoOrderEvent>();


Loading…
Cancel
Save