处理单拍重拍图片排序问题

python/api.py

@@ -114,8 +114,13 @@ def fromExcelHandler(params: HandlerDetail):
                     raise UnicornException(
                         f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
                     )
-                if not os.path.exists(image_dir + "/" + os.path.basename(itemImg.image_path)):
-                    shutil.copy(itemImg.image_path, image_dir)
+                new_file_name = (
+                    str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
+                )
+                if not os.path.exists(
+                    image_dir + "/" + os.path.basename(new_file_name)
+                ):
+                    shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
             dealImage = DealImage(image_dir)
             resFlag, path = dealImage.dealMoveImage(
                 image_dir=image_dir,
@@ -246,10 +251,15 @@ async def handle_detail(request: Request, params: HandlerDetail):
             for itemImg in images:
                 if itemImg.image_path == "" or itemImg.image_path == None:
                     raise UnicornException(
-                            f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
-                        )
-                if not os.path.exists(image_dir + "/" + os.path.basename(itemImg.image_path)):
-                    shutil.copy(itemImg.image_path, image_dir)
+                        f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
+                    )
+                new_file_name = (
+                    str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
+                )
+                if not os.path.exists(
+                    image_dir + "/" + os.path.basename(new_file_name)
+                ):
+                    shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
             dealImage = DealImage(image_dir)
             resFlag, path = dealImage.dealMoveImage(
                     image_dir=image_dir, callback_func=None, goods_art_no=goods_art_no