diff --git a/HEZON_ITK/HEZON_ITK.vcxproj b/HEZON_ITK/HEZON_ITK.vcxproj
index 89240ac..9095cbf 100644
--- a/HEZON_ITK/HEZON_ITK.vcxproj
+++ b/HEZON_ITK/HEZON_ITK.vcxproj
@@ -129,7 +129,11 @@
true
true
WIN32;NDEBUG;_CONSOLE;IPLIB=none;%(PreprocessorDefinitions)
+<<<<<<< HEAD
+ D:\work\include12_2;D:\work\include_cpp12_2;C:\Java\jdk1.8.0_231\include\win32;C:\Java\jdk1.8.0_231\include;%(AdditionalIncludeDirectories)
+=======
C:\Users\lyf\Documents\tclib\include;C:\Users\lyf\Documents\tclib\include_cpp;C:\Program Files\Java\jdk1.8.0_212\include\win32;C:\Program Files\Java\jdk1.8.0_212\include;%(AdditionalIncludeDirectories)
+>>>>>>> 75d75317d3feeaf219ba70fbc3430469d70d2d05
Cdecl
@@ -139,7 +143,11 @@
true
+<<<<<<< HEAD
+ D:\work\lib12_2\*.lib;%(AdditionalDependencies)
+=======
C:\Users\lyf\Documents\tclib\tc12\lib\*.lib;%(AdditionalDependencies)
+>>>>>>> 75d75317d3feeaf219ba70fbc3430469d70d2d05
libuser_exits.ar.lib;%(IgnoreSpecificDefaultLibraries)
$(OutDir)\bs.dll
/FORCE %(AdditionalOptions)
@@ -165,6 +173,7 @@
+
diff --git a/HEZON_ITK/HEZON_ITK.vcxproj.filters b/HEZON_ITK/HEZON_ITK.vcxproj.filters
index a635c2c..f88c1fb 100644
--- a/HEZON_ITK/HEZON_ITK.vcxproj.filters
+++ b/HEZON_ITK/HEZON_ITK.vcxproj.filters
@@ -73,6 +73,12 @@
epm-handler
+<<<<<<< HEAD
+
+ epm-handler
+
+=======
+>>>>>>> 75d75317d3feeaf219ba70fbc3430469d70d2d05
diff --git a/HEZON_ITK/epm_handler_common.h b/HEZON_ITK/epm_handler_common.h
index 9c01c4e..d1f3726 100644
--- a/HEZON_ITK/epm_handler_common.h
+++ b/HEZON_ITK/epm_handler_common.h
@@ -46,6 +46,7 @@ int bs_sign_cad(EPM_action_message_t msg);
int jd_signoff(EPM_action_message_t msg);
int bs_test_release_check(EPM_rule_message_t msg);
int bs_bypass(void *retValType);
+int jd_schedule_joint(EPM_action_message_t msg);
////��������Ϣǩ��汾������ȥ
//int qtmc_sign_ir(EPM_action_message_t msg);
diff --git a/HEZON_ITK/epm_register_handler.cxx b/HEZON_ITK/epm_register_handler.cxx
index 3d9b39d..27d807b 100644
--- a/HEZON_ITK/epm_register_handler.cxx
+++ b/HEZON_ITK/epm_register_handler.cxx
@@ -138,6 +138,13 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args)
printf("register jd_signoff successfully\n");
}
+ ifail = EPM_register_action_handler("jd_schedule_joint", "jd_schedule_joint",
+ (EPM_action_handler_t)jd_schedule_joint);
+ if (ifail == ITK_ok) {
+ fprintf(stdout, "Registering action handler jd_schedule_joint completed!\n");
+ } else {
+ fprintf(stdout, "Registering action handler jd_schedule_joint failed %d!\n", ifail);
+ }
//if(ifail == ITK_ok)
//{
// fprintf(stdout,"Registering action handler qtmc-sign-ir completed!\n");
diff --git a/HEZON_ITK/jd_schedule_joint.cpp b/HEZON_ITK/jd_schedule_joint.cpp
new file mode 100644
index 0000000..26cd369
--- /dev/null
+++ b/HEZON_ITK/jd_schedule_joint.cpp
@@ -0,0 +1,155 @@
+#include "epm_handler_common.h"
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "tc/envelope.h"
+#include
+#include "ae/dataset.h"
+#include
+#include
+#include
+#include
+#include
+#include