diff --git a/HEZON_ITK.VC.db b/HEZON_ITK.VC.db index 5ed112b..d6c7231 100644 Binary files a/HEZON_ITK.VC.db and b/HEZON_ITK.VC.db differ diff --git a/HEZON_ITK/epm_handler_common.h b/HEZON_ITK/epm_handler_common.h index f3e1c3b..3332eb1 100644 --- a/HEZON_ITK/epm_handler_common.h +++ b/HEZON_ITK/epm_handler_common.h @@ -39,6 +39,7 @@ extern "C" { int bs_file_transfer(EPM_action_message_t msg); int bs_sap_material(EPM_action_message_t msg); int bs_sap_bom(EPM_action_message_t msg); +int jd_signoff(EPM_action_message_t msg); diff --git a/HEZON_ITK/epm_register_handler.cxx b/HEZON_ITK/epm_register_handler.cxx index e8db291..62757f6 100644 --- a/HEZON_ITK/epm_register_handler.cxx +++ b/HEZON_ITK/epm_register_handler.cxx @@ -59,6 +59,8 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args) (EPM_action_handler_t)bs_sap_material); ifail = EPM_register_action_handler("bs_sap_bom", "bs_sap_bom", (EPM_action_handler_t)bs_sap_bom); + ifail = EPM_register_action_handler("jd_signoff", "jd_signoff", + (EPM_action_handler_t)jd_signoff); //if(ifail == ITK_ok) //{ diff --git a/HEZON_ITK/jd_signoff.cpp b/HEZON_ITK/jd_signoff.cpp index a9964f1..7df1c37 100644 --- a/HEZON_ITK/jd_signoff.cpp +++ b/HEZON_ITK/jd_signoff.cpp @@ -72,11 +72,12 @@ int jd_signoff(EPM_action_message_t msg) { time(&t); tm* time = localtime(&t); stringstream date; - date << time->tm_year + 1900; - date << time->tm_mon + 1; + date << time->tm_year + 1900 << "-"; + date << time->tm_mon + 1 << "-"; date << time->tm_mday; POM_AM__set_application_bypass(true); + //获取当前用户 POM_get_user(&user_name, &user_tag); @@ -96,6 +97,10 @@ int jd_signoff(EPM_action_message_t msg) { paras[temp_key] = temp_val; } step = paras["step"].c_str()[0]; + + printf("%d\n", step); + printf("%s\n", user_name); + printf("%s\n", date.str().c_str()); for (auto ii = 0; ii < att_count; ii++) { ITEM_list_rev_attachs_of_type(attachments[ii], ITEM_item_master_atth, &objects_count, &objects); @@ -134,6 +139,7 @@ int jd_signoff(EPM_action_message_t msg) { } } } + POM_AM__set_application_bypass(false); return 0; } \ No newline at end of file diff --git a/HEZON_ITK/x64/Release/.NETFramework,Version=v4.0.AssemblyAttributes.asm b/HEZON_ITK/x64/Release/.NETFramework,Version=v4.0.AssemblyAttributes.asm index 783245d..f924cf7 100644 --- a/HEZON_ITK/x64/Release/.NETFramework,Version=v4.0.AssemblyAttributes.asm +++ b/HEZON_ITK/x64/Release/.NETFramework,Version=v4.0.AssemblyAttributes.asm @@ -1,4 +1,4 @@ -; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.24210.0 +; Listing generated by Microsoft (R) Optimizing Compiler Version 19.00.24215.1 ; Generated by VC++ for Common Language Runtime -.file "C:\Users\lyf\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cpp" +.file "C:\Users\5rKB5bPlusD\AppData\Local\Temp\.NETFramework,Version=v4.0.AssemblyAttributes.cpp" diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.log b/HEZON_ITK/x64/Release/HEZON_ITK.log index cae2d83..f17eaa5 100644 --- a/HEZON_ITK/x64/Release/HEZON_ITK.log +++ b/HEZON_ITK/x64/Release/HEZON_ITK.log @@ -1,17 +1,14 @@ -锘 bs_sap.cpp -C:\Users\lyf\Documents\tclib\tc12\include\pom/pom/pom.h(816): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\Users\lyf\Documents\tclib\tc12\include\pom/pom/pom.h(5420): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\Users\lyf\Documents\tclib\tc12\include\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -C:\Users\lyf\Documents\tclib\tc12\include\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 -bs_sap.cpp(85): warning C4267: 鈥滃垵濮嬪寲鈥: 浠庘渟ize_t鈥濊浆鎹㈠埌鈥渋nt鈥濓紝鍙兘涓㈠け鏁版嵁 -bs_sap.cpp(100): warning C4101: 鈥渙bj_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -bs_sap.cpp(240): warning C4101: 鈥渙bj_type鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -bs_sap.cpp(272): warning C4101: 鈥渓ines鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -bs_sap.cpp(270): warning C4101: 鈥渓ine_cnt鈥: 鏈紩鐢ㄧ殑灞閮ㄥ彉閲 -C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(1189,5): warning MSB8012: TargetPath(C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\HEZON_ITK.dll) does not match the Linker's OutputFile property value (C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\bs.dll). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). +锘 jd_signoff.cpp +C:\work\include12_1\pom/pom/pom.h(816): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\pom/pom/pom.h(5420): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +C:\work\include12_1\qry/qry.h(591): warning C4819: 璇ユ枃浠跺寘鍚笉鑳藉湪褰撳墠浠ｇ爜椤(936)涓〃绀虹殑瀛楃銆傝灏嗚鏂囦欢淇濆瓨涓 Unicode 鏍煎紡浠ラ槻姝㈡暟鎹涪澶 +jd_signoff.cpp(73): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details. + C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt\time.h(505): note: 鍙傝鈥渓ocaltime鈥濈殑澹版槑 +C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(1189,5): warning MSB8012: TargetPath(C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.dll) does not match the Linker's OutputFile property value (C:\work\vs_workspace\jditk\x64\Release\bs.dll). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(1191,5): warning MSB8012: TargetName(HEZON_ITK) does not match the Linker's OutputFile property value (bs). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). MSVCRT.lib(default_local_stdio_options.obj) : warning LNK4006: __local_stdio_printf_options 宸插湪 libassy_jt.lib(libassy_jt.dll) 涓畾涔夛紱宸插拷鐣ョ浜屼釜瀹氫箟 - 姝ｅ湪鍒涘缓搴 C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\\bs.lib 鍜屽璞 C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\\bs.exp -C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\\bs.dll : warning LNK4088: 鍥 /FORCE 閫夐」鐢熸垚浜嗘槧鍍忥紱鏄犲儚鍙兘涓嶈兘杩愯 - HEZON_ITK.vcxproj -> C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\HEZON_ITK.dll - HEZON_ITK.vcxproj -> C:\Users\lyf\Documents\code\dk\HEZON_ITK\x64\Release\HEZON_ITK.pdb (Full PDB) + 姝ｅ湪鍒涘缓搴 C:\work\vs_workspace\jditk\x64\Release\\bs.lib 鍜屽璞 C:\work\vs_workspace\jditk\x64\Release\\bs.exp +C:\work\vs_workspace\jditk\x64\Release\\bs.dll : warning LNK4088: 鍥 /FORCE 閫夐」鐢熸垚浜嗘槧鍍忥紱鏄犲儚鍙兘涓嶈兘杩愯 + HEZON_ITK.vcxproj -> C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.dll + HEZON_ITK.vcxproj -> C:\work\vs_workspace\jditk\x64\Release\HEZON_ITK.pdb (Full PDB) 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 01164a2..977e356 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 3d709df..800f45f 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 3afb927..cadd11c 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/HEZON_ITK.lastbuildstate b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.lastbuildstate index bbd4578..40d650d 100644 --- a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.lastbuildstate +++ b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.lastbuildstate @@ -1,2 +1,2 @@ #TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=true:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 -Release|x64|C:\Users\lyf\Documents\code\dk\HEZON_ITK\| +Release|x64|C:\work\vs_workspace\jditk\| diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.write.1u.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.write.1u.tlog index 76a75e0..46b134b 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.write.1u.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/HEZON_ITK.write.1u.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 8dce240..5b36a75 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 3cc75cd..4552491 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 c593770..4460f59 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/HEZON_ITK.tlog/metagen.read.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.read.1.tlog index 98364f4..4b2611d 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.read.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.read.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.write.1.tlog b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.write.1.tlog index 3fdb089..b11839e 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.write.1.tlog and b/HEZON_ITK/x64/Release/HEZON_ITK.tlog/metagen.write.1.tlog differ diff --git a/HEZON_ITK/x64/Release/HEZON_ITK.vcxprojResolveAssemblyReference.cache b/HEZON_ITK/x64/Release/HEZON_ITK.vcxprojResolveAssemblyReference.cache index a8e2423..a28f1dc 100644 Binary files a/HEZON_ITK/x64/Release/HEZON_ITK.vcxprojResolveAssemblyReference.cache and b/HEZON_ITK/x64/Release/HEZON_ITK.vcxprojResolveAssemblyReference.cache differ diff --git a/HEZON_ITK/x64/Release/vc140.pdb b/HEZON_ITK/x64/Release/vc140.pdb index 560b262..09e01a2 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 56656e1..af88422 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 0a0e012..167cc16 100644 Binary files a/x64/Release/bs.exp and b/x64/Release/bs.exp differ