Sfoglia il codice sorgente

Merge branch 'master' of http://47.114.101.16:7070/ssy/newcpms

zhangding 3 anni fa
parent
commit
213a3ded9a

+ 49 - 0
master/src/main/java/com/ruoyi/project/production/domain/TDailyProductionReport.java

@@ -2155,6 +2155,22 @@ public class TDailyProductionReport extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String pguAeuFeedLoadPercentage;
 
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String col320fc2161;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String c210pdi;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String temperature;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String crackingFurnaceBurn;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -2164,6 +2180,39 @@ public class TDailyProductionReport extends BaseEntity
     {
         return id;
     }
+
+    public String getCol320fc2161() {
+        return col320fc2161;
+    }
+
+    public void setCol320fc2161(String col320fc2161) {
+        this.col320fc2161 = col320fc2161;
+    }
+
+    public String getC210pdi() {
+        return c210pdi;
+    }
+
+    public void setC210pdi(String c210pdi) {
+        this.c210pdi = c210pdi;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getCrackingFurnaceBurn() {
+        return crackingFurnaceBurn;
+    }
+
+    public void setCrackingFurnaceBurn(String crackingFurnaceBurn) {
+        this.crackingFurnaceBurn = crackingFurnaceBurn;
+    }
+
     public void setFromDate(Date fromDate)
     {
         this.fromDate = fromDate;

File diff suppressed because it is too large
+ 4 - 0
master/src/main/resources/mybatis/production/TDailyProductionReportMapper.xml


File diff suppressed because it is too large
+ 2685 - 1059
ui/src/views/production/daily/index.vue


Some files were not shown because too many files changed in this diff