Merge branch 'feat/mes' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17

YunaiV
2 parents 5f7bf4a4 526cef8c
Showing 2 changed files with 5 additions and 4 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/process/MesProProcessController.java
yudao-module-mes/src/test/resources/sql/create_tables.sql
@@ -84,7 +84,8 @@ public class MesProProcessController {
     public CommonResult<List<MesProProcessRespVO>> getProcessSimpleList() {
         List<MesProProcessDO> list = processService.getProcessListByStatus(CommonStatusEnum.ENABLE.getStatus());
         return success(convertList(list, process -> new MesProProcessRespVO()
-                .setId(process.getId()).setName(process.getName()).setCode(process.getCode())));
+                .setId(process.getId()).setName(process.getName()).setCode(process.getCode())
+                .setAttention(process.getAttention()).setRemark(process.getRemark())));
     }
     @GetMapping("/export-excel")
@@ -369,9 +369,9 @@ CREATE TABLE IF NOT EXISTS &quot;mes_qc_rqc&quot; (
     "critical_quantity" int DEFAULT 0,
     "major_quantity" int DEFAULT 0,
     "minor_quantity" int DEFAULT 0,
-    "critical_rate" decimal(5,2) DEFAULT 0.00,
-    "major_rate" decimal(5,2) DEFAULT 0.00,
-    "minor_rate" decimal(5,2) DEFAULT 0.00,
+    "critical_rate" decimal(14,2) DEFAULT 0.00,
+    "major_rate" decimal(14,2) DEFAULT 0.00,
+    "minor_rate" decimal(14,2) DEFAULT 0.00,
     "creator" varchar(64) DEFAULT '',
     "create_time" timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updater" varchar(64) DEFAULT '',