chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

胶料快检添加离线模式

Browse Source
This commit is contained in:
jiangxh
2026-06-30 14:43:48 +08:00
parent 672259c94f
commit d55223a1c0
6 changed files with 312 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecord.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
@@ -153,6 +154,9 @@ public class MesXslRubberQuickTestRecord implements Serializable {
@TableField(exist = false)
@Schema(description = "曲线图数据点")
//update-begin---author:jiangxh ---date:2026-06-29 for：【快检记录】主表曲线图列表JSON别名-----------
@JsonAlias("chart_point_list")
//update-end---author:jiangxh ---date:2026-06-29 for：【快检记录】主表曲线图列表JSON别名-----------
private List<MesXslRubberQuickTestRecordChartPoint> chartPointList;
//update-end---author:jiangxh ---date:2026-06-22 for：【快检记录】数据标准明细与曲线图-----------
}

8
jeecg-boot/jeecg-boot-module/jeecg-module-xslmes/src/main/java/org/jeecg/modules/xslmes/entity/MesXslRubberQuickTestRecordChartPoint.java
View File

@@ -3,6 +3,7 @@ package org.jeecg.modules.xslmes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
@@ -32,19 +33,26 @@ public class MesXslRubberQuickTestRecordChartPoint implements Serializable {
@Schema(description = "主表ID mes_xsl_rubber_quick_test_record.id")
private String recordId;
//update-begin---author:jiangxh ---date:2026-06-29 for：【快检记录】曲线图字段兼容桌面端与下划线JSON-----------
@Excel(name = "时间(min)", width = 12, type = 10)
@JsonAlias("time_min")
private BigDecimal timeMin;
@Excel(name = "上模温度", width = 12, type = 10)
@JsonAlias("upper_temp")
private BigDecimal upperTemp;
@Excel(name = "下模温度", width = 12, type = 10)
@JsonAlias("lower_temp")
private BigDecimal lowerTemp;
@Excel(name = "S'(dNm)", width = 12, type = 10)
@JsonAlias("torque_s")
private BigDecimal torqueS;
@JsonAlias("sort_no")
private Integer sortNo;
//update-end---author:jiangxh ---date:2026-06-29 for：【快检记录】曲线图字段兼容桌面端与下划线JSON-----------
private String createBy;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")