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/Servo/CPageGlassList.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h index c0327dd..38a35c7 100644 --- a/SourceCode/Bond/Servo/CPageGlassList.h +++ b/SourceCode/Bond/Servo/CPageGlassList.h @@ -1,6 +1,11 @@ 锘�#pragma once #include "CExpandableListCtrl.h" #include "GlassLogDb.h" +#include <unordered_map> + +// ====== 缂栬瘧寮�鍏宠鏄� ====== +// USE_MOCK_SENSOR_DATA: 1=鍚敤妯℃嫙浼犳劅鍣ㄦ暟鎹敓鎴愶紱0=浣跨敤鐪熷疄鏁版嵁 +// 鍦� CPageGlassList.cpp 涓畾涔� // CPageGlassList 瀵硅瘽妗� @@ -56,6 +61,16 @@ bool eraseGlassInVector(SERVO::CGlass* pGlass, std::vector<SERVO::CGlass*>& glasses); void UpdateWipRow(unsigned int index, SERVO::CGlass* pGlass); bool WriteAnsiStringAsUtf8ToFile(const CString& ansiContent, const CString& filePath); + void ExportToCsv(const GlassLogDb::Row& row, const CString& filePath); + void ExportToJson(const GlassLogDb::Row& row, const CString& filePath); + void ExportBasicInfo(CString& csvContent, const GlassLogDb::Row& row); + void ExportProcessParams(CString& csvContent, const GlassLogDb::Row& row); + void ExportSensorData(CString& csvContent, const GlassLogDb::Row& row); + static std::vector<std::string> getMachineColumnOrder(int machineId, const std::unordered_map<std::string, std::vector<SERVO::SVDataItem>>* actualData = nullptr); + static std::string timePointToString(const std::chrono::system_clock::time_point& tp); + static int64_t timePointToMs(const std::chrono::system_clock::time_point& tp); + void GenerateMockSVData(SERVO::CGlass& glass); + double GenerateMockValue(int machineId, const std::string& dataType, int index); // 瀵硅瘽妗嗘暟鎹� #ifdef AFX_DESIGN_TIME -- Gitblit v1.9.3