|
@@ -150,18 +150,16 @@ def fromExcelHandler(params: HandlerDetail):
|
|
|
"\\", "/"
|
|
"\\", "/"
|
|
|
)
|
|
)
|
|
|
check_path(image_dir)
|
|
check_path(image_dir)
|
|
|
- for itemImg in images:
|
|
|
|
|
|
|
+ for idx, itemImg in enumerate(images):
|
|
|
if itemImg.image_path == "" or itemImg.image_path == None:
|
|
if itemImg.image_path == "" or itemImg.image_path == None:
|
|
|
raise UnicornException(
|
|
raise UnicornException(
|
|
|
f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
|
|
f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
|
|
|
)
|
|
)
|
|
|
- new_file_name = (
|
|
|
|
|
- str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ new_file_name = str(itemImg.goods_art_no) + "_" + str(idx) + ".jpg"
|
|
|
if not os.path.exists(
|
|
if not os.path.exists(
|
|
|
image_dir + "/" + os.path.basename(new_file_name)
|
|
image_dir + "/" + os.path.basename(new_file_name)
|
|
|
):
|
|
):
|
|
|
- shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
|
|
|
|
|
|
|
+ shutil.copy(itemImg.image_path, image_dir + new_file_name)
|
|
|
dealImage = DealImage(image_dir)
|
|
dealImage = DealImage(image_dir)
|
|
|
resFlag, path = dealImage.dealMoveImage(
|
|
resFlag, path = dealImage.dealMoveImage(
|
|
|
image_dir=image_dir,
|
|
image_dir=image_dir,
|
|
@@ -321,18 +319,16 @@ async def handle_detail(request: Request, params: HandlerDetail):
|
|
|
if move_folder_array.get(goods_art_no) == None:
|
|
if move_folder_array.get(goods_art_no) == None:
|
|
|
image_dir = "{}/data/".format(os.getcwd()).replace("\\", "/")
|
|
image_dir = "{}/data/".format(os.getcwd()).replace("\\", "/")
|
|
|
check_path(image_dir)
|
|
check_path(image_dir)
|
|
|
- for itemImg in images:
|
|
|
|
|
|
|
+ for idx, itemImg in enumerate(images):
|
|
|
if itemImg.image_path == "" or itemImg.image_path == None:
|
|
if itemImg.image_path == "" or itemImg.image_path == None:
|
|
|
raise UnicornException(
|
|
raise UnicornException(
|
|
|
f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
|
|
f"货号【{goods_art_no}】存在没有拍摄完成的图片,请重拍或删除后重试"
|
|
|
)
|
|
)
|
|
|
- new_file_name = (
|
|
|
|
|
- str(itemImg.goods_art_no) + "_" + str(itemImg.id) + ".jpg"
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ new_file_name = str(itemImg.goods_art_no) + "_" + str(idx) + ".jpg"
|
|
|
if not os.path.exists(
|
|
if not os.path.exists(
|
|
|
image_dir + "/" + os.path.basename(new_file_name)
|
|
image_dir + "/" + os.path.basename(new_file_name)
|
|
|
):
|
|
):
|
|
|
- shutil.copy(itemImg.image_path, image_dir + "/" + new_file_name)
|
|
|
|
|
|
|
+ shutil.copy(itemImg.image_path, image_dir + new_file_name)
|
|
|
dealImage = DealImage(image_dir)
|
|
dealImage = DealImage(image_dir)
|
|
|
resFlag, path = dealImage.dealMoveImage(
|
|
resFlag, path = dealImage.dealMoveImage(
|
|
|
image_dir=image_dir, callback_func=None, goods_art_no=goods_art_no
|
|
image_dir=image_dir, callback_func=None, goods_art_no=goods_art_no
|