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/EAPSimulator/Resource.h | 38 ++++++++++++++++++++++++++++++++------ 1 files changed, 32 insertions(+), 6 deletions(-) diff --git a/SourceCode/Bond/EAPSimulator/Resource.h b/SourceCode/Bond/EAPSimulator/Resource.h index b39967c..5c4789f 100644 --- a/SourceCode/Bond/EAPSimulator/Resource.h +++ b/SourceCode/Bond/EAPSimulator/Resource.h @@ -13,6 +13,7 @@ #define IDD_DIALOG_ADD_IDS 135 #define IDD_DIALOG_LINK_REPORT 137 #define IDD_DIALOG_LINK_REPORT_DETAIL 139 +#define IDD_DIALOG_PJS 141 #define IDC_EDIT_LOG 1000 #define IDC_EDIT_IP 1001 #define IDC_EDIT_PORT 1002 @@ -46,18 +47,43 @@ #define IDC_EDIT_CE_NAME 1031 #define IDC_BUTTON_QUERY_PPID_LIST 1032 #define IDC_EDIT_CE_RPTID 1033 -#define IDC_BUTTON_PROCEED_WITH_CARRIER 1033 -#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1034 -#define IDC_BUTTON_PROCEED_WITH_CARRIER2 1035 -#define IDC_BUTTON_CARRIER_RELEASE 1035 +#define IDC_BUTTON_PROCEED_WITH_CARRIER 1034 +#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1035 +#define IDC_BUTTON_CARRIER_RELEASE 1036 +#define IDC_BUTTON_QUERY_CJ_SPACE 1037 +#define IDC_BUTTON_QUERY_PJ_SPACE 1038 +#define IDC_BUTTON_CREATE_PJ 1039 +#define IDC_BUTTON_ADD 1040 +#define IDC_BUTTON_CREATE_PJ2 1040 +#define IDC_BUTTON_CREATE_CJ 1040 +#define IDC_BUTTON_DELETE 1041 +#define IDC_BUTTON_PROCEED_WITH_SLOTMAP 1042 +#define IDC_BUTTON_CTRL_OFFLINE 1043 +#define IDC_BUTTON_CTRL_ONLINE_LOCAL 1044 +#define IDC_BUTTON_CTRL_ONLINE_REMOTE 1045 +#define IDC_BUTTON_QUERY_CONTROL_STATE 1046 +#define IDC_BUTTON_QUERY_PROCESS_STATE 1047 +#define IDC_BUTTON_QUERY_ALL_SVID 1048 +#define IDC_BUTTON_QUERY_ALL_CEID 1049 +#define IDC_EDIT_DELETE_PPID 1050 +#define IDC_BUTTON_DELETE_PPID 1051 +#define IDC_COMBO_EQ_FOR_RECIPE 1052 +#define IDC_BUTTON_QUERY_CURRENT_RECIPE 1053 +#define IDC_EDIT_PPID_REQ 1054 +#define IDC_BUTTON_PP_REQUEST 1055 +#define IDC_BUTTON_QUERY_ALL_DVID 1056 +#define IDC_BUTTON_QUERY_ALL_ECID 1057 +#define IDC_EDIT_ECID 1058 +#define IDC_EDIT_ECV 1059 +#define IDC_BUTTON_SET_ECID 1060 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 141 +#define _APS_NEXT_RESOURCE_VALUE 146 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1035 +#define _APS_NEXT_CONTROL_VALUE 1057 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif -- Gitblit v1.9.3