货号删除问题

python/api.py

@@ -206,9 +206,6 @@ async def handle_detail_background(
                 goods_art_no_arrays, excel_df
             )
         else:
-            await _process_non_excel_mode(
-                params, goods_art_no_arrays
-            )
             remote_data = run_main.data_mode_generate_detail.get_goods_art_no_info(goods_art_list=goods_art_no_arrays)
             if  remote_data == {}:
                 raise UnicornException("所有货号在商品档案资料中不存在，请检查货号是否正确")
@@ -219,6 +216,9 @@ async def handle_detail_background(
                     error_goods_art_no.append(goods_art_no_check)
             if len(error_goods_art_no) > 0:
                 raise UnicornException("以下货号在商品档案资料中不存在，请检查货号是否正确:{}".format(error_goods_art_no))
+            await _process_non_excel_mode(
+                params, goods_art_no_arrays
+            )
     except Exception as e:
         raise UnicornException(str(e))
     
@@ -620,9 +620,9 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
                 save_image_path, product_scene_prompt, save_image_path
             )
             
-            goods_art_dict_info["场景图"] = image_path.replace("场景图.jpg", "")
+            goods_art_dict_info["场景图"] = image_path
             new_goods_dict[goods_art_no] = goods_art_dict_info
-            product_scene_progress["folder"] = save_image_path
+            product_scene_progress["folder"] = save_image_path.replace("场景图.jpg", "")
             await sendAsyncMessage(
                 msg="场景图处理完成",
                 goods_arts=[goods_art_no],
@@ -632,6 +632,9 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
             )
             
         except Exception as e:
+            goods_art_dict_info = goods_dict[goods_art_no]
+            goods_art_dict_info["场景图"] = ""
+            new_goods_dict[goods_art_no] = goods_art_dict_info
             print("场景图处理异常",e)
             os.remove(save_image_path)
             product_scene_finish_progress -= 1
@@ -642,7 +645,8 @@ async def _process_scene_images(aigc_clazz, run_main, return_data_check_before_d
                 "goods_art_no": goods_art_no, 
                 "current": product_scene_finish_progress, 
                 "total": product_scene_total_progress, 
-                "error": product_scene_error_progress
+                "error": product_scene_error_progress,
+                "folder":""
             }
             
             await sendAsyncMessage(
@@ -765,7 +769,7 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
                 # 设置70秒超时
                 image_path = future.result(timeout=70)
             
-            goods_art_dict_info["模特图"] = image_path.replace("模特图.jpg", "")
+            goods_art_dict_info["模特图"] = image_path
             new_goods_dict[goods_art_no] = goods_art_dict_info
             
             # upper_footer_progress = {
@@ -775,7 +779,7 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
             #     "total": upper_footer_total_progress, 
             #     "error": upper_footer_error_progress
             # }
-            upper_footer_progress["folder"] = save_image_path
+            upper_footer_progress["folder"] = save_image_path.replace("模特图.jpg", "")
             await sendAsyncMessage(
                 msg="模特图处理成功",
                 goods_arts=[goods_art_no],
@@ -788,13 +792,16 @@ async def _process_model_images(aigc_clazz, run_main, return_data_check_before_d
             os.remove(save_image_path)
             upper_footer_finish_progress-=1
             upper_footer_error_progress += 1
-            
+            goods_art_dict_info = goods_dict[goods_art_no]
+            goods_art_dict_info["模特图"] = ""
+            new_goods_dict[goods_art_no] = goods_art_dict_info
             upper_footer_progress = {
                 "status": "处理失败", 
                 "goods_art_no": goods_art_no,
                 "current": upper_footer_finish_progress, 
                 "total": upper_footer_total_progress, 
-                "error": upper_footer_error_progress
+                "error": upper_footer_error_progress,
+                "folder":""
             }
             
             await sendAsyncMessage(

python/custom_plugins/plugins_mode/detail_generate_base.py

@@ -237,6 +237,7 @@ class DetailBase(object):
         scp_path = "{out_put_dir}".format(
             out_put_dir=self.out_put_dir
         )
+        logger.info(f"copyImage 前数据校验:{self.goods_no_value}")
         if self.get_text_value("模特图"):
             model_pic = self.get_text_value("模特图")
             self.copyImage(model_pic, f"{scp_path}/模特图.jpg")
@@ -248,7 +249,7 @@ class DetailBase(object):
         try:
           shutil.copy(src_path, limit_path)
         except Exception as e:
-          print(f'An exception occurred:{e}')
+            logger.info(f"copyImage 复制模特图/场景图出错:{str(e)}",src_path,limit_path)
     def concatAigcImage(self,image_path,resize=1600,bg_color=(255,255,255)):
         """拼接模特图场景图"""
         try:
@@ -259,8 +260,8 @@ class DetailBase(object):
                 )
                 bg_img = bg_img.paste_img(top_img=mote_img, base="nc", value=(0, 0))
                 return bg_img
-        except:
-             print('An exception occurred')
+        except Exception as e:
+             logger.info(f"copyImage 拼接模特图/场景图出错:{str(e)}")
              return
     # 移动一张图片到新的文件夹
     def move_one_pic(self, old_path, new_path, new_name):

python/mcu/capture/smart_shooter_class.py

@@ -376,17 +376,17 @@ class SmartShooter(metaclass=SingletonType):
             print("json_msg", json_msg)
             msg_result = json_msg.get("msg_result")
             if not msg_result:
-                msg_send = "对焦失败"
-                message = {
-                    "code": 1,
-                    "msg": msg_send,
-                    "data": None,
-                    "msg_type": "smart_shooter_photo_take",
-                    "device_status": -1,
-                }
-                await self.websocket_manager.send_personal_message(
-                    message, self.websocket
-                )
+                # msg_send = "对焦失败"
+                # message = {
+                #     "code": 1,
+                #     "msg": msg_send,
+                #     "data": None,
+                #     "msg_type": "smart_shooter_photo_take",
+                #     "device_status": -1,
+                # }
+                # await self.websocket_manager.send_personal_message(
+                #     message, self.websocket
+                # )
                 return False, "对焦失败"
             return True, "对焦成功"
         except zmq.Again:
@@ -559,7 +559,7 @@ class SmartShooter(metaclass=SingletonType):
                 asyncio.run(self.callback_listen(json_msg))
             except zmq.Again:
                 print("接收超时，继续监听...")
-                logger.info("接收超时，继续监听...")
+                # logger.info("接收超时，继续监听...")
                 continue
             except Exception as e:
                 self.connect_status = False