root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-14 17:44:14 +08:00
parent 5ce7e84c4c
commit 8653859d50
3 changed files with 188 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/websocket/AutoWebSocketTask.java
View File

@@ -20,11 +20,14 @@ import java.util.HashMap;
@RequiredArgsConstructor
public class AutoWebSocketTask {
/**
* 任务看板
*/
public void run() {
try {
String today = DateUtil.today();
HashMap<String, String> map = new HashMap<>();
map.put("flag", "1");
map.put("flag", "4");
map.put("today", "%"+today+"%");
JSONArray resultJSONArray = WQL.getWO("TASK_AUTOWEBSOCKETTSK").addParamMap(map).process().getResultJSONArray(0);

166
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -257,5 +257,171 @@
ENDQUERY
ENDIF
IF 输入.flag = "4"
QUERY
SELECT
mst.input_time AS input_time,
mst.repair_code AS repair_code,
(
CASE
mst.maintenancecycle
WHEN '01' THEN '计划维修'
WHEN '02' THEN '临时维修'
END
) AS maintenancecycle,
file.device_code,
file.device_name,
(
CASE
mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '04' THEN '委外维修'
WHEN '05' THEN '委外验收'
WHEN '06' THEN '结束'
WHEN '07' THEN '确认'
WHEN '99' THEN '审核'
END
) AS invstatus,
mst.real_start_date,
mst.real_end_date,
dept.name AS dept_name,
file.extend_code AS extend_code,
(
CASE
mst.fault_level
WHEN '01' THEN '紧急'
WHEN '02' THEN '一般'
WHEN '03' THEN '不紧急'
END
) AS fault_level,
mst.update_optname AS user_name,
mst.fault_desc AS fault_desc,
mst.invstatus AS status
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE
mst.is_delete = '0'
AND (mst.invstatus <> '99')
AND ( ISNULL( mst.source_bill_id ) OR mst.source_bill_type = 'WXJH' )
UNION
SELECT
st.create_time AS input_time,
st.request_code AS repair_code,
class.class_name AS maintenancecycle,
file.device_code,
file.device_name,
(
CASE
st.is_passed
WHEN '0' THEN
(
CASE st.is_passed
WHEN '0' THEN '不通过'
WHEN '1' THEN '通过'
END
)
WHEN '1' THEN
(
CASE mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '04' THEN '委外维修'
WHEN '05' THEN '委外验收'
WHEN '06' THEN '结束'
WHEN '07' THEN '确认'
WHEN '99' THEN '审核'
END
)
END
) AS invstatus,
mst.real_start_date,
mst.real_end_date,
dept.name AS dept_name,
file.extend_code AS extend_code,
(
CASE
st.fault_level
WHEN '01' THEN '紧急'
WHEN '02' THEN '一般'
WHEN '03' THEN '不紧急'
END
) AS fault_level,
mst.update_optname AS user_name,
mst.fault_desc AS fault_desc,
mst.invstatus AS status
FROM
EM_BI_DeviceRepairRequest st
LEFT JOIN EM_BI_EquipmentFile file ON st.devicerecord_id = file.devicerecord_id
LEFT JOIN md_pb_classstandard class ON class.class_id = st.device_faultclass_id
LEFT JOIN EM_BI_DeviceRepairMst mst ON mst.source_bill_id = st.request_id
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE
st.is_delete = '0'
AND (st.status <> '99')
AND mst.source_bill_type = 'BXD'
UNION
SELECT
mst.input_time AS input_time,
mst.maint_code AS repair_code,
(
CASE
mst.maintenancecycle
WHEN '01' THEN '计划保养'
WHEN '02' THEN '临时保养'
END
) AS maintenancecycle,
file.device_code,
file.device_name,
(
CASE
mst.invstatus
WHEN '01' THEN '生成'
WHEN '02' THEN '提交'
WHEN '03' THEN '开始'
WHEN '04' THEN '结束'
WHEN '05' THEN '确认'
WHEN '99' THEN '审核'
END
) AS invstatus,
mst.real_start_date,
mst.real_end_date,
dept.name AS dept_name,
file.extend_code AS extend_code,
(
CASE
mst.plan_start_date
WHEN '01' THEN '紧急'
WHEN '02' THEN '一般'
WHEN '03' THEN '不紧急'
END
) AS fault_level,
mst.update_optid AS user_name,
'' AS fault_desc,
mst.invstatus AS status
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON mst.devicerecord_id = file.devicerecord_id
LEFT JOIN sys_dept dept ON dept.dept_id = file.use_deptid
WHERE
mst.is_delete = '0'
AND (mst.invstatus <> '99')
order by input_time DESC
ENDSELECT
ENDQUERY
ENDIF

30
mes/qd/src/views/wms/sb/stat/task/bigScreen.vue
View File

@@ -2,20 +2,20 @@
<div class="login" :style="'background-image:url('+ Background +');'">
<div style="font-size: 22px; color: #f4f4f5; padding: 6px 50px 6px 700px;background-color: transparent">当日任务列表</div>
<div class="t_btn2">
<el-table border style="width: 100%;" :data="tableData" max-height="800" :row-style="setRowStyle" :highlight-current-row="true" >
<el-table border style="width: 100%;" :data="tableData" max-height="800" :cell-style="cellStyle" :row-style="setRowStyle" :highlight-current-row="true" >
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="input_time" label="生成时间" show-overflow-tooltip />
<el-table-column prop="repair_code" label="任务号" />
<el-table-column prop="repair_code" label="任务号" show-overflow-tooltip />
<el-table-column prop="maintenancecycle" label="任务类型" />
<el-table-column prop="fault_level" label="故障等级" />
<!-- <el-table-column prop="" label="部门" />-->
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="fault_desc" label="故障描述" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="extend_code" label="自编号" />
<el-table-column prop="dept_name" label="使用部门" />
<el-table-column prop="extend_code" label="自编号" show-overflow-tooltip />
<el-table-column prop="dept_name" label="使用部门" show-overflow-tooltip />
<el-table-column prop="invstatus" label="状态" />
<el-table-column prop="user_name" label="维修/保养人" />
<el-table-column prop="real_start_date" label="开始时间" show-overflow-tooltip />
<el-table-column prop="user_name" label="维修/保养人" show-overflow-tooltip />
<el-table-column prop="real_start_date" label="开始时间" show-overflow-tooltip />
<el-table-column prop="real_end_date" label="结束时间" show-overflow-tooltip />
</el-table>
</div>
@@ -53,11 +53,17 @@ export default {
},
methods: {
setRowStyle({ row, rowIndex }) {
const stylejson = {}
if (row.invstatus === '99') {
stylejson.color = 'green'
return stylejson
debugger
const stylejson = {
'font-size': '16px'
}
if (row.status === '06' || row.status === '04') {
stylejson.color = 'yellow'
}
if (row.status === '07' || row.status === '05') {
stylejson.color = 'green'
}
return stylejson
},
// webSocket
init: function() {
@@ -94,7 +100,7 @@ export default {
console.log('socket已经关闭')
},
cellStyle(row, column, rowIndex, columnIndex) {
return 'color: #fff,backgroundColor: transparent,fontSize: fontSize(23),textAlign: center'
return 'fontSize: fontSize(23)'
}
}
}