李扬

master/src/main/java/com/ruoyi/project/sems/controller/TMeasureThicknessController.java

@@ -252,7 +252,8 @@ public class TMeasureThicknessController extends BaseController
             }
             map.put("result", result);
             logger.info("result:" + result);
-            PDFTemplateUtil.exportPdf("measureFMaker.ftl", "腐蚀测厚表单.pdf","file:/"+RuoYiConfig.getProfile(), map, response);
+            String name = measureThicknessEntity.getPlantCode() +"-" +measureThicknessEntity.getTagno() + "-" + measureThicknessEntity.getPosition();
+            PDFTemplateUtil.exportPdf("measureFMaker.ftl", name + ".pdf","file:/"+RuoYiConfig.getProfile(), map, response);
         } catch (Exception e) {
             e.printStackTrace();
         }finally {

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlgdController.java

@@ -186,7 +186,14 @@ public class TReportHiYlgdController extends BaseController {
                 map.put("approveUser", htiLists.get(4).getName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
-            PDFTemplateUtil.exportPdf("yearYlgdFMaker.ftl", "压力管道年度检查报告.pdf", "file:/" + RuoYiConfig.getProfile(), map, response);
+            String pdfName = reportHiYlgd.getPlantCode()
+                    + "-" + sdf.format(reportHiYlgd.getCheckDate())
+                    + "-" + reportHiYlgd.getDevno()
+                    + "-压力管道年度检查报告.pdf"
+                    .replace(" ", "")
+                    .replace("\\s", "")
+                    .replace("\n", "");
+            PDFTemplateUtil.exportPdf("yearYlgdFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -272,11 +279,9 @@ public class TReportHiYlgdController extends BaseController {
                 }
                 //多个文件区分文件名
                 String pdfName = tReportHiYlgd.getPlantCode()
-                        + "-" + tReportHiYlgd.getUnit()
-                        + "-" + tReportHiYlgd.getDevno()
-                        + "-" + tReportHiYlgd.getDevname()
                         + "-" + sdf.format(tReportHiYlgd.getCheckDate())
-                        + "-压力容器年度检查报告.pdf"
+                        + "-" + tReportHiYlgd.getDevno()
+                        + "-压力管道年度检查报告.pdf"
                         .replace(" ", "")
                         .replace("\\s", "")
                         .replace("\n", "");

master/src/main/java/com/ruoyi/project/sems/controller/TReportHiYlrqController.java

@@ -187,7 +187,14 @@ public class TReportHiYlrqController extends BaseController {
                 map.put("approveUser", htiLists.get(4).getName());
                 map.put("approveEndTime", sdf2.format(htiLists.get(4).getEndTime()));
             }
-            PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", "压力容器年度检查报告.pdf", "file:/" + RuoYiConfig.getProfile(), map, response);
+            String pdfName = reportYlrq.getPlantCode()
+                    + "-" + sdf.format(reportYlrq.getCheckDate())
+                    + "-" + reportYlrq.getDevno()
+                    + "-压力容器年度检查报告.pdf"
+                    .replace(" ", "")
+                    .replace("\\s", "")
+                    .replace("\n", "");
+            PDFTemplateUtil.exportPdf("yearYlrqFMaker.ftl", pdfName, "file:/" + RuoYiConfig.getProfile(), map, response);
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -273,10 +280,8 @@ public class TReportHiYlrqController extends BaseController {
                 }
                 //多个文件区分文件名
                 String pdfName = tReportHiYlrq.getPlantCode()
-                        + "-" + tReportHiYlrq.getUnit()
-                        + "-" + tReportHiYlrq.getDevno()
-                        + "-" + tReportHiYlrq.getDevname()
                         + "-" + sdf.format(tReportHiYlrq.getCheckDate())
+                        + "-" + tReportHiYlrq.getDevno()
                         + "-压力容器年度检查报告.pdf"
                         .replace(" ", "")
                         .replace("\\s", "")

master/src/main/java/com/ruoyi/project/sems/domain/TMeasureThickness.java

@@ -31,7 +31,7 @@ public class TMeasureThickness extends BaseEntity
     private String unitCode;
 
     /** 设备位号 */
-    @Excel(name = "设备位号")
+    @Excel(name = "单位内编号")
     private String tagno;
 
     /** 状态 */

ui/src/views/sems/thickness/index.vue

@@ -19,10 +19,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('位号')" prop="tagno">
+      <el-form-item :label="$t('单位内编号')" prop="tagno">
         <el-input
           v-model="queryParams.tagno"
-          :placeholder="$t('请输入') + $t('位号')"
+          :placeholder="$t('请输入') + $t('单位内编号')"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -209,7 +209,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置名称')" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元名称')" align="center" prop="unitCode" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('设备位号')" align="center" prop="tagno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单位内编号')" align="center" prop="tagno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" prop="status" :formatter="statusFormat" />
       <el-table-column :label="$t('测厚部位CML')" align="center" prop="position" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检测编号')" align="center" prop="measureNo" :show-overflow-tooltip="true"/>
@@ -310,8 +310,8 @@
           </el-form-item>
           </el-col>
           <el-col :span="8">
-          <el-form-item :label="$t('设备位号')" prop="tagno">
-            <el-input v-model="form.tagno" :placeholder="$t('请输入') + $t('设备位号')" />
+          <el-form-item :label="$t('单位内编号')" prop="tagno">
+            <el-input v-model="form.tagno" :placeholder="$t('请输入') + $t('单位内编号')" />
           </el-form-item>
           </el-col>
       </el-row>
@@ -562,7 +562,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('设备位号') }}
+            {{ $t('单位内编号') }}
           </template>
           {{ dataForm.tagno }}
         </el-descriptions-item>