diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
index d2881259..2e0bd56f 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/MesRollGrind.java
@@ -82,6 +82,9 @@ public class MesRollGrind extends BaseEntity {
/** 操作者 */
private String operator;
+ /** 复核人 */
+ private String reviewer;
+
/** 备注 */
private String remark;
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
index 2f23e941..2f5bceb6 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/bo/MesRollGrindBo.java
@@ -37,5 +37,6 @@ public class MesRollGrindBo extends BaseEntity {
private String flawResult;
private BigDecimal hardness;
private String operator;
+ private String reviewer;
private String remark;
}
diff --git a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
index d8469fb2..2c10adbb 100644
--- a/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
+++ b/klp-mes/src/main/java/com/klp/mes/roll/domain/vo/MesRollGrindVo.java
@@ -28,6 +28,7 @@ public class MesRollGrindVo {
private String flawResult;
private BigDecimal hardness;
private String operator;
+ private String reviewer;
private String remark;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
index 46cec595..e8ca0e7a 100644
--- a/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
+++ b/klp-mes/src/main/resources/mapper/roll/MesRollGrindMapper.xml
@@ -7,7 +7,7 @@
dia_before, dia_after, grind_amount, roll_shape,
flaw_result,
CASE WHEN hardness = '未倒角' THEN 0 ELSE CAST(hardness AS DECIMAL(10,1)) END AS hardness,
- operator, remark, create_time
+ operator, reviewer, remark, create_time
FROM mes_roll_grind
WHERE del_flag = 0 AND roll_id = #{rollId}
ORDER BY grind_time Desc
@@ -18,7 +18,7 @@
g.dia_before, g.dia_after, g.grind_amount, g.roll_shape,
g.flaw_result,
CASE WHEN g.hardness = '未倒角' THEN 0 ELSE CAST(g.hardness AS DECIMAL(10,1)) END AS hardness,
- g.operator, g.remark, g.create_time,
+ g.operator, g.reviewer, g.remark, g.create_time,
ri.roll_type
FROM mes_roll_grind g
LEFT JOIN mes_roll_info ri ON g.roll_id = ri.roll_id
diff --git a/klp-ui/src/views/mes/roll/grind/index.vue b/klp-ui/src/views/mes/roll/grind/index.vue
index 873a47ab..f16d7982 100644
--- a/klp-ui/src/views/mes/roll/grind/index.vue
+++ b/klp-ui/src/views/mes/roll/grind/index.vue
@@ -269,6 +269,19 @@
+
+
+
+
+
+
+