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

HEZON_ITK/bs_sap.cpp

@@ -176,7 +176,7 @@ void get_bom(System::Collections::Generic::List<System::Collections::Generic::Di
 		pid = pid.length() > 0 ? pid : id;
 		int index = pid.find('-');
 		if (index != -1)
-			pid = pid.substr(index + 1);
+			pid = pid.substr(0,index);
 	}
 	for (int j = 0; j < line_cnt; j++) {
 		System::Collections::Generic::Dictionary<String^, String^> ^dic = gcnew System::Collections::Generic::Dictionary<String^, String^>();