From 4549c0684625f62810fbfe7143000e386a61a97c Mon Sep 17 00:00:00 2001
From: dongchangxi <458593490@qq.com>
Date: Fri, 5 Dec 2025 14:34:35 +0800
Subject: [PATCH] 1111

---
 script/factory_sliceing_v2/build_exe.bat    | 1 +
 script/factory_sliceing_v2/build_exe.py     | 1 +
 script/factory_sliceing_v2/requirements.txt | 1 +
 script/factory_sliceing_v2/utils/funcs.py   | 7 ++++---
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/script/factory_sliceing_v2/build_exe.bat b/script/factory_sliceing_v2/build_exe.bat
index bb6a397..4543b84 100644
--- a/script/factory_sliceing_v2/build_exe.bat
+++ b/script/factory_sliceing_v2/build_exe.bat
@@ -55,3 +55,4 @@ echo.
 echo ========================================
 pause
 
+
diff --git a/script/factory_sliceing_v2/build_exe.py b/script/factory_sliceing_v2/build_exe.py
index 19df7cb..213f884 100644
--- a/script/factory_sliceing_v2/build_exe.py
+++ b/script/factory_sliceing_v2/build_exe.py
@@ -148,3 +148,4 @@ if __name__ == '__main__':
         traceback.print_exc()
         sys.exit(1)
 
+
diff --git a/script/factory_sliceing_v2/requirements.txt b/script/factory_sliceing_v2/requirements.txt
index 05c2252..8371edc 100644
--- a/script/factory_sliceing_v2/requirements.txt
+++ b/script/factory_sliceing_v2/requirements.txt
@@ -3,3 +3,4 @@ oss2>=2.17.0
 requests>=2.28.0
 pyinstaller>=5.0.0
 
+
diff --git a/script/factory_sliceing_v2/utils/funcs.py b/script/factory_sliceing_v2/utils/funcs.py
index 15ca2aa..9268f0c 100644
--- a/script/factory_sliceing_v2/utils/funcs.py
+++ b/script/factory_sliceing_v2/utils/funcs.py
@@ -226,6 +226,9 @@ def downloadJsonAndJpgFileAndMoveToCorrectDir(versionId, currentDir):
     #如果是大机台，将 json 文件复制到 data 目录下
     if str(machineInfo["machine_type"]) != '1':
         shutil.copy(os.path.join(jsonSubDir, '3DPrintLayout.json'), os.path.join(dataSubDir, '3DPrintLayout.json'))
+        if not os.path.exists(os.path.join(dataSubDir, '3DPrintLayout.json')):
+            log(f"JSON文件不存在, dataSubDir={dataSubDir}")
+            return False, False
 
 
     # 检测文件是否移动成功
@@ -235,9 +238,7 @@ def downloadJsonAndJpgFileAndMoveToCorrectDir(versionId, currentDir):
     if not os.path.exists(os.path.join(jsonSubDir, f'{versionId}.jpg')):
         log(f"JPG文件不存在, versionId={versionId}")
         return False, False
-    if not os.path.exists(os.path.join(dataSubDir, '3DPrintLayout.json')):
-        log(f"JSON文件不存在, dataSubDir={dataSubDir}")
-        return False, False
+
     log(f"文件移动成功, versionId={versionId}")
     # 返回目录路径
     return dirNewName, machineInfo