diff --git a/HEZON_ITK/HEZON_ITK.vcxproj b/HEZON_ITK/HEZON_ITK.vcxproj index 540fe89..46bdcac 100644 --- a/HEZON_ITK/HEZON_ITK.vcxproj +++ b/HEZON_ITK/HEZON_ITK.vcxproj @@ -129,7 +129,7 @@ true true WIN32;NDEBUG;_CONSOLE;IPLIB=none;%(PreprocessorDefinitions) - 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) + E:\work\include12_2;E:\work\include_cpp12_2;C:\Java\jdk1.8.0_231\include\win32;C:\Java\jdk1.8.0_231\include;%(AdditionalIncludeDirectories) Cdecl @@ -137,7 +137,7 @@ true true true - C:\Users\lyf\Documents\tclib\tc12\lib\*.lib;Ws2_32.lib;%(AdditionalDependencies) + E:\work\lib12_2\*.lib;Ws2_32.lib;%(AdditionalDependencies) libuser_exits.ar.lib;%(IgnoreSpecificDefaultLibraries) $(OutDir)\bs.dll /FORCE %(AdditionalOptions) @@ -165,7 +165,6 @@ - diff --git a/HEZON_ITK/HEZON_ITK.vcxproj.filters b/HEZON_ITK/HEZON_ITK.vcxproj.filters index 3cb9aa5..8440569 100644 --- a/HEZON_ITK/HEZON_ITK.vcxproj.filters +++ b/HEZON_ITK/HEZON_ITK.vcxproj.filters @@ -82,9 +82,6 @@ epm-handler - - epm-handler - diff --git a/HEZON_ITK/epm_handler_common.h b/HEZON_ITK/epm_handler_common.h index 2968e6c..977449f 100644 --- a/HEZON_ITK/epm_handler_common.h +++ b/HEZON_ITK/epm_handler_common.h @@ -49,7 +49,6 @@ int bs_bypass(void *retValType); int jd_schedule_joint(EPM_action_message_t msg); int jd_batch_process(EPM_action_message_t msg); int jd_add_attachments(EPM_action_message_t msg); -int jd_complate_first_task(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 665e650..de89c37 100644 --- a/HEZON_ITK/epm_register_handler.cxx +++ b/HEZON_ITK/epm_register_handler.cxx @@ -160,14 +160,6 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args) } else { printf("register jd_add_attachments successfully\n"); - } - ifail = EPM_register_action_handler("jd_complate_first_task", "jd_complate_first_task", - (EPM_action_handler_t)jd_complate_first_task); - if (ifail) { - printf("register jd_complate_first_task failed\n"); - } else { - printf("register jd_complate_first_task successfully\n"); - } //if(ifail == ITK_ok) //{ diff --git a/HEZON_ITK/jd_complate_first_task.cpp b/HEZON_ITK/jd_complate_first_task.cpp deleted file mode 100644 index 67cd3ef..0000000 --- a/HEZON_ITK/jd_complate_first_task.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#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 -#include -#include "ce/ce.h" -#include -#include -#include -#include -#include -#include "string" -#include "sstream" -#include -#include -#include -#include
-#include "ctime" -#include "tchar.h" -#include -#include -#include - -using namespace std; -extern "C" int POM_AM__set_application_bypass(logical bypass); - -int jd_complate_first_task(EPM_action_message_t msg) { - //Sleep(10000); - AOM_refresh(msg.task, false); - POM_AM__set_application_bypass(true); - tag_t parent, *valids; - char *type, *status; - int valid_cnt; - AOM_ask_value_string(msg.task, "object_type", &type); - EPM_ask_parent_task(msg.task, &parent); - //AOM_ask_value_tags(parent, "valid_signoffs", &valid_cnt, &valids); - EPM_ask_attachments(msg.task, EPM_signoff_attachment, &valid_cnt, &valids); - AOM_ask_value_string(msg.task, "task_result", &status); - printf("type====>%s\nstatus====>%s\nvalid_cnt====>%d\n", type, status, valid_cnt); - if (tc_strcmp("Completed", status) == 0) { - POM_AM__set_application_bypass(false); - return 0; - } - if (tc_strcmp("EPMSelectSignoffTask", type) == 0 && valid_cnt > 0) { - printf("ǰΪsignoff\n"); - ITKCALL(EPM_trigger_action(msg.task, EPM_complete_action, "")); - } - - POM_AM__set_application_bypass(false); - return 0; -} \ No newline at end of file diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.Build.CppClean.log b/HEZON_ITK/x64/Release/HEZON_ITK.Build.CppClean.log index 594d40d..2251ea6 100644 --- a/HEZON_ITK/x64/Release/HEZON_ITK.Build.CppClean.log +++ b/HEZON_ITK/x64/Release/HEZON_ITK.Build.CppClean.log @@ -22,6 +22,7 @@ e:\work\vs_workspace\jditk\hezon_itk\x64\release\.netframework,version=v4.0.asse e:\work\vs_workspace\jditk\x64\release\bs.dll e:\work\vs_workspace\jditk\x64\release\hezon_itk.pdb e:\work\vs_workspace\jditk\hezon_itk\x64\release\hezon_itk.tlog\metagen.write.1.tlog +e:\work\vs_workspace\jditk\hezon_itk\x64\release\hezon_itk.vcxprojresolveassemblyreference.cache e:\work\vs_workspace\jditk\hezon_itk\x64\release\hezon_itk.tlog\cl.command.1.tlog e:\work\vs_workspace\jditk\hezon_itk\x64\release\hezon_itk.tlog\cl.read.1.tlog e:\work\vs_workspace\jditk\hezon_itk\x64\release\hezon_itk.tlog\cl.write.1.tlog diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.log b/HEZON_ITK/x64/Release/HEZON_ITK.log index a46ebf5..e3016c7 100644 --- a/HEZON_ITK/x64/Release/HEZON_ITK.log +++ b/HEZON_ITK/x64/Release/HEZON_ITK.log @@ -22,9 +22,9 @@ e:\work\vs_workspace\jditk\hezon_itk\epm_handler_common.h : warning C4819: 该 E:\work\include12_2\pom/pom/pom.h(806): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 E:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 bs_sap.cpp(8): warning C4101: “obj_type”: 未引用的局部变量 -bs_sap.cpp(253): warning C4101: “obj_type”: 未引用的局部变量 -bs_sap.cpp(285): warning C4101: “lines”: 未引用的局部变量 -bs_sap.cpp(283): warning C4101: “line_cnt”: 未引用的局部变量 +bs_sap.cpp(260): warning C4101: “obj_type”: 未引用的局部变量 +bs_sap.cpp(292): warning C4101: “lines”: 未引用的局部变量 +bs_sap.cpp(290): warning C4101: “line_cnt”: 未引用的局部变量 bs_signoff.cxx e:\work\vs_workspace\jditk\hezon_itk\epm_handler_common.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 E:\work\include12_2\pom/pom/pom.h(806): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 @@ -104,10 +104,6 @@ jd_clear_field.cpp(245): warning C4101: “attach_type”: 未引用的局部变 jd_clear_field.cpp(244): warning C4101: “sign_str”: 未引用的局部变量 jd_clear_field.cpp(504): warning C4101: “err_function”: 未引用的局部变量 jd_clear_field.cpp(504): warning C4101: “err_string”: 未引用的局部变量 - jd_complate_first_task.cpp -e:\work\vs_workspace\jditk\hezon_itk\epm_handler_common.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 -E:\work\include12_2\pom/pom/pom.h(806): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 -E:\work\include12_2\pom/pom/pom.h(5417): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 jd_schedule_joint.cpp e:\work\vs_workspace\jditk\hezon_itk\epm_handler_common.h : warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 E:\work\include12_2\pom/pom/pom.h(806): warning C4819: 该文件包含不能在当前代码页(936)中表示的字符。请将该文件保存为 Unicode 格式以防止数据丢失 diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog index eb2e3c9..9f3de78 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.command.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog index 03f9c8d..b2bee6d 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.read.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog index e21af49..699eb93 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/CL.write.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog index d5bf94b..c1b2d9d 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.command.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog index 76e1e04..10e759e 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.read.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog index 72dedff..7b79860 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/link.write.1.tlog differ diff --git a/HEZON_ITK/x64/Release/vc140.pdb b/HEZON_ITK/x64/Release/vc140.pdb index ce093c5..e5a9ace 100644 Binary files a/HEZON_ITK/x64/Release/vc140.pdb and b/HEZON_ITK/x64/Release/vc140.pdb differ diff --git a/x64/Release/HEZON_ITK.pdb b/x64/Release/HEZON_ITK.pdb index f018cc2..44480a7 100644 Binary files a/x64/Release/HEZON_ITK.pdb and b/x64/Release/HEZON_ITK.pdb differ diff --git a/x64/Release/bs.exp b/x64/Release/bs.exp index fb00b2c..ae68178 100644 Binary files a/x64/Release/bs.exp and b/x64/Release/bs.exp differ