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

# Conflicts:
#	HEZON_ITK/bs_sap.cpp

HEZON_ITK/bs_sap.cpp

@@ -214,8 +214,8 @@ void get_bom(System::Collections::Generic::List<System::Collections::Generic::Di
 			AOM_ask_value_string(lines[j], "JD2_sl", &val);
 			quantity = val;
 			int index = quantity.find('.');
-			if (index != -1 && quantity.length() > (index + 3)) {
+			if(index!=-1&&quantity.length()>(index + 4))
-				quantity = quantity.substr(0, index + 3);
+			{				quantity = quantity.substr(0,index + 4);
 			}
 		} else {
 			AOM_ask_value_string(lines[j], "bl_quantity", &val);