From 5b10ba7a0d9f9981ef82725283630d051115a148 Mon Sep 17 00:00:00 2001 From: liyf Date: Fri, 3 Jan 2020 11:34:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9sap=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- HEZON_ITK/bs_sap.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3011152..f8e5cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -365,4 +365,5 @@ ASALocalRun/ .mfractor/ # Local History for Visual Studio -.localhistory/ \ No newline at end of file +.localhistory/ +HEZON_ITK/HEZON_ITK.vcxproj diff --git a/HEZON_ITK/bs_sap.cpp b/HEZON_ITK/bs_sap.cpp index a45e047..b0ef151 100644 --- a/HEZON_ITK/bs_sap.cpp +++ b/HEZON_ITK/bs_sap.cpp @@ -51,13 +51,13 @@ int bs_sap_material(EPM_action_message_t msg) rel_map[temp_vec[0]] = temp_vec[1]; } } + vector rel_vec2; + split(pref_vals[5], ",", &rel_vec2); - split(pref_vals[5], ",", &rel_vec); - - for (int i = 0; i temp_vec; - split(rel_vec[i], "=", &temp_vec); + split(rel_vec2[i], "=", &temp_vec); if (temp_vec.size() == 2) { prop_map[temp_vec[0]] = temp_vec[1]; @@ -119,7 +119,7 @@ int bs_sap_material(EPM_action_message_t msg) AOM_UIF_ask_value(rels[0], j->second.c_str(), &val); temp_val = val; } - + printf("key:%s\n", j->first.c_str()); dic[convert_to_cstring(j->first.c_str())] = convert_to_cstring(temp_val.c_str()); } tag_t class_obj; From 289c91a45f386b09be834e468165379e8a73c608 Mon Sep 17 00:00:00 2001 From: liyf Date: Fri, 3 Jan 2020 15:32:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?sap=E4=BC=A0=E9=80=92=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HEZON_ITK/bs_sap.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/HEZON_ITK/bs_sap.cpp b/HEZON_ITK/bs_sap.cpp index b0ef151..c7b0694 100644 --- a/HEZON_ITK/bs_sap.cpp +++ b/HEZON_ITK/bs_sap.cpp @@ -87,7 +87,6 @@ int bs_sap_material(EPM_action_message_t msg) // prop_map["NTGEW"] = "jd2_jz"; // prop_map["GEWEI"] = "jd2_zldw"; // prop_map["CLASS"] = "jd2_wllx"; - vector vec{ "jd2_wllx","item_id","jd2_wlms","jd2_jldw","jd2_wlz","jd2_cppc","jd2_wbwlz","release_status_list","jd2_tj","jd2_tjdw","jd2_jwlh","jd2_th","jd2_mz","jd2_jz","jd2_zldw" }; printf("start111\n"); for (int i = 0; i < att_count; i++) { @@ -103,7 +102,7 @@ int bs_sap_material(EPM_action_message_t msg) string temp_val; if (j->second == "item_id") { - AOM_UIF_ask_value(attachments[i], j->second.c_str(), &val); + AOM_ask_value_string(attachments[i], j->second.c_str(), &val); temp_val = val; } else if (j->second == "release_status_list") { @@ -116,10 +115,14 @@ int bs_sap_material(EPM_action_message_t msg) } else { - AOM_UIF_ask_value(rels[0], j->second.c_str(), &val); + tag_t lov; + AOM_ask_lov(rels[0], j->second.c_str(), &lov); + if (lov) + AOM_ask_value_string(rels[0], j->second.c_str(), &val); + else + AOM_UIF_ask_value(rels[0], j->second.c_str(), &val); temp_val = val; } - printf("key:%s\n", j->first.c_str()); dic[convert_to_cstring(j->first.c_str())] = convert_to_cstring(temp_val.c_str()); } tag_t class_obj; From 641238ca064c0e49d2b14e014493c0190f72a250 Mon Sep 17 00:00:00 2001 From: liyf Date: Wed, 8 Jan 2020 15:50:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?sap=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HEZON_ITK/bs_sap.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/HEZON_ITK/bs_sap.cpp b/HEZON_ITK/bs_sap.cpp index c7b0694..c5e3d77 100644 --- a/HEZON_ITK/bs_sap.cpp +++ b/HEZON_ITK/bs_sap.cpp @@ -1,4 +1,5 @@ #include "util.h" + int bs_sap_material(EPM_action_message_t msg) { printf("start sap material\n"); @@ -108,10 +109,14 @@ int bs_sap_material(EPM_action_message_t msg) else if (j->second == "release_status_list") { int status_cnt; tag_t *rel_status; - AOM_ask_value_tags(attachments[i], j->second.c_str(), &status_cnt, &rel_status); + AOM_ask_value_tags(rels[0], j->second.c_str(), &status_cnt, &rel_status); if (status_cnt) AOM_UIF_ask_value(rel_status[status_cnt - 1], "object_string", &val); temp_val = rel_map[val]; + }else if(j->second=="jd2_dldw") + { + AOM_UIF_ask_value(rels[0], j->second.c_str(), &val); + temp_val = val; } else { @@ -149,7 +154,11 @@ int bs_sap_material(EPM_action_message_t msg) printf("result:%s\n", result.c_str()); if(result.length()&&result[0]=='E') { - EMH_store_error_s1(EMH_severity_error, EMH_ATTR_error_base, result.c_str()); + char *val; + AOM_ask_value_string(attachments[i], "item_id", &val); + stringstream err; + err << val << " ·¢ËÍ´íÎó:" << result; + EMH_store_error_s1(EMH_severity_error, EMH_ATTR_error_base, err.str().c_str()); return 1; }