LY sems

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

@@ -189,45 +189,49 @@ public class TSpecdevDzsbController extends BaseController
                         entity.setPlantMaint(cellValue);//装置维修组
                     } else if (j == 4) {
                         entity.setEngineer(cellValue);//装置维修工程师
-                    } else if (j == 6) {
-                        entity.setDevno(cellValue);//设备位号
-                    } else if (j == 7) {
-                        entity.setDocno(cellValue);//档案号
                     } else if (j == 5) {
                         entity.setDevname(cellValue);//设备名称
+                    }else if (j == 6) {
+                        entity.setDevno(cellValue);//设备位号
+                    }else if (j == 7) {
+                        entity.setDocno(cellValue);//档案号
                     } else if (j == 8) {
+                        entity.setFactoryNo(cellValue);//出厂编号
+                    }else if (j == 9) {
                         entity.setModel(cellValue);//设备型号
-                    } else if (j == 9) {
-                        entity.setCapacity(cellValue);//起吊重量
                     } else if (j == 10) {
-                        entity.setLocation(cellValue);//设备使用地点
+                        entity.setCapacity(cellValue);//起吊重量
                     } else if (j == 11) {
-                        entity.setRegno(cellValue);//设备注册编号
+                        entity.setLocation(cellValue);//设备使用地点
                     } else if (j == 12) {
+                        entity.setRegno(cellValue);//设备注册编号
+                    }else if (j == 13) {
+                        entity.setDevCode(cellValue);//设备代码
+                    } else if (j == 14) {
                         if (cellValue.length() > 3) {//投用日期
                             entity.setSubmitdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 13) {
+                    } else if (j == 15) {
                         entity.setCreateUnit(cellValue);//制造单位
-                    }else if (j == 14) {
+                    }else if (j == 16) {
                         entity.setIsEx(cellValue);//是否防爆
-                    } else if (j == 15) {
+                    } else if (j == 17) {
                         entity.setCheckStrategy(cellValue);//检验策略
-                    } else if (j == 16) {
+                    } else if (j == 18) {
                         entity.setCheckUnit(cellValue);//检验单位
-                    } else if (j == 17) {
+                    } else if (j == 19) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 18) {
+                    } else if (j == 20) {
                         entity.setReportNo(cellValue);//报告编号
-                    } else if (j == 19) {
+                    } else if (j == 21) {
                         if (cellValue.length() > 3) {//下次到期日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 20) {    //检验结论
+                    } else if (j == 22) {    //检验结论
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 21) {
+                    }else if (j == 23) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 20) {
                         for (SysDept d : dept) {

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

@@ -189,7 +189,7 @@ public class TSpecdevYlgdController extends BaseController {
                     } else if (j == 6) {
                         entity.setDevno(cellValue);//管道编号
                     } else if (j == 7) {
-                        entity.setRegno(cellValue);//压力管道注册代码
+                        entity.setRegno(cellValue);//压力管道工业代码
                     } else if (j == 8) {
                         entity.setUseno(cellValue);//使用登记表编号
                     } else if (j == 9) {
@@ -237,40 +237,38 @@ public class TSpecdevYlgdController extends BaseController {
                     } else if (j == 27) {
                         entity.setAdiabatic(cellValue);//绝热层代码
                     } else if (j == 28) {
-                        entity.setAntiCorrosion(cellValue);//防腐层代码
-                    } else if (j == 29) {
                         entity.setIsDanger(cellValue);
-                    } else if (j == 30) {
+                    } else if (j == 29) {
                         entity.setCheckUnit(cellValue);//检验单位
-                    } else if (j == 31) {//检验日期
+                    } else if (j == 30) {//检验日期
                         if (cellValue.length() < 4) {
                             continue;
                         }
                         entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                    } else if (j == 32) {
+                    } else if (j == 31) {
                         entity.setSafeClass(cellValue);//安全状况等级
-                    } else if (j == 33) {
+                    } else if (j == 32) {
                         //年度检查报告编号
                         entity.setReportNo(cellValue);//报告编号
-                    } else if (j == 34) {//下次检验日期
+                    } else if (j == 33) {//下次检验日期
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() < 4) {
                             continue;
                         }
                         entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
-                    } else if (j == 35) {
+                    } else if (j == 34) {
                         if (cellValue.length() > 3) {//年度检查日期
                             entity.setYearWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 36) {
+                    } else if (j == 35) {
                         entity.setCheckConclusion(cellValue);//年度结论
-                    } else if (j == 37) {
+                    } else if (j == 36) {
                         if (cellValue.length() > 3) {//下次年度检验日期
                             entity.setYearNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 38) {
+                    } else if (j == 37) {
                         entity.setYearReportNo(cellValue);
-                    } else if (j == 39) {
+                    } else if (j == 38) {
                         entity.setRemarks(cellValue);//备注
                     } /*else if (j == 39) {
                         for (SysDept d : dept) {

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

@@ -222,71 +222,73 @@ public class TSpecdevYlrqController extends BaseController
                     } else if (j == 6) {
                         entity.setDevname(cellValue);//设备名称
                     } else if (j == 7) {
+                        entity.setFactoryNo(cellValue);//出厂编号
+                    }else if (j == 8) {
                         entity.setUseno(cellValue);//使用证编号
-                    } else if (j == 8) {
-                        entity.setRegno(cellValue);//注册编号
                     } else if (j == 9) {
-                        entity.setVesselType(cellValue);//容器类别
+                        entity.setRegno(cellValue);//注册编号
                     } else if (j == 10) {
-                        entity.setCreateUnit(cellValue);//制造单位
+                        entity.setVesselType(cellValue);//容器类别
                     } else if (j == 11) {
-                        entity.setNation(cellValue);//国家
+                        entity.setCreateUnit(cellValue);//制造单位
                     } else if (j == 12) {
-                        entity.setOutSize(cellValue);//外形尺寸
+                        entity.setNation(cellValue);//国家
                     } else if (j == 13) {
-                        entity.setMaterial(cellValue);//材料
+                        entity.setOutSize(cellValue);//外形尺寸
                     } else if (j == 14) {
-                        entity.setMedium(cellValue);//介质
+                        entity.setMaterial(cellValue);//材料
                     } else if (j == 15) {
-                        entity.setDesPressure(cellValue);//设计压力
+                        entity.setMedium(cellValue);//介质
                     } else if (j == 16) {
-                        entity.setOptPressure(cellValue);//操作压力
+                        entity.setDesPressure(cellValue);//设计压力
                     } else if (j == 17) {
-                        entity.setDesTemp(cellValue);//设计温度
+                        entity.setOptPressure(cellValue);//操作压力
                     } else if (j == 18) {
-                        entity.setOptTemp(cellValue);//操作温度
+                        entity.setDesTemp(cellValue);//设计温度
                     } else if (j == 19) {
+                        entity.setOptTemp(cellValue);//操作温度
+                    } else if (j == 20) {
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() > 3) {//投用日期
                             entity.setSubmitdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 20) {
+                    } else if (j == 21) {
                         //是否涉危化品
                             entity.setIsDanger(cellValue);
-                    }  else if (j == 21) {
+                    }  else if (j == 22) {
                         //是否涉危化品
                         entity.setDesYear(cellValue);
-                    } else if (j == 22) {
+                    } else if (j == 23) {
                         //是否超设计使用寿命
                             entity.setIsOverlife(cellValue);
-                    } else if (j == 23) {
-                        entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 24) {
+                        entity.setCheckUnit(cellValue);//检验单位
+                    } else if (j == 25) {
                         logger.info("日期格式：" + cellValue);
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 25) {
-                        entity.setSafeClass(cellValue);//安全状况等级
                     } else if (j == 26) {
+                        entity.setSafeClass(cellValue);//安全状况等级
+                    } else if (j == 27) {
                         if (cellValue.length() > 3) {//下次检验日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 27) {
-                        entity.setReportNo(cellValue);//报告编号
                     } else if (j == 28) {
+                        entity.setReportNo(cellValue);//报告编号
+                    } else if (j == 29) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setYearWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 29) {
-                        entity.setCheckConclusion(cellValue);//年度结论
                     } else if (j == 30) {
+                        entity.setCheckConclusion(cellValue);//年度结论
+                    } else if (j == 31) {
                         if (cellValue.length() > 3) {//下次年度检验日期
                             entity.setYearNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 31) {
-                        entity.setYearReportNo(cellValue);//报告编号
                     } else if (j == 32) {
+                        entity.setYearReportNo(cellValue);//报告编号
+                    } else if (j == 33) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 33) {
                         for (SysDept d : dept) {

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

@@ -36,6 +36,10 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "使用部门")
     private String useDept;
 
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
     /** 装置维护人员 */
     @Excel(name = "装置维护人员")
     private String engineer;
@@ -676,6 +680,14 @@ public class TSpecdevCc extends BaseEntity
         this.unit = unit;
     }
 
+    public String getPlantMaint() {
+        return plantMaint;
+    }
+
+    public void setPlantMaint(String plantMaint) {
+        this.plantMaint = plantMaint;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -60,6 +60,10 @@ public class TSpecdevDzsb extends BaseEntity
     @Excel(name = "档案号")
     private String docno;
 
+    /** 产品出厂编号 */
+    @Excel(name = "产品出厂编号")
+    private String factoryNo;
+
     /** 型号 */
     @Excel(name = "设备型号")
     private String model;
@@ -73,9 +77,13 @@ public class TSpecdevDzsb extends BaseEntity
     private String location;
 
     /** 注册代码 */
-    @Excel(name = "设备注册编号")
+    @Excel(name = "设备注册登记证编号")
     private String regno;
 
+    /** 设备代码 */
+    @Excel(name = "设备代码")
+    private String devCode;
+
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "投用日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -577,6 +585,22 @@ public class TSpecdevDzsb extends BaseEntity
         this.checkYear = checkYear;
     }
 
+    public String getFactoryNo() {
+        return factoryNo;
+    }
+
+    public void setFactoryNo(String factoryNo) {
+        this.factoryNo = factoryNo;
+    }
+
+    public String getDevCode() {
+        return devCode;
+    }
+
+    public void setDevCode(String devCode) {
+        this.devCode = devCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -57,7 +57,7 @@ public class TSpecdevYlgd extends BaseEntity
     private String devno;
 
     /** 注册代码 */
-    @Excel(name = "注册代码")
+    @Excel(name = "工业管道代码")
     private String regno;
 
     /** 使用证编号 */
@@ -143,7 +143,7 @@ public class TSpecdevYlgd extends BaseEntity
     private String adiabatic;
 
     /** 防腐层代码 */
-    @Excel(name = "防腐层代码")
+//    @Excel(name = "防腐层代码")
     private String antiCorrosion;
 
     /** 绝热层厚度 */

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

@@ -56,6 +56,10 @@ public class TSpecdevYlrq extends BaseEntity
     @Excel(name = "设备名称")
     private String devname;
 
+    /** 设备出厂编号 */
+    @Excel(name = "设备出厂编号")
+    private String factoryNo;
+
     /** 使用证编号 */
     @Excel(name = "使用证号码")
     private String useno;
@@ -705,6 +709,14 @@ public class TSpecdevYlrq extends BaseEntity
         this.checkYear = checkYear;
     }
 
+    public String getFactoryNo() {
+        return factoryNo;
+    }
+
+    public void setFactoryNo(String factoryNo) {
+        this.factoryNo = factoryNo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiCc.java

@@ -42,6 +42,10 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "设备位号")
     private String devno;
 
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "提交日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -634,6 +638,14 @@ public class TSpechiCc extends BaseEntity
         return hiType;
     }
 
+    public String getPlantMaint() {
+        return plantMaint;
+    }
+
+    public void setPlantMaint(String plantMaint) {
+        this.plantMaint = plantMaint;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiDzsb.java

@@ -38,6 +38,14 @@ public class TSpechiDzsb extends BaseEntity
     @Excel(name = "设备位号")
     private String devno;
 
+    /** 产品出厂编号 */
+    @Excel(name = "产品出厂编号")
+    private String factoryNo;
+
+    /** 设备代码 */
+    @Excel(name = "设备代码")
+    private String devCode;
+
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "提交日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -531,6 +539,22 @@ public class TSpechiDzsb extends BaseEntity
         return hiType;
     }
 
+    public String getFactoryNo() {
+        return factoryNo;
+    }
+
+    public void setFactoryNo(String factoryNo) {
+        this.factoryNo = factoryNo;
+    }
+
+    public String getDevCode() {
+        return devCode;
+    }
+
+    public void setDevCode(String devCode) {
+        this.devCode = devCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlgd.java

@@ -81,7 +81,7 @@ public class TSpechiYlgd extends BaseEntity
     private Long approveStatus;
 
     /** 注册代码 */
-    @Excel(name = "注册代码")
+    @Excel(name = "工业管道代码")
     private String regno;
 
     /** 使用证编号 */
@@ -209,11 +209,11 @@ public class TSpechiYlgd extends BaseEntity
     private String adiabatic;
 
     /** 防腐层代码 */
-    @Excel(name = "防腐层代码")
+//    @Excel(name = "防腐层代码")
     private String antiCorrosion;
 
     /** 绝热层厚度 */
-    @Excel(name = "绝热层厚度")
+//    @Excel(name = "绝热层厚度")
     private String adiabaticThickness;
 
     /** 是否涉危化品 */
@@ -250,7 +250,7 @@ public class TSpechiYlgd extends BaseEntity
     private String perTestConclusion;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
+//    @Excel(name = "部门名称")
     private String deptName;
 
     public String getDeptName() {

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlrq.java

@@ -38,6 +38,10 @@ public class TSpechiYlrq extends BaseEntity
     @Excel(name = "设备位号")
     private String devno;
 
+    /** 出厂编号 */
+    @Excel(name = "出厂编号")
+    private String factoryNo;
+
     /** 提交日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "提交日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -672,6 +676,14 @@ public class TSpechiYlrq extends BaseEntity
         return hiType;
     }
 
+    public String getFactoryNo() {
+        return factoryNo;
+    }
+
+    public void setFactoryNo(String factoryNo) {
+        this.factoryNo = factoryNo;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-#    host: smtpout.basf-it-services.com
-#    protocol: smtp
-#    default-encoding: UTF-8
-#    password:
-#    username:
-#    port: 25
-#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-#    properties.mail.debug: true
-#    from: CPMS.byc@BASF-YPC.com.cn
-    host: smtp.exmail.qq.com
+    host: smtpout.basf-it-services.com
     protocol: smtp
     default-encoding: UTF-8
-    password: vvTAT8hciG7FLk4C
-    username: email@seashoreept.com
-    port: 587
+    password:
+    username:
+    port: 25
     properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
     properties.mail.debug: true
-    from: email@seashoreept.com
+    from: CPMS.byc@BASF-YPC.com.cn
+#    host: smtp.exmail.qq.com
+#    protocol: smtp
+#    default-encoding: UTF-8
+#    password: vvTAT8hciG7FLk4C
+#    username: email@seashoreept.com
+#    port: 587
+#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+#    properties.mail.debug: true
+#    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -43,10 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
         <result property="isRepeat" column="is_repeat"/>
+        <result property="factoryNo" column="factory_no"/>
+        <result property="devCode" column="dev_code"/>
     </resultMap>
 
     <sql id="selectTSpecdevDzsbVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
+        select d.id, d.plant_code, d.unit, d.devname,d.dev_code,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DZSB h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
                 ,d.is_repeat
         from t_specdev_dzsb d
@@ -145,6 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="engineer != null">engineer,</if>
             <if test="isEx != null">is_ex,</if>
             <if test="perTestConclusion != null">per_test_conclusion,</if>
+            <if test="factoryNo != null">factory_no,</if>
+            <if test="devCode != null">dev_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -183,6 +187,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="engineer != null">#{engineer},</if>
             <if test="isEx != null">#{isEx},</if>
             <if test="perTestConclusion != null">#{perTestConclusion},</if>
+            <if test="factoryNo != null">#{factoryNo},</if>
+            <if test="devCode != null">#{devCode},</if>
          </trim>
     </insert>
 
@@ -225,6 +231,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">is_ex = #{isEx},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
             <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
+            <if test="devCode != null">dev_code = #{devCode},</if>
         </trim>
         where id = #{id}
     </update>
@@ -267,6 +275,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="engineer != null">engineer = #{engineer},</if>
             <if test="isEx != null">is_ex = #{isEx},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
+            <if test="devCode != null">dev_code = #{devCode},</if>
         </trim>
         where id = #{devId}
     </update>

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -54,6 +54,7 @@
         <result property="hiFlag" column="hiFlag"/>
         <result property="deptName" column="dept_name"/>
         <result property="isRepeat" column="is_repeat"/>
+        <result property="factoryNo" column="factory_no"/>
     </resultMap>
 
     <sql id="selectTSpecdevYlrqVo">
@@ -61,6 +62,7 @@
                d.plant_code,
                d.unit,
                d.devname,
+               d.factory_no,
                d.devno,
                d.submitdate,
                d.status,
@@ -184,6 +186,7 @@
             <if test="plantCode != null and plantCode != ''">plant_code,</if>
             <if test="unit != null">unit,</if>
             <if test="devname != null">devname,</if>
+            <if test="factoryNo != null">factory_no,</if>
             <if test="devno != null">devno,</if>
             <if test="submitdate != null">submitdate,</if>
             <if test="status != null">status,</if>
@@ -232,6 +235,7 @@
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
             <if test="unit != null">#{unit},</if>
             <if test="devname != null">#{devname},</if>
+            <if test="factoryNo != null">#{factoryNo},</if>
             <if test="devno != null">#{devno},</if>
             <if test="submitdate != null">#{submitdate},</if>
             <if test="status != null">#{status},</if>
@@ -283,6 +287,7 @@
             <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="devname != null">devname = #{devname},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
             <if test="devno != null">devno = #{devno},</if>
             <if test="submitdate != null">submitdate = #{submitdate},</if>
             <if test="status != null">status = #{status},</if>
@@ -337,6 +342,7 @@
             <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="devname != null">devname = #{devname},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
             <if test="devno != null">devno = #{devno},</if>
             <if test="submitdate != null">submitdate = #{submitdate},</if>
             <if test="status != null">status = #{status},</if>

master/src/main/resources/mybatis/sems/his/TSpechiDzsbMapper.xml

@@ -43,10 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devId"    column="dev_id"    />
         <result property="hiType"    column="hi_type"    />
         <result property="deptName" column="dept_name" />
+        <result property="factoryNo" column="factory_no"/>
+        <result property="devCode" column="dev_code"/>
     </resultMap>
 
     <sql id="selectTSpechiDzsbVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex, d.dev_id, d.hi_type ,s.dept_name from t_spechi_dzsb d
+        select d.id, d.plant_code, d.unit, d.devname, d.devno,d.dev_code,d.factory_no, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex, d.dev_id, d.hi_type ,s.dept_name from t_spechi_dzsb d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -151,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">is_ex,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="factoryNo != null">factory_no,</if>
+            <if test="devCode != null">dev_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -190,6 +194,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">#{isEx},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="factoryNo != null">#{factoryNo},</if>
+            <if test="devCode != null">#{devCode},</if>
          </trim>
     </insert>
 
@@ -236,6 +242,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">is_ex,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="factoryNo != null">factory_no,</if>
+            <if test="devCode != null">dev_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -275,6 +283,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">#{isEx},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="factoryNo != null">#{factoryNo},</if>
+            <if test="devCode != null">#{devCode},</if>
         </trim>
     </insert>
 
@@ -317,6 +327,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isEx != null">is_ex = #{isEx},</if>
             <if test="devId != null">dev_id = #{devId},</if>
             <if test="hiType != null">hi_type = #{hiType},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
+            <if test="devCode != null">dev_code = #{devCode},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/sems/his/TSpechiYlrqMapper.xml

@@ -54,10 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devId"    column="dev_id"    />
         <result property="hiType"    column="hi_type"    />
         <result property="deptName" column="dept_name" />
+        <result property="factoryNo" column="factory_no"/>
     </resultMap>
 
     <sql id="selectTSpechiYlrqVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.engineer, d.vessel_type, d.is_key, d.create_unit, d.nation, d.out_size, d.material, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.report_no, d.is_danger, d.is_overlife, d.safe_class, d.approve_time, d.change_time, d.des_year, d.year_warn_date, d.check_conclusion, d.year_next_warn_date, d.year_report_no, d.dev_id, d.hi_type ,s.dept_name from t_spechi_ylrq d
+        select d.id, d.plant_code, d.unit, d.devname,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.engineer, d.vessel_type, d.is_key, d.create_unit, d.nation, d.out_size, d.material, d.medium, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.report_no, d.is_danger, d.is_overlife, d.safe_class, d.approve_time, d.change_time, d.des_year, d.year_warn_date, d.check_conclusion, d.year_next_warn_date, d.year_report_no, d.dev_id, d.hi_type ,s.dept_name from t_spechi_ylrq d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -184,7 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yearReportNo != null">year_report_no,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
-         </trim>
+            <if test="factoryNo != null">factory_no,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
@@ -234,7 +236,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yearReportNo != null">#{yearReportNo},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
-         </trim>
+            <if test="factoryNo != null">#{factoryNo},</if>
+
+        </trim>
     </insert>
 
     <insert id="insertTSpechiYlrqByDev" parameterType="com.ruoyi.project.sems.domain.TSpecdevYlrq">
@@ -291,6 +295,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yearReportNo != null">year_report_no,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="factoryNo != null">factory_no,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -341,6 +347,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yearReportNo != null">#{yearReportNo},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="factoryNo != null">#{factoryNo},</if>
+
         </trim>
     </insert>
 
@@ -394,6 +402,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yearReportNo != null">year_report_no = #{yearReportNo},</if>
             <if test="devId != null">dev_id = #{devId},</if>
             <if test="hiType != null">hi_type = #{hiType},</if>
+            <if test="factoryNo != null">factory_no = #{factoryNo},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/components/PlantProgList/index.vue

@@ -956,10 +956,10 @@ export default {
           path: "/cpms/index.html#/pptyulan",
           query:didi
         });
-        window.open("/cpms/index.html#/pptyulan?id=" + this.pdf.pdfUrl, '_blank');
+        window.open("/cpms/index.html#/pptyulan?id=" + this.pdf.pdfUrl, '_blank')
         console.log(this.imgs)
       }else {
-        window.open(this.pdf.pdfUrl);
+        window.open(this.pdf.pdfUrl)
       }
     },
     handleSeePPT (row){
@@ -984,23 +984,17 @@ export default {
         this.loadingFlash=false
 
         //成功时直接给地址
-
         this.videoList = result.data.imagePathList
         //将返回的地址集合遍历添加到绑定的数组中
         this.imgs=[]
         for (var key=0;key<this.videoList.length;key++) {
           this.imgs.push( process.env.VUE_APP_BASE_API+  this.videoList[key]  );
-
         }
-
-
       }).catch(result => {
 
-
         //请求失败，关闭loading，pdf地址直接为为空，不显示
         this.pdf.pdfUrl =""
         this.loadingFlash = false;
-
       })
     },
     handleSee (row){
@@ -1045,10 +1039,7 @@ export default {
           this.pdf.open =false
         } else{
           //成功时直接给地址
-
           this.pdf.pdfUrl =process.env.VUE_APP_BASE_API+ result.data
-
-
         }
         // this.$nextTick(() => {
         //   const iframe = window.frames['iFrame']
@@ -1064,7 +1055,6 @@ export default {
         // })
       }).catch(result => {
 
-
         //请求失败，关闭loading，pdf地址直接为为空，不显示
         this.pdf.pdfUrl =""
         this.loadingFlash = false;

ui/src/views/sems/specDzsb/bf.vue

@@ -79,11 +79,12 @@
 
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('产品出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
-
+      <el-table-column :label="$t('设备代码')" align="center" prop="devCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
@@ -193,6 +194,18 @@
         </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('产品出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('产品出厂编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备代码')" prop="devCode">
+              <el-input v-model="form.devCode" :placeholder="$t('请输入')+ $t('设备代码')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
         <el-form-item :label="$t('设备型号')" prop="model">
@@ -612,7 +625,9 @@ export default {
         approveTime: null,
         changeTime: null,
         checkUnit: null,
-        engineer: null
+        engineer: null,
+        factoryNo: null,
+        devCode: null
       };
       this.resetForm("form");
       this.dataForm = 0;

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

@@ -44,12 +44,12 @@
       :key="item.value"
       :label="item.text"
       :value="item.value">
-      <div>  
-        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
+      <div>
+        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
  <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
-        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
+        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
  <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
-        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
+        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
  <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
         </div>
     </el-option>
@@ -65,7 +65,7 @@
           />
         </el-select>
       </el-form-item>
-    
+
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('重置') }}</el-button>
@@ -161,11 +161,12 @@
       <el-table-column :label="$t('设备名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('产品出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
-
+      <el-table-column :label="$t('设备代码')" align="center" prop="devCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
@@ -282,6 +283,18 @@
         </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('产品出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('产品出厂编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备代码')" prop="devCode">
+              <el-input v-model="form.devCode" :placeholder="$t('请输入')+ $t('设备代码')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
         <el-form-item :label="$t('设备型号')" prop="model">
@@ -665,10 +678,10 @@
         this.specDzsbList = response.rows;
         this.total = response.total;
         this.$nextTick(() => {
-          this.$refs.deviceTable.doLayout(); // 解决表格错位   
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
         });
         this.loading = false;
-      }); 
+      });
     },
      /** 查询部门下拉树结构 */
      getTreeselect() {
@@ -726,7 +739,9 @@
         approveTime: null,
         changeTime: null,
         checkUnit: null,
-        engineer: null
+        engineer: null,
+        factoryNo: null,
+        devCode: null
       };
       this.resetForm("form");
       this.dataForm = 0;

ui/src/views/sems/specDzsb/specDzsb-hisReform.vue

@@ -11,10 +11,13 @@
 
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('产品出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备代码')" align="center" prop="devCode" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">

ui/src/views/sems/specDzsb/ty.vue

@@ -124,10 +124,13 @@
 
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('产品出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备代码')" align="center" prop="devCode" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
@@ -244,6 +247,18 @@
         </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('产品出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('产品出厂编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备代码')" prop="devCode">
+              <el-input v-model="form.devCode" :placeholder="$t('请输入')+ $t('设备代码')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
         <el-form-item :label="$t('设备型号')" prop="model">
@@ -663,7 +678,9 @@ export default {
         approveTime: null,
         changeTime: null,
         checkUnit: null,
-        engineer: null
+        engineer: null,
+        factoryNo: null,
+        devCode: null
       };
       this.resetForm("form");
       this.dataForm = 0;

ui/src/views/sems/specDzsb/zx.vue

@@ -79,10 +79,13 @@
 
       <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('产品出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设备注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备代码')" align="center" prop="devCode" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
         <template slot-scope="scope">
@@ -194,6 +197,18 @@
         </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('产品出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('产品出厂编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备代码')" prop="devCode">
+              <el-input v-model="form.devCode" :placeholder="$t('请输入')+ $t('设备代码')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
         <el-form-item :label="$t('设备型号')" prop="model">
@@ -613,7 +628,9 @@ export default {
         approveTime: null,
         changeTime: null,
         checkUnit: null,
-        engineer: null
+        engineer: null,
+        factoryNo: null,
+        devCode: null
       };
       this.resetForm("form");
       this.dataForm = 0;

ui/src/views/sems/specYlgd/bf.vue

@@ -138,7 +138,7 @@
       <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />
       <el-table-column :label="$t('管道名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道编号')" align="center" fixed="left"  prop="devno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
@@ -167,7 +167,7 @@
       <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>
+<!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
@@ -283,8 +283,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('注册代码')" prop="regno">
-          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')" />
+        <el-form-item :label="$t('工业管道代码')" prop="regno">
+          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('工业管道代码')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -417,11 +417,11 @@
           <el-input v-model="form.adiabatic" :placeholder="$t('请输入')+ $t('绝热层代码')" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">
-          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />
-        </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">-->
+<!--          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">

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

@@ -116,12 +116,12 @@
       :key="item.value"
       :label="item.text"
       :value="item.value">
-      <div>  
-        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
+      <div>
+        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
  <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
-        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
+        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
  <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
-        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
+        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
  <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
         </div>
     </el-option>
@@ -221,7 +221,7 @@
       <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />
       <el-table-column :label="$t('管道名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道编号')" align="center" fixed="left"  prop="devno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
@@ -250,7 +250,7 @@
       <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>
+<!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
@@ -508,11 +508,11 @@
           <el-input v-model="form.adiabatic" :placeholder="$t('请输入')+ $t('绝热层代码')" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">
-          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />
-        </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">-->
+<!--          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">

ui/src/views/sems/specYlgd/specYlgd-hisReform.vue

@@ -12,7 +12,7 @@
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('国家')" align="center" prop="nation" :show-overflow-tooltip="true"/>

ui/src/views/sems/specYlgd/ty.vue

@@ -182,7 +182,7 @@
       <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />
       <el-table-column :label="$t('管道名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道编号')" align="center" fixed="left"  prop="devno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
@@ -211,7 +211,7 @@
       <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>
+<!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
@@ -333,8 +333,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('注册代码')" prop="regno">
-          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')" />
+        <el-form-item :label="$t('工业管道代码')" prop="regno">
+          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('工业管道代码')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -467,11 +467,11 @@
           <el-input v-model="form.adiabatic" :placeholder="$t('请输入')+ $t('绝热层代码')" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">
-          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />
-        </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">-->
+<!--          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">

ui/src/views/sems/specYlgd/zx.vue

@@ -137,7 +137,7 @@
       <el-table-column :label="$t('申请状态')" align="center" fixed="left"  prop="approveStatus" :formatter="approveStatusFormat" />
       <el-table-column :label="$t('管道名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道编号')" align="center" fixed="left"  prop="devno" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('工业管道代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
@@ -166,7 +166,7 @@
       <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>
+<!--      <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>-->
       <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
 
@@ -282,8 +282,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-        <el-form-item :label="$t('注册代码')" prop="regno">
-          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('注册代码')" />
+        <el-form-item :label="$t('工业管道代码')" prop="regno">
+          <el-input v-model="form.regno" :placeholder="$t('请输入')+ $t('工业管道代码')" />
         </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -416,11 +416,11 @@
           <el-input v-model="form.adiabatic" :placeholder="$t('请输入')+ $t('绝热层代码')" />
         </el-form-item>
           </el-col>
-          <el-col :span="12">
-        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">
-          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />
-        </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--        <el-form-item :label="$t('防腐层代码')" prop="antiCorrosion">-->
+<!--          <el-input v-model="form.antiCorrosion" :placeholder="$t('请输入')+ $t('防腐层代码')" />-->
+<!--        </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">

ui/src/views/sems/specYlrq/bf.vue

@@ -87,6 +87,7 @@
       <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>

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

@@ -44,12 +44,12 @@
       :key="item.value"
       :label="item.text"
       :value="item.value">
-      <div>  
-        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
+      <div>
+        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
  <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
-        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
+        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
  <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
-        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
+        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
  <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
         </div>
     </el-option>
@@ -164,6 +164,7 @@
       </el-table-column>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>
@@ -511,9 +512,14 @@
         </el-form-item>
           </el-col>
           <el-col :span="12">
-        <el-form-item :label="$t('年度检查报告编号')" prop="yearReportNo">
-          <el-input v-model="form.yearReportNo" :placeholder="$t('请输入')+ $t('年度检查报告编号')" />
-        </el-form-item>
+            <el-form-item :label="$t('年度检查报告编号')" prop="yearReportNo">
+              <el-input v-model="form.yearReportNo" :placeholder="$t('请输入')+ $t('年度检查报告编号')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('设备出厂编号')" />
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -861,7 +867,8 @@
         yearWarnDate: null,
         checkConclusion: null,
         yearNextWarnDate: null,
-        yearReportNo: null
+        yearReportNo: null,
+        factoryNo: null
       };
       this.modifyForm = {
         wxjl: null,

ui/src/views/sems/specYlrq/specYlrq-hisReform.vue

@@ -10,6 +10,7 @@
       <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>

ui/src/views/sems/specYlrq/ty.vue

@@ -132,6 +132,7 @@
       <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>
@@ -445,6 +446,11 @@
           <el-input v-model="form.yearReportNo" :placeholder="$t('请输入')+ $t('年度检查报告编号')" />
         </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('设备出厂编号')" prop="factoryNo">
+              <el-input v-model="form.factoryNo" :placeholder="$t('请输入')+ $t('设备出厂编号')" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -452,11 +458,6 @@
             <el-input v-model="form.remarks" type="textarea" :placeholder="$t('请输入')+ $t('内容')" />
           </el-form-item>
           </el-col>
-          <el-col :span="12">
-          <el-form-item :label="$t('归属部门')" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
-          </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -770,7 +771,8 @@ export default {
         yearWarnDate: null,
         checkConclusion: null,
         yearNextWarnDate: null,
-        yearReportNo: null
+        yearReportNo: null,
+        factoryNo: null
       };
       this.modifyForm = {
         wxjl: null,

ui/src/views/sems/specYlrq/zx.vue

@@ -88,6 +88,7 @@
       <el-table-column :label="$t('位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('设备出厂编号')" align="center" prop="factoryNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :show-overflow-tooltip="true"/>