From 829fe6c6bc33d53fda9c31fd45a37e1df87befff Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 30 一月 2026 11:16:24 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/EAPSimulator/Resource.h |   38 +++++++++++++++++++++++++++++++++-----
 1 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/SourceCode/Bond/EAPSimulator/Resource.h b/SourceCode/Bond/EAPSimulator/Resource.h
index f3daccf..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
@@ -44,18 +45,45 @@
 #define IDC_BUTTON_CONFIGURE_SPOOLING   1029
 #define IDC_BUTTON_PURGE_SPOOLED_DATA   1030
 #define IDC_EDIT_CE_NAME                1031
-#define IDC_BUTTON_QUERY_PPID_LIST		1032
+#define IDC_BUTTON_QUERY_PPID_LIST      1032
 #define IDC_EDIT_CE_RPTID               1033
-#define IDC_BUTTON_TRANSMIT_SPOOLED_DATA 1034
-
+#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