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/BoounionPLC/Model.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/Model.h b/SourceCode/Bond/BoounionPLC/Model.h
index b02b2de..55401e4 100644
--- a/SourceCode/Bond/BoounionPLC/Model.h
+++ b/SourceCode/Bond/BoounionPLC/Model.h
@@ -20,6 +20,10 @@
 	int addPlc(const char* pszName, const char* pszIp, const unsigned int port);
 	int removePlc(const char* pszName);
 
+	// 设置/获取当前PLC
+	void setCurrentPlc(CPLC* pPlc);
+	CPLC* getCurrentPlc();
+
 public:
 	int notify(int code);
 	int notifyPtr(int code, void* ptr = NULL);
@@ -37,12 +41,12 @@
 public:
 	CConfiguration m_configuration;
 
-
 private:
 	IObservable* m_pObservable;
 	IObservableEmitter* m_pObservableEmitter;
 	CString m_strWorkDir;
 	std::map<std::string, CPLC*> m_mapPlc;
+	CPLC* m_pActivePlc;
 
 private:
 	int m_nTimerID;

--
Gitblit v1.9.3