rambo 1 mēnesi atpakaļ
vecāks
revīzija
3e449b6051
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      python/mcu/DeviceControl.py

+ 2 - 2
python/mcu/DeviceControl.py

@@ -1705,7 +1705,6 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
                 print("action异常终止")
                 logger.info("action异常终止")
                 return
-            self.msg_type = "run_mcu_single"
             program_item.smart_shooter = smart_shooter
             await program_item.run(3)
             self.msg_type = "mcu"
@@ -1720,7 +1719,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
                 device_status=2,
             )
             self.action_state = 2
-            self.msg_type = msg_type
+            self.msg_type = "run_mcu_single"
             print("发送 run_mcu_signle消息", "执行完成")
             self.sendSocketMessage(
                 code=0,
@@ -1732,6 +1731,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
             self.sendSocketMessage(
                 code=1, msg="未查询到重拍记录得配置信息,请确认", device_status=0
             )
+        self.action_state = 2
 
     async def only_take_photo(self, goods_art_no, image_index, record_id):
         await asyncio.sleep(0.1)