Merge remote-tracking branch 'origin/master'

python/api.py

@@ -163,6 +163,8 @@ def fromExcelHandler(params: HandlerDetail):
             for tempItem in params.temp_list:
                 temp_class[tempItem.template_id] = tempItem.template_local_classes
                 temp_name_list.append(tempItem.template_id)
+            if goods_art_no_image_dir not in path:
+                path = path + "/" + goods_art_no_image_dir
             config_data = {
                 "image_dir": path,
                 "image_order": params.template_image_order,

python/mcu/DeviceControl.py

@@ -677,6 +677,7 @@ class DeviceControl(BaseClass, metaclass=SingletonType):
             # if self.state_camera_motor
             if all(value == 2 for value in [self.state_camera_motor, self.state_camera_steering, self.state_turntable_steering, self.state_overturn_steering]):
                 self.init_state = True
+                self.sendSocketMessage(msg="设备初始化完成", device_status=2)
             self.sendSocketMessage(msg="获取mcu设备运行状态信息", data=message)
         # 检查是否成功初始化
         if self.is_just_init_time is False:

python/service/run_main.py

@@ -366,7 +366,6 @@ class RunMain():
         goods_art_no = config_data["goods_art_no"]
         is_check_color_is_all = config_data["is_check_color_is_all"]
         detail_is_pass = config_data["detail_is_pass"]
-
         error_folder_list = []
         # 遍历货号获取所有货号--可能为编号
         folder_name_list = get_all_dir_info(