From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
SourceCode/Bond/SGMeasurement/Logger.h | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/SGMeasurement/Logger.h b/SourceCode/Bond/SGMeasurement/Logger.h
index aec95af..2b9f84d 100644
--- a/SourceCode/Bond/SGMeasurement/Logger.h
+++ b/SourceCode/Bond/SGMeasurement/Logger.h
@@ -1,28 +1,28 @@
-#pragma once
+锘�#pragma once
#include <afx.h>
class CLogger
{
public:
- static CLogger& Instance(); // 获取单例
- void WriteLine(CString str); // 写一行日志
- void CloseLogFile(); // 关闭日志文件
+ static CLogger& Instance(); // 鑾峰彇鍗曚緥
+ void WriteLine(CString str); // 鍐欎竴琛屾棩蹇�
+ void CloseLogFile(); // 鍏抽棴鏃ュ織鏂囦欢
private:
- CLogger();
- ~CLogger();
- void OpenLogFile(); // 内部打开文件
+ CLogger();
+ ~CLogger();
+ void OpenLogFile(); // 鍐呴儴鎵撳紑鏂囦欢
- CCriticalSection m_csLogLock;
- CString m_strCurrentLogPath;
- CStdioFile m_logFile;
+ CCriticalSection m_csLogLock;
+ CString m_strCurrentLogPath;
+ CStdioFile m_logFile;
};
#define LOG_LINE(x) CLogger::Instance().WriteLine(x)
#define LOG_LINEF(fmt, ...) \
- do { \
- CString __log__; \
- __log__.Format(fmt, __VA_ARGS__); \
- CLogger::Instance().WriteLine(__log__); \
- } while (0)
\ No newline at end of file
+ do { \
+ CString __log__; \
+ __log__.Format(fmt, __VA_ARGS__); \
+ CLogger::Instance().WriteLine(__log__); \
+ } while (0)
\ No newline at end of file
--
Gitblit v1.9.3