Browse Source

更新报告程序

zhangjiaxin 1 year ago
parent
commit
546e130519

+ 12 - 11
Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
 <XmlConfig>
   <M_SY>
   <M_SY>
-    <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>宁德时代</str_tb_FBT>
+    <str_tb_ZBT>OTS Report</str_tb_ZBT>
+    <str_tb_FBT>XX有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
     <str_bz>
@@ -34,7 +33,7 @@
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   </M_KLFXJG>
   <M_YSFXJG>
   <M_YSFXJG>
-    <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
+    <b_ck_ysfx_xsmk>True</b_ck_ysfx_xsmk>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_yxfx_jsfs>0</index_cb_yxfx_jsfs>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <index_cb_ysfx_klfw>0</index_cb_ysfx_klfw>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
     <str_tb_ysfx_xsys>Al,Si,C,S,N,O,Fe,Ti,Mn,Mg,Ca,Ce,La</str_tb_ysfx_xsys>
@@ -63,7 +62,7 @@
     </list_str_tb_yscf_ysxx>
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   </M_YSFXJG>
   <M_SYXT>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
@@ -112,11 +111,13 @@
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
     <list_str_kllb_qcys>
       <YS0>C</YS0>
       <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>C</str_kllb_qcys>
-    <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
+    <str_kllb_qcys>C,Fe</str_kllb_qcys>
+    <str_kllb_DeleteClass>FeO,SiC</str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
     <list_str_kllb_DeleteClass>
-      <YS0>misc</YS0>
+      <YS0>FeO</YS0>
+      <YS1>SiC</YS1>
     </list_str_kllb_DeleteClass>
     </list_str_kllb_DeleteClass>
     <list_int_kllb_number>20</list_int_kllb_number>
     <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   </M_KLLBXX>
@@ -124,7 +125,7 @@
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   </M_address>
   <M_JZWZB>
   <M_JZWZB>
-    <b_ck_surface>False</b_ck_surface>
-    <b_ck_chart>False</b_ck_chart>
+    <b_ck_surface>True</b_ck_surface>
+    <b_ck_chart>True</b_ck_chart>
   </M_JZWZB>
   </M_JZWZB>
 </XmlConfig>
 </XmlConfig>

+ 26 - 2
Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
   <Collection RegName="Stagelist">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -54,7 +54,7 @@
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
         <Member HoleName="7" rectDomian="-23000,0,15000,0" shape="0" />
       </Collection>
       </Collection>
     </Member>
     </Member>
-    <Member strName="Apero12_90">
+    <Member strName="Apero90mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,90000,90000" shape="1:RECTANGLE" />
       <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
       <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
       <Collection RegName="Holes">
       <Collection RegName="Holes">
@@ -78,5 +78,29 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
       </Collection>
       </Collection>
     </Member>
     </Member>
+    <Member strName="Apero">
+      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,130000,120000" shape="1:RECTANGLE" />
+      <Member RegName="std" PolygonPoint="" rectDomian="6300,0,2,0" shape="0:ROUND" />
+      <Collection RegName="Holes">
+        <Member HoleName="9" rectDomian="0,0,10000,0" shape="0" />
+        <Member HoleName="2" rectDomian="0,25000,10000,0" shape="0" />
+        <Member HoleName="3" rectDomian="-15000,25000,10000,0" shape="0" />
+        <Member HoleName="1" rectDomian="15000,25500,10000,0" shape="0" />
+        <Member HoleName="4" rectDomian="22000,13000,10000,0" shape="0" />
+        <Member HoleName="5" rectDomian="7000,13000,10000,0" shape="0" />
+        <Member HoleName="6" rectDomian="-7500,13000,10000,0" shape="0" />
+        <Member HoleName="7" rectDomian="-22500,13000,10000,0" shape="0" />
+        <Member HoleName="8" rectDomian="14000,0,10000,0" shape="0" />
+        <Member HoleName="10" rectDomian="-15000,0,10000,0" shape="0" />
+        <Member HoleName="11" rectDomian="-30000,0,10000,0" shape="0" />
+        <Member HoleName="12" rectDomian="22000,-12500,10000,0" shape="0" />
+        <Member HoleName="13" rectDomian="7000,-12500,10000,0" shape="0" />
+        <Member HoleName="14" rectDomian="-7500,-12500,10000,0" shape="0" />
+        <Member HoleName="15" rectDomian="-22500,-12500,10000,0" shape="0" />
+        <Member HoleName="16" rectDomian="14500,-24500,10000,0" shape="0" />
+        <Member HoleName="17" rectDomian="-500,-24500,10000,0" shape="0" />
+        <Member HoleName="18" rectDomian="-14500,-24500,10000,0" shape="0" />
+      </Collection>
+    </Member>
   </Collection>
   </Collection>
 </XMLData>
 </XMLData>