From c59da79fc429e672522d9fb1e24a94acdd5c48c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E6=84=8F=20=E5=BD=AD?= <2417589739@qq.com>
Date: Wed, 5 Jun 2024 14:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Morks=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BPASmartClient.Modbus/ModbusTcp.cs    | 2 +-
 BPASmartClient.MorkS/Control_Morks.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/BPASmartClient.Modbus/ModbusTcp.cs b/BPASmartClient.Modbus/ModbusTcp.cs
index 0e131012..f22531bb 100644
--- a/BPASmartClient.Modbus/ModbusTcp.cs
+++ b/BPASmartClient.Modbus/ModbusTcp.cs
@@ -361,7 +361,7 @@ namespace BPASmartClient.Modbus
         {
             if (address == null || tcpClient == null)
             {
-                Show?.Invoke("写入失败，地址为空或断开连接");
+                //Show?.Invoke("写入失败，地址为空或断开连接");
                 return false;
             }
             ushort startAddress = (ushort)GetAddress(address);
diff --git a/BPASmartClient.MorkS/Control_Morks.cs b/BPASmartClient.MorkS/Control_Morks.cs
index 2902df65..d9d7662d 100644
--- a/BPASmartClient.MorkS/Control_Morks.cs
+++ b/BPASmartClient.MorkS/Control_Morks.cs
@@ -164,7 +164,7 @@ namespace BPASmartClient.MorkS
             //SortNum = mORKS.doe[subid].MorkOrder.SortNum.ToString();
             if (!string.IsNullOrEmpty(goodName) && !string.IsNullOrEmpty(SortNum))
             {
-                EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType });
+                EventBus.GetInstance().Publish(new OrderStatusChangedEvent() { SortNum = SortNum, GoodName = goodName, Status = oRDER_STATUS, SubOrderId = subid, deviceClientType = DeviceType }, e => { complete?.Invoke(); });
                 var index = DataServer.GetInstance.morkS.MakeOrder.FindIndex(p => p.SortNum == SortNum);
                 if (index >= 0 && index < DataServer.GetInstance.morkS.MakeOrder.Count)
                 {