Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no commit message

Browse Source
This commit is contained in:
ICEC
2020-07-07 23:02:11 +08:00
parent 3fd18cd592
commit c56d944ab7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-ui/src/views/fx_dashboard/dashboard_current.vue
View File

@ -94,7 +94,11 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ChangeMould" prop="ChangeMould"
label="是否换模"> label="是否换模中">
<template scope="scope">
<span v-if="scope.row.ChangeMould" style="color:red">换模中</span>
<span v-else style="color: #37B328">否</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SoCode" prop="SoCode"

6
ruoyi/src/main/java/com/ruoyi/db/mssql/DB_Ajax_DashBoard_48102.java
View File

@ -80,11 +80,7 @@ public class DB_Ajax_DashBoard_48102 {
Connection conn = getSQLConnection(); Connection conn = getSQLConnection();
String sql = "SELECT\n" + String sql = "SELECT\n" +
"\t( SELECT MAX ( MouldingDisplayBoardOperation.OperateTime ) FROM MouldingDisplayBoardOperation WHERE MouldingDisplayBoardOperation.DisplayBoardId = V_MouldingDisplayBoard.Id ) AS LastUpdateDate,\n" + "\t( SELECT MAX ( MouldingDisplayBoardOperation.OperateTime ) FROM MouldingDisplayBoardOperation WHERE MouldingDisplayBoardOperation.DisplayBoardId = V_MouldingDisplayBoard.Id ) AS LastUpdateDate,\n" +
"CASE\n" + "ChangeMould,\n" +
"\t\t\n" +
"\t\tWHEN ChangeMould = 0 THEN\n" +
"\t\tN'否' ELSE N'是' \n" +
"\tEND AS ChangeMould,\n" +
"\tdbo.V_MouldingDisplayBoard.Id,\n" + "\tdbo.V_MouldingDisplayBoard.Id,\n" +
"\tdbo.V_MouldingDisplayBoard.Line,\n" + "\tdbo.V_MouldingDisplayBoard.Line,\n" +
"\tdbo.V_MouldingDisplayBoard.CustomerName,\n" + "\tdbo.V_MouldingDisplayBoard.CustomerName,\n" +