From 282d1efbed75cd740a73e9a4ffad89d482fa42c4 Mon Sep 17 00:00:00 2001
From: ZhaoGang <15196688790@163.com>
Date: Thu, 18 May 2023 09:59:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E9=A4=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=BA=8F=E5=8F=B7=E6=9F=A5=E6=89=BE=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Control_MorkSUpgradedVer.cs                           | 8 ++++----
 BPASmartClient.MorkSUpgradedVer/GVL_MorkSUpgradedVer.cs   | 6 ------
 2 files changed, 4 insertions(+), 10 deletions(-)

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
         /// </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>();