瀏覽代碼

修改报告模版

cxs 1 年之前
父節點
當前提交
fd99454797

+ 7 - 3
Bin/x64/Debug/Config/ConfigTemplate/BatteryCleannessA/ReportTemplateConfig.xml

@@ -28,7 +28,10 @@
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <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>
+    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -108,13 +111,14 @@
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <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>

+ 7 - 3
Bin/x64/Debug/Config/ConfigTemplate/CleannessA/ReportTemplateConfig.xml

@@ -28,7 +28,10 @@
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <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>
+    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -108,13 +111,14 @@
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </str_kllb_qcys>
+    <str_kllb_qcys>C</str_kllb_qcys>
     <str_kllb_DeleteClass>misc</str_kllb_DeleteClass>
     <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>

+ 18 - 13
Bin/x64/Debug/Config/ConfigTemplate/IncA/ReportTemplateConfig.xml

@@ -1,10 +1,9 @@
 <XmlConfig>
   <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_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB30834</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
     <str_bz>
@@ -28,10 +27,13 @@
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <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>
+    <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
+    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>
   <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_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>
@@ -60,7 +62,7 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <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_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
@@ -108,19 +110,22 @@
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
     <b_ck_kllb_fjzt>True</b_ck_kllb_fjzt>
     <list_str_kllb_qcys>
+      <YS0>C</YS0>
+      <YS1>Fe</YS1>
     </list_str_kllb_qcys>
-    <str_kllb_qcys>
-    </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>
-      <YS0>misc</YS0>
+      <YS0>FeO</YS0>
+      <YS1>SiC</YS1>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>20</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>
   </M_address>
   <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>
 </XmlConfig>

+ 0 - 1
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -879,7 +879,6 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>