Browse Source

fix:溶液浓度支持小数

master
白凤吉 3 days ago
parent
commit
271cfc6e83
  1. 4
      src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java
  2. 2
      src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java
  3. 2
      src/main/java/com/iflytop/handacid/common/model/entity/Channel.java
  4. 2
      src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java
  5. 2
      src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java
  6. 2
      src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java
  7. 8
      src/main/resources/sql/init.sql

4
src/main/java/com/iflytop/handacid/app/core/state/ChannelState.java

@ -32,7 +32,7 @@ public class ChannelState {
private volatile String solutionName;
@Schema(description = "溶液浓度")
private volatile Integer concentration;
private volatile Double concentration;
@Schema(description = "是否选中")
private volatile boolean selected = false;
@ -46,7 +46,7 @@ public class ChannelState {
@Schema(description = "领取溶液量(单位:mL)")
private volatile Double receivedVolume;
public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, Integer concentration, Double targetVolume, Double receivedVolume, Double currentVolume) {
public ChannelState(ChannelCode channelCode, Long solutionId, String solutionName, Double concentration, Double targetVolume, Double receivedVolume, Double currentVolume) {
this.channelCode = channelCode;
this.solutionId = solutionId;
this.solutionName = solutionName;

2
src/main/java/com/iflytop/handacid/common/model/entity/AuditRecord.java

@ -25,7 +25,7 @@ public class AuditRecord extends BaseEntity {
private String solutionName;
@Schema(description = "溶液浓度")
private Integer concentration;
private Double concentration;
@Schema(description = "通道Code")
private String channelCode;

2
src/main/java/com/iflytop/handacid/common/model/entity/Channel.java

@ -23,7 +23,7 @@ public class Channel extends BaseEntity {
private Long solutionId;
@Schema(description = "溶液浓度")
private Integer concentration;
private Double concentration;
@Schema(description = "添加溶液量")
private Double targetVolume;

2
src/main/java/com/iflytop/handacid/common/model/entity/Formulation.java

@ -19,7 +19,7 @@ public class Formulation extends BaseEntity {
private Long solutionId;
@Schema(description = "溶液浓度")
private Integer concentration;
private Double concentration;
@Schema(description = "对应转数")
private Double revolutions;

2
src/main/java/com/iflytop/handacid/common/model/entity/ReceiveRecord.java

@ -36,7 +36,7 @@ public class ReceiveRecord extends BaseEntity {
private String solutionName;
@Schema(description = "溶液浓度")
private Integer concentration;
private Double concentration;
@Schema(description = "领取溶液量")
private Double receivedVolume;

2
src/main/java/com/iflytop/handacid/common/model/vo/FormulationVO.java

@ -24,7 +24,7 @@ public class FormulationVO{
private String solutionName;
@Schema(description = "溶液浓度")
private Integer concentration;
private Double concentration;
@Schema(description = "对应转数")
private Double revolutions;

8
src/main/resources/sql/init.sql

@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS audit_record(
user_nickname TEXT,--
solution_id INTEGER,--id
solution_name TEXT,--
concentration INTEGER,--
concentration REAL,--
channel_code TEXT,--code
used_volume TEXT,--使
create_time TEXT DEFAULT CURRENT_TIMESTAMP,
@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS receive_record (
receiver_nickname TEXT,--
solution_id INTEGER,--id
solution_name TEXT,--
concentration INTEGER,--
concentration REAL,--
received_volume REAL,--
channel_code TEXT,--code
create_time TEXT DEFAULT CURRENT_TIMESTAMP,
@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS channel (
name TEXT,--
code TEXT,--code
solution_id INTEGER,--id
concentration INTEGER,--
concentration REAL,--
target_volume REAL,--
current_volume REAL,--
received_volume REAL,--
@ -55,7 +55,7 @@ CREATE TABLE IF NOT EXISTS formulation (
id INTEGER PRIMARY KEY AUTOINCREMENT,
volume REAL,--
solution_id INTEGER,--id
concentration INTEGER,--
concentration REAL,--
revolutions REAL,--
create_time TEXT DEFAULT CURRENT_TIMESTAMP,
update_time TEXT DEFAULT CURRENT_TIMESTAMP

Loading…
Cancel
Save