api调整

python/api.py

@@ -161,7 +161,7 @@ def fromExcelHandler(params: HandlerDetail):
                 ),  # 是否使用excel
                 "excel_path": params.excel_path,  # excel路径
                 "is_check_color_is_all": False,
-                "cutout_is_pass": False,
+                "cutout_is_pass": True,
                 "assigned_page_dict": {},
                 "detail_is_pass": False,
                 "upload_is_pass": False,
@@ -302,15 +302,16 @@ async def handle_detail(request: Request, params: HandlerDetail):
                 "is_check_color_is_all": False,
                 "cutout_is_pass": True,
                 "assigned_page_dict": {},
-                "detail_is_pass": False,
-                "upload_is_pass": False,
-                "upload_is_enable": False,
+                "detail_is_pass": True,
+                "upload_is_pass": True,
+                "upload_is_enable": True,
                 "is_filter": False,
                 "temp_class": temp_class,
                 "temp_name": params.temp_name,
                 "temp_name_list": temp_name_list,
                 "target_error_folder": f"{path}/软件-生成详情错误",
             }
+            print("image_dir=====>>>>>", config_data["image_dir"])
             # 动态导入类
             temp_class_dict = {}
             for key, class_path in config_data["temp_class"].items():

python/service/auto_deal_pics/upload_pic.py

@@ -110,17 +110,17 @@ class UploadPic():
                 self.show_info("开始处理  {}".format(goods_no))
                 # try:
                 if self.deal_goods_pic(goods_no, goods_no_path):
-                        # 移动文件到已完成
-                        # dest = "{}\{}\{}".format(self.is_deal_dir, group_folders, goods_no)
-                        # if os.path.exists(dest):
-                        #     self.show_info("{} 文件夹在目标目录已存在".format(goods_no))
-                        # else:
-                        #     shutil.move(goods_no_path, dest)
-                        self.show_info("{} 上传成功".format(goods_no))
+                    # 移动文件到已完成
+                    # dest = "{}\{}\{}".format(self.is_deal_dir, group_folders, goods_no)
+                    # if os.path.exists(dest):
+                    #     self.show_info("{} 文件夹在目标目录已存在".format(goods_no))
+                    # else:
+                    #     shutil.move(goods_no_path, dest)
+                    self.show_info("{} 上传成功".format(goods_no))
                 else:
-                        self.show_info("{} 处理失败".format(goods_no))
-                        error_data.append(goods_no)
-                        pass
+                    self.show_info("{} 处理失败".format(goods_no))
+                    error_data.append(goods_no)
+                    pass
                 # except BaseException as e:
                 #     self.show_info("上传异常：{}，{}".format(goods_no, e))
                 #     raise UnicornException("上传异常：{}，{}".format(goods_no, e))
@@ -179,7 +179,6 @@ class UploadPic():
                         continue
                     else:
                         _numbers.append(f)
-
                 if "货号素材" in f:
                     if "_" not in f:
                         self.show_info("{} 货号素材文件夹 格式错误".format(goods_no))
@@ -193,6 +192,8 @@ class UploadPic():
             goods_number_data = self.data_mode_upload_pic.get_goods_art_no_info(numbers_list=_numbers)
 
         else:
+            if len(_numbers) == 0:
+                _numbers = self.config_data["goods_art_nos"]
             goods_number_data = self.data_mode_upload_pic.get_goods_art_no_info(goods_art_list=_numbers)
 
         t = True
@@ -212,7 +213,7 @@ class UploadPic():
 
         if not t:
             return False
-
+        print("goods_number_data", goods_number_data)
         _ = set([goods_number_data[x]["款号"] for x in goods_number_data])
         if len(_) != 1:
             self.show_info("{} 存在多个不同的款号".format(_))
@@ -249,7 +250,8 @@ class UploadPic():
                     continue
                 else:
                     is_resize = True
-                executor.submit(self.to_upload_pic, file_path=key, is_resize=is_resize)
+                # executor.submit(self.to_upload_pic, file_path=key, is_resize=is_resize)
+                self.to_upload_pic(file_path=key, is_resize=is_resize)
 
         for key in self.pic_data:
             if "货号素材" in key:

python/service/online_request/module_online_data.py

@@ -307,7 +307,7 @@ class GetOnlineDataHLM(OnlineDataRequest):
     def __init__(self,token):
         super().__init__(token)
         self.token = token
-    def upload_pic(self, goods_data):
+    def upload_pic(self, goods_data,token):
         # 检查货号图是否存在
         url = "{domain}/api/backend/upload".format(
             domain=settings.DOMAIN
@@ -329,7 +329,7 @@ class GetOnlineDataHLM(OnlineDataRequest):
 
         return response_data["data"]["url"]
 
-    def upload_pic_list_data(self, data):
+    def upload_pic_list_data(self, data,token):
         url = "{domain}/api/backend/goods/save/images".format(
             domain=settings.DOMAIN
         )