Przeglądaj źródła

Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

cxs 1 rok temu
rodzic
commit
79bbef688e

+ 3 - 0
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -29,6 +29,8 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -115,6 +117,7 @@
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

+ 6 - 0
OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp

@@ -641,6 +641,12 @@ namespace OTSClassifyEngine
 			a_GrpId = IDENTIFIED_INC_GRP_ID::OXIDE;
 			return true;
 		}
+		if (stdName.CompareNoCase(SILICATE_STR) == 0)
+		{
+
+			a_GrpId = IDENTIFIED_INC_GRP_ID::OXIDE;
+			return true;
+		}
 
 		for (long i = 0; i < INC_NITR_SUB_ELEMENT_MAX; i++)
 		{