diff --git a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs index 3716998c..6841e9c2 100644 --- a/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs +++ b/BPASmartClient.MorkSUpgradedVer/Control_MorkSUpgradedVer.cs @@ -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}】"); diff --git a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs index 044a51e2..638c1cda 100644 --- a/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs +++ b/BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs @@ -108,12 +108,6 @@ namespace BPASmartClient.MorkSUpgradedVer /// public ConcurrentQueue TakeBowlTask { get; set; } = new ConcurrentQueue(); - /// - /// 订单ID对应的排序号字典 - /// - public ConcurrentDictionary IDSortNums { get; set; } = new ConcurrentDictionary(); - - public List doOrderEvents { get; set; } = new List(); public ConcurrentDictionary doe { get; set; } = new ConcurrentDictionary();