From 8b6825c116e6b487b3313e117d782053458d7f6a Mon Sep 17 00:00:00 2001 From: zouxk Date: Sun, 26 Apr 2020 09:32:39 +0800 Subject: [PATCH] 4/26 --- HEZON_ITK/HEZON_ITK.vcxproj | 5 +- HEZON_ITK/HEZON_ITK.vcxproj.filters | 3 - HEZON_ITK/epm_handler_common.h | 1 - HEZON_ITK/epm_register_handler.cxx | 8 -- HEZON_ITK/jd_complate_first_task.cpp | 83 ------------------ .../x64/Release/HEZON_ITK.Build.CppClean.log | 1 + HEZON_ITK/x64/Release/HEZON_ITK.log | 10 +-- .../Release/HEZON_ITK.tlog/CL.command.1.tlog | Bin 29164 -> 26750 bytes .../x64/Release/HEZON_ITK.tlog/CL.read.1.tlog | Bin 805346 -> 760074 bytes .../Release/HEZON_ITK.tlog/CL.write.1.tlog | Bin 9554 -> 9020 bytes .../HEZON_ITK.tlog/link.command.1.tlog | Bin 4996 -> 4690 bytes .../Release/HEZON_ITK.tlog/link.read.1.tlog | Bin 28830 -> 28524 bytes .../Release/HEZON_ITK.tlog/link.write.1.tlog | Bin 2846 -> 2694 bytes HEZON_ITK/x64/Release/vc140.pdb | Bin 1773568 -> 1748992 bytes x64/Release/HEZON_ITK.pdb | Bin 4698112 -> 4444160 bytes x64/Release/bs.exp | Bin 1127 -> 1127 bytes 16 files changed, 6 insertions(+), 105 deletions(-) delete mode 100644 HEZON_ITK/jd_complate_first_task.cpp 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 eb2e3c9628f304f15af00d3dd42a3645a272cbd1..9f3de7854c23541a36068e30b9ded6b76334d51c 100644 GIT binary patch delta 266 zcmaF!nDO5Q#tA)}6%0*SC%(cME<+ z3Oo{%=Lt^2ujqrI+GIc3kjeMNweTo>%!)_Smv!<34YtVw%CiV5+J;8~(Az$m29xix z22J+SHzS}>Uk0eqXR@5BA0CCStUv`Olh0Z8;ZX#%c7nqWoC*vb+1YSPD!Tv29WI8B zK%+x~N>rVJ@$AbGz~IB+2#jr4U@W^acrpY*<30o^8qDB5`JuQvPJ2K`DHCDL7p?Q^7}ZVCc5RiA?^MdY5)KL 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 03f9c8de071927125a5dffe37a99a182468d416d..b2bee6db8ff99e832bd67d55f229a59e16a03221 100644 GIT binary patch delta 41 vcmaDf*|2MqUPB9G3sVbo3rh=Y3tJ0&3&$4DzJ~TRLoOiZ-kxU2QzHQYJC_aL delta 91 zcmeC$r1xmDVM7aJ3sVbo3rh=Y3tJ0&3&$4Dz6Moi27d-$h5!a121kYv23Ll71~&#z qh9HJuATJ(>9f2(G?SlUq53k)Wvx?&bQ+rCPMS(K+f|bMA{R`-a7e!T*zb#PMOIQ*w`jVvDa)qAXmcz E0LsQD$N&HU 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 d5bf94bc49e20ef7d36075097d9e36e05e6a7e6e..c1b2d9d632d73f6978fe9392f910283eebdb2b6f 100644 GIT binary patch delta 41 xcmZoszofEZ0mo(w&K-=K?YMuiO}5}vnass6G5G+e%w#zMiOCLJ0+X49n*c4G48;Hd delta 188 zcmcbl(xSd$0f(|PgFk~WLjZ#hgCj!-gDXQkgByb$B%L&NxhZLh^x 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 76e1e04739185bc792667fe264bcdf6517046f39..10e759e1942e6797d0ff7b76aada4d96c61908f8 100644 GIT binary patch delta 30 mcmbRDknznu#tjQN7F%$}Ot#=unS3HPZSnz5navexYFq%%!wfS3 delta 104 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