Merge branch 'master' of http://plmserver.cn:3000/jd/itk into zxk

.gitignore

@@ -365,4 +365,5 @@ ASALocalRun/
 .mfractor/
 
 # Local History for Visual Studio
-.localhistory/
+.localhistory/
+HEZON_ITK/HEZON_ITK.vcxproj

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");
@@ -51,13 +52,13 @@ int bs_sap_material(EPM_action_message_t msg)
 			rel_map[temp_vec[0]] = temp_vec[1];
 		}
 	}
+	vector<string> rel_vec2;
+	split(pref_vals[5], ",", &rel_vec2);
 
-	split(pref_vals[5], ",", &rel_vec);
-
-	for (int i = 0; i<rel_vec.size(); i++)
+	for (int i = 0; i<rel_vec2.size(); i++)
 	{
 		vector<string> 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];
@@ -87,7 +88,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<string> 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,23 +103,31 @@ 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") {
 					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
 				{
-					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;
 				}
-				
 				dic[convert_to_cstring(j->first.c_str())] = convert_to_cstring(temp_val.c_str());
 			}
 			tag_t class_obj;
@@ -146,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;
 			}