Merge remote-tracking branch 'refs/remotes/origin/master'

HEZON_ITK/bs_sap.cpp

@@ -38,7 +38,9 @@ int bs_sap_material(EPM_action_message_t msg)
 
 		}
 	}
+
 	PREF_ask_char_values("connor_sap", &pref_cnt, &pref_vals);
+
 	split(pref_vals[4], ",", &rel_vec);
 	for(int i=0;i<rel_vec.size();i++)
 	{
@@ -49,6 +51,7 @@ int bs_sap_material(EPM_action_message_t msg)
 			rel_map[temp_vec[0]] = temp_vec[1];
 		}
 	}
+
 	split(pref_vals[5], ",", &rel_vec);
 
 	for (int i = 0; i<rel_vec.size(); i++)
@@ -60,6 +63,7 @@ int bs_sap_material(EPM_action_message_t msg)
 			prop_map[temp_vec[0]] = temp_vec[1];
 		}
 	}
+
 	GRM_find_relation_type("IMAN_master_form", &relation_type);
 	printf("create class\n");
 	Testclass ^test = gcnew Testclass();
@@ -140,7 +144,12 @@ int bs_sap_material(EPM_action_message_t msg)
 			dic["KLART"] = "001";
 			string result = ConvertToString(test->send_material(url, user, password, dic));
 			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());
 
+				return 1;
+			}
 
 		}
 	}
@@ -234,7 +243,12 @@ int bs_sap_bom(EPM_action_message_t msg)
 			get_bom(a_list, top_line, werks, stlan);
 			string result = ConvertToString(test->send_bom(url, user, password, a_list));
 			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());
 
+				return 1;
+			}
 		}
 	}
 	BOM_close_window(win);