From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题: ProceedWithCarrier 直接发 CCC_PROCESS_START:CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时,收到 ProceedWithCarrier 就调用 master.proceedWithCarrier(仅发送 Cassette Process Start,不校验 PJ/CJ 是否存在、SlotMap 是否验通过)。若 Host 流程异常(未下 PJ/CJ)或本地尚未准备好,会把设备推进加工态但无作业可跑。
---
SourceCode/Bond/BoounionPLC/ToolUnits.cpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BoounionPLC/ToolUnits.cpp b/SourceCode/Bond/BoounionPLC/ToolUnits.cpp
index 664f802..d657a79 100644
--- a/SourceCode/Bond/BoounionPLC/ToolUnits.cpp
+++ b/SourceCode/Bond/BoounionPLC/ToolUnits.cpp
@@ -98,6 +98,53 @@
CreateDirectory(strDir, NULL);
}
+void CToolUnits::deleteDir(const char* pszDir)
+{
+ WIN32_FIND_DATA findFileData;
+ HANDLE hFind = INVALID_HANDLE_VALUE;
+
+ // 拼接上 "\\*",表示目录下的所有文件和文件夹
+ std::string dirPath = pszDir;
+ dirPath.append("\\*");
+
+ // 打开目录,查找第一个文件
+ hFind = FindFirstFile(dirPath.c_str(), &findFileData);
+
+ if (hFind == INVALID_HANDLE_VALUE) {
+ return;
+ }
+
+ do {
+ const std::string fileName = findFileData.cFileName;
+ if (fileName == "." || fileName == "..") {
+ continue;
+ }
+
+ std::string fullPath = pszDir;
+ fullPath.append("\\").append(fileName);
+
+ if (findFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+ deleteDir(fullPath.c_str());
+ }
+ else {
+ DWORD fileAttributes = GetFileAttributes(fullPath.c_str());
+ if (fileAttributes != INVALID_FILE_ATTRIBUTES) {
+ if (fileAttributes & FILE_ATTRIBUTE_READONLY) {
+ SetFileAttributes(fullPath.c_str(), fileAttributes & ~FILE_ATTRIBUTE_READONLY);
+ }
+ }
+
+ if (!DeleteFile(fullPath.c_str())) {
+ return;
+ }
+ }
+ } while (FindNextFile(hFind, &findFileData) != 0);
+
+ FindClose(hFind);
+
+ RemoveDirectory(pszDir);
+}
+
CString& CToolUnits::floatToString1(float value, CString& strOut)
{
strOut.Format(_T("%.1f"), value);
--
Gitblit v1.9.3