diff --git a/.gitignore b/.gitignore
index f209ca6..3079a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -367,3 +367,5 @@ ASALocalRun/
.localhistory/
HEZON_ITK/x64/
+HEZON_ITK/HEZON_ITK.vcxproj
+HEZON_ITK/HEZON_ITK.vcxproj.filters
diff --git a/HEZON_ITK/HEZON_ITK.vcxproj b/HEZON_ITK/HEZON_ITK.vcxproj
deleted file mode 100644
index 5268d02..0000000
--- a/HEZON_ITK/HEZON_ITK.vcxproj
+++ /dev/null
@@ -1,198 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Debug
- x64
-
-
- Release
- Win32
-
-
- Release
- x64
-
-
-
- {8E665218-4AC2-4DDD-A50E-4245BA64C3C3}
- Win32Proj
- HEZON_ITK
- 8.1
-
-
-
- Application
- true
- Unicode
- v140
-
-
- Application
- true
- Unicode
- v140
-
-
- Application
- false
- true
- Unicode
- v140
-
-
- DynamicLibrary
- false
- false
- Unicode
- false
- v140
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- true
-
-
- false
-
-
- false
-
-
-
- Use
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
-
-
-
-
- Use
- Level3
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
-
-
-
-
- Level3
- Use
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
-
-
- Console
- true
- true
- true
-
-
-
-
- Level3
- NotUsing
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;IPLIB=none;%(PreprocessorDefinitions)
- %(AdditionalIncludeDirectories)
- Cdecl
-
-
- Console
- true
- true
- true
- Ws2_32.lib;%(AdditionalDependencies)
- libuser_exits.ar.lib;%(IgnoreSpecificDefaultLibraries)
- $(OutDir)\bs.dll
- /FORCE %(AdditionalOptions)
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
-
-
\ No newline at end of file
diff --git a/HEZON_ITK/HEZON_ITK.vcxproj.filters b/HEZON_ITK/HEZON_ITK.vcxproj.filters
deleted file mode 100644
index f81cfcf..0000000
--- a/HEZON_ITK/HEZON_ITK.vcxproj.filters
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hpp;hxx;hm;inl;inc;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
- {d25e0aa0-8791-4277-b392-abc3943f925c}
-
-
- {f8d4fa90-4363-4e0f-8f44-a2e02a224ad9}
-
-
- {5f8496b0-ad7e-4c6c-b832-59575601b9f1}
-
-
- {aa5fbb6b-b5ee-4f80-8b16-de99d912a542}
-
-
-
-
-
-
-
-
-
- epm-handler
-
-
- epm-handler
-
-
- common
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
- epm-handler
-
-
-
\ No newline at end of file
diff --git a/HEZON_ITK/epm_handler_common.h b/HEZON_ITK/epm_handler_common.h
index c9dfea7..24063c2 100644
--- a/HEZON_ITK/epm_handler_common.h
+++ b/HEZON_ITK/epm_handler_common.h
@@ -1,4 +1,4 @@
-/**
+/**
* @addtogroup handler
* @{
*/
@@ -32,26 +32,27 @@ extern "C" {
#define TC_specification "IMAN_specification"
-//#define NX_3W_DATASET_TYPE "UGMASTER"
-//#define NX_2W_DATASET_TYPE "UGPART"
-//#define DATASET_REF_TYPE "UGPART"
-
-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 bs_bom_check(EPM_rule_message_t msg);
-int bs_wl_check(EPM_rule_message_t msg);
-int bs_bom_save_check(METHOD_message_t *msg, va_list args);
-int bs_sign_cad(EPM_action_message_t msg);
-int jd_signoff(EPM_action_message_t msg);
-int bs_test_release_check(EPM_action_message_t msg);
-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_check_99_bomyt(EPM_rule_message_t msg);
-int jd_send_mail(EPM_action_message_t msg);
-int jd_get_target(EPM_action_message_t msg);
+ //#define NX_3W_DATASET_TYPE "UGMASTER"
+ //#define NX_2W_DATASET_TYPE "UGPART"
+ //#define DATASET_REF_TYPE "UGPART"
+
+ 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 bs_bom_check(EPM_rule_message_t msg);
+ int bs_wl_check(EPM_rule_message_t msg);
+ int bs_bom_save_check(METHOD_message_t *msg, va_list args);
+ int bs_sign_cad(EPM_action_message_t msg);
+ int jd_signoff(EPM_action_message_t msg);
+ int bs_test_release_check(EPM_action_message_t msg);
+ 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_check_99_bomyt(EPM_rule_message_t msg);
+ int jd_send_mail(EPM_action_message_t msg);
+ int jd_get_target(EPM_action_message_t msg);
+ int jd_check_wlms_len(EPM_rule_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 6b8ec6b..5bbdcdc 100644
--- a/HEZON_ITK/epm_register_handler.cxx
+++ b/HEZON_ITK/epm_register_handler.cxx
@@ -43,8 +43,7 @@ $HISTORY$
// Method and Workflow Handler
-extern DLLAPI int CUST_init_module(int *decision, va_list args)
-{
+extern DLLAPI int CUST_init_module(int *decision, va_list args) {
int ifail = ITK_ok, n = 0;
char date_buf[80], *expire_date;
time_t now;
@@ -55,76 +54,55 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args)
printf("register start\n");
ifail = EPM_register_action_handler("bs_file_transfer", "bs_file_transfer",
(EPM_action_handler_t)bs_file_transfer);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_file_transfer failed\n");
- }
- else
- {
+ } else {
printf("register bs_file_transfer successfully\n");
}
ifail = EPM_register_action_handler("bs_sap_material", "bs_sap_material",
(EPM_action_handler_t)bs_sap_material);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_sap_material failed\n");
- }
- else
- {
+ } else {
printf("register bs_sap_material successfully\n");
}
ifail = EPM_register_action_handler("bs_sap_bom", "bs_sap_bom",
(EPM_action_handler_t)bs_sap_bom);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_sap_bom failed\n");
- }
- else
- {
+ } else {
printf("register bs_sap_bom successfully\n");
}
ifail = EPM_register_rule_handler("bs_bom_check", "bs_bom_check", (EPM_rule_handler_t)bs_bom_check);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_bom_check failed\n");
- }
- else
- {
+ } else {
printf("register bs_bom_check successfully\n");
}
ifail = EPM_register_rule_handler("bs_wl_check", "bs_wl_check", (EPM_rule_handler_t)bs_wl_check);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_wl_check failed\n");
- }
- else
- {
+ } else {
printf("register bs_wl_check successfully\n");
}
ifail = EPM_register_action_handler("bs_sign_cad", "bs_sign_cad",
(EPM_action_handler_t)bs_sign_cad);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_sign_cad failed\n");
- }
- else
- {
+ } else {
printf("register bs_sign_cad successfully\n");
}
ifail = EPM_register_action_handler("bs_test_release_check", "bs_test_release_check",
(EPM_action_handler_t)bs_test_release_check);
- if (ifail)
- {
+ if (ifail) {
printf("register bs_test_release_check failed\n");
- }
- else
- {
+ } else {
printf("register bs_test_release_check successfully\n");
}
@@ -133,8 +111,7 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args)
(EPM_action_handler_t)jd_signoff);
if (ifail) {
printf("register jd_signoff failed\n");
- }
- else {
+ } else {
printf("register jd_signoff successfully\n");
}
@@ -182,6 +159,13 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args)
} else {
printf("register jd_get_target successfully\n");
}
+ ifail = EPM_register_rule_handler("jd_check_wlms_len", "jd_check_wlms_len",
+ (EPM_rule_handler_t)jd_check_wlms_len);
+ if (ifail) {
+ printf("register jd_check_wlms_len failed\n");
+ } else {
+ printf("register jd_check_wlms_len successfully\n");
+ }
//if(ifail == ITK_ok)
//{
// fprintf(stdout,"Registering action handler qtmc-sign-ir completed!\n");
@@ -196,24 +180,19 @@ extern DLLAPI int CUST_init_module(int *decision, va_list args)
}
//
////register service method
-extern DLLAPI int USERSERVICE_custom_register_methods()
-{
+extern DLLAPI int USERSERVICE_custom_register_methods() {
int status = 0;
METHOD_id_t mth_tag;
METHOD_find_method("BOMWindow", "BOMWindow_save", &mth_tag);
printf("register service\n");
- if (mth_tag.id)
- {
+ if (mth_tag.id) {
printf("register bomwindow_save\n");
status = METHOD_add_action(mth_tag, METHOD_pre_action_type, (METHOD_function_t)bs_bom_save_check, NULL);
- if (status == ITK_ok)
- {
+ if (status == ITK_ok) {
printf("register bomwindow_save success\n");
- }
- else
- {
+ } else {
printf("register bomwindow_save failed\n");
}
diff --git a/HEZON_ITK/jd_add_attachments.cpp b/HEZON_ITK/jd_add_attachments.cpp
index 8b299c7..f003070 100644
--- a/HEZON_ITK/jd_add_attachments.cpp
+++ b/HEZON_ITK/jd_add_attachments.cpp
@@ -70,6 +70,7 @@ int jd_add_attachments(EPM_action_message_t msg) {
char *temp_key, *temp_val;
ITK_ask_argument_named_value(TC_next_argument(arguments), &temp_key, &temp_val);
paras[temp_key] = temp_val;
+ cout << temp_key << endl;
}
const char *relation = paras["relation"].c_str();
const char *item = paras["item"].c_str();
diff --git a/HEZON_ITK/jd_batch_process.cpp b/HEZON_ITK/jd_batch_process.cpp
index 4ca4989..d9d25d5 100644
--- a/HEZON_ITK/jd_batch_process.cpp
+++ b/HEZON_ITK/jd_batch_process.cpp
@@ -1,59 +1,5 @@
#include "HTTPRequest.hpp"
-#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