diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentChecklist.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentChecklist.java index 2ccfeddc..e99ffa1e 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentChecklist.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentChecklist.java @@ -39,5 +39,8 @@ public class EqpEquipmentChecklist extends BaseEntity { @Excel(name = "备注") private String remark; + @Excel(name = "产线") + private String productionLine; + private String delFlag; } diff --git a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentInspectionRecord.java b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentInspectionRecord.java index dbfdd5e6..34cc54a5 100644 --- a/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentInspectionRecord.java +++ b/ruoyi-mill/src/main/java/com/ruoyi/mill/domain/EqpEquipmentInspectionRecord.java @@ -52,6 +52,7 @@ public class EqpEquipmentInspectionRecord extends BaseEntity { private String checkContent; private String checkStandard; private String partName; + private String productionLine; // 时间范围查询参数 private String startInspectTime; diff --git a/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentChecklistMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentChecklistMapper.xml index f40c7787..007e9e9c 100644 --- a/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentChecklistMapper.xml +++ b/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentChecklistMapper.xml @@ -12,6 +12,7 @@ + @@ -20,29 +21,31 @@ - select check_id, check_no, part_id, part_name, check_content, equipment_state, - check_standard, responsible_person, remark, del_flag, - create_by, create_time, update_by, update_time - from eqp_equipment_checklist + select c.check_id, c.check_no, c.part_id, c.part_name, c.check_content, c.equipment_state, + c.check_standard, c.responsible_person, c.remark, p.production_line, c.del_flag, + c.create_by, c.create_time, c.update_by, c.update_time + from eqp_equipment_checklist c + left join eqp_equipment_part p on c.part_id = p.part_id and p.del_flag = '0' diff --git a/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentInspectionRecordMapper.xml b/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentInspectionRecordMapper.xml index 2c252d8f..33d82e8c 100644 --- a/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentInspectionRecordMapper.xml +++ b/ruoyi-mill/src/main/resources/mapper/mill/EqpEquipmentInspectionRecordMapper.xml @@ -21,15 +21,17 @@ + diff --git a/ruoyi-ui/src/api/cost/prodDetail.js b/ruoyi-ui/src/api/cost/prodDetail.js index 6faf103a..3d964923 100644 --- a/ruoyi-ui/src/api/cost/prodDetail.js +++ b/ruoyi-ui/src/api/cost/prodDetail.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询生产成本明细列表 export function listProdDetail(query) { return request({ - url: '/cost/prodDetail/list', + url: '/cost/detail/list', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function listProdDetail(query) { // 查询生产成本明细详细 export function getProdDetail(detailId) { return request({ - url: '/cost/prodDetail/' + detailId, + url: '/cost/detail/' + detailId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProdDetail(detailId) { // 新增生产成本明细 export function addProdDetail(data) { return request({ - url: '/cost/prodDetail', + url: '/cost/detail', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProdDetail(data) { // 修改生产成本明细 export function updateProdDetail(data) { return request({ - url: '/cost/prodDetail', + url: '/cost/detail', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProdDetail(data) { // 删除生产成本明细 export function delProdDetail(detailId) { return request({ - url: '/cost/prodDetail/' + detailId, + url: '/cost/detail/' + detailId, method: 'delete' }) } @@ -46,7 +46,7 @@ export function delProdDetail(detailId) { // 批量保存生产成本明细（先删除再插入） export function batchSaveProdDetail(data) { return request({ - url: '/cost/prodDetail/batch', + url: '/cost/detail/batch', method: 'post', data: data }) diff --git a/ruoyi-ui/src/api/cost/prodMetric.js b/ruoyi-ui/src/api/cost/prodMetric.js index e07730b4..12853533 100644 --- a/ruoyi-ui/src/api/cost/prodMetric.js +++ b/ruoyi-ui/src/api/cost/prodMetric.js @@ -3,16 +3,16 @@ import request from '@/utils/request' // 查询生产指标明细列表 export function listProdMetric(query) { return request({ - url: '/cost/prodMetric/list', + url: '/cost/metric/list', method: 'get', - params: query + params: { ...query } }) } // 查询生产指标明细详细 export function getProdMetric(metricId) { return request({ - url: '/cost/prodMetric/' + metricId, + url: '/cost/metric/' + metricId, method: 'get' }) } @@ -20,7 +20,7 @@ export function getProdMetric(metricId) { // 新增生产指标明细 export function addProdMetric(data) { return request({ - url: '/cost/prodMetric', + url: '/cost/metric', method: 'post', data: data }) @@ -29,7 +29,7 @@ export function addProdMetric(data) { // 修改生产指标明细 export function updateProdMetric(data) { return request({ - url: '/cost/prodMetric', + url: '/cost/metric', method: 'put', data: data }) @@ -38,7 +38,7 @@ export function updateProdMetric(data) { // 删除生产指标明细 export function delProdMetric(metricId) { return request({ - url: '/cost/prodMetric/' + metricId, + url: '/cost/metric/' + metricId, method: 'delete' }) } diff --git a/ruoyi-ui/src/api/cost/prodReport.js b/ruoyi-ui/src/api/cost/prodReport.js index b369c5b1..57ccfa8b 100644 --- a/ruoyi-ui/src/api/cost/prodReport.js +++ b/ruoyi-ui/src/api/cost/prodReport.js @@ -1,18 +1,19 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' // 查询生产月报列表 export function listProdReport(query) { return request({ - url: '/cost/prodReport/list', + url: '/cost/report/list', method: 'get', - params: query + params: { ...query, lineType: lineId } }) } // 查询生产月报详细 export function getProdReport(reportId) { return request({ - url: '/cost/prodReport/' + reportId, + url: '/cost/report/' + reportId, method: 'get' }) } @@ -20,25 +21,25 @@ export function getProdReport(reportId) { // 新增生产月报 export function addProdReport(data) { return request({ - url: '/cost/prodReport', + url: '/cost/report', method: 'post', - data: data + data: { ...data, lineType: lineId } }) } // 修改生产月报 export function updateProdReport(data) { return request({ - url: '/cost/prodReport', + url: '/cost/report', method: 'put', - data: data + data: { ...data, lineType: lineId } }) } // 删除生产月报 export function delProdReport(reportId) { return request({ - url: '/cost/prodReport/' + reportId, + url: '/cost/report/' + reportId, method: 'delete' }) } @@ -46,8 +47,8 @@ export function delProdReport(reportId) { // 复制生产月报 export function copyProdReport(sourceId, data) { return request({ - url: '/cost/prodReport/copy/' + sourceId, + url: '/cost/report/copy/' + sourceId, method: 'post', - data: data + data: { ...data } }) } diff --git a/ruoyi-ui/src/api/mill/coilAbnormalRelation.js b/ruoyi-ui/src/api/mill/coilAbnormalRelation.js index 284f74ed..9cebac71 100644 --- a/ruoyi-ui/src/api/mill/coilAbnormalRelation.js +++ b/ruoyi-ui/src/api/mill/coilAbnormalRelation.js @@ -42,3 +42,20 @@ export function delRelation(relationId) { method: 'delete' }) } + +// 挂接：将二级异常数据新增到三级异常表 +export function bindRelation(secondAbnormalId) { + return request({ + url: '/mill/relation/bind/' + secondAbnormalId, + method: 'post' + }) +} + +// 撤回：逻辑删除三级异常表中的挂接数据 +export function withdrawRelation(relationId, data) { + return request({ + url: '/mill/relation/withdraw/' + relationId, + method: 'post', + data: data + }) +} diff --git a/ruoyi-ui/src/api/mill/equipmentChecklist.js b/ruoyi-ui/src/api/mill/equipmentChecklist.js index 971f3e47..5025a8ba 100644 --- a/ruoyi-ui/src/api/mill/equipmentChecklist.js +++ b/ruoyi-ui/src/api/mill/equipmentChecklist.js @@ -1,7 +1,9 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' + export function listEquipmentChecklist(query) { - return request({ url: '/mill/eqp/checklist/list', method: 'get', params: query }) + return request({ url: '/mill/eqp/checklist/list', method: 'get', params: { ...query, productionLine: lineId } }) } export function getEquipmentChecklist(checkId) { @@ -9,11 +11,11 @@ export function getEquipmentChecklist(checkId) { } export function addEquipmentChecklist(data) { - return request({ url: '/mill/eqp/checklist', method: 'post', data: data }) + return request({ url: '/mill/eqp/checklist', method: 'post', data: { ...data, productionLine: lineId } }) } export function updateEquipmentChecklist(data) { - return request({ url: '/mill/eqp/checklist', method: 'put', data: data }) + return request({ url: '/mill/eqp/checklist', method: 'put', data: { ...data, productionLine: lineId } }) } export function delEquipmentChecklist(checkId) { diff --git a/ruoyi-ui/src/api/mill/equipmentInspectionRecord.js b/ruoyi-ui/src/api/mill/equipmentInspectionRecord.js index ee834dff..c4027ff1 100644 --- a/ruoyi-ui/src/api/mill/equipmentInspectionRecord.js +++ b/ruoyi-ui/src/api/mill/equipmentInspectionRecord.js @@ -1,7 +1,8 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' export function listEquipmentInspectionRecord(query) { - return request({ url: '/mill/eqp/record/list', method: 'get', params: query }) + return request({ url: '/mill/eqp/record/list', method: 'get', params: { ...query, productionLine: lineId } }) } export function getEquipmentInspectionRecord(recordId) { @@ -9,11 +10,11 @@ export function getEquipmentInspectionRecord(recordId) { } export function addEquipmentInspectionRecord(data) { - return request({ url: '/mill/eqp/record', method: 'post', data: data }) + return request({ url: '/mill/eqp/record', method: 'post', data: { ...data, productionLine: lineId } }) } export function updateEquipmentInspectionRecord(data) { - return request({ url: '/mill/eqp/record', method: 'put', data: data }) + return request({ url: '/mill/eqp/record', method: 'put', data: { ...data, productionLine: lineId } }) } export function delEquipmentInspectionRecord(recordId) { diff --git a/ruoyi-ui/src/api/mill/equipmentPart.js b/ruoyi-ui/src/api/mill/equipmentPart.js index d6f48456..b5603130 100644 --- a/ruoyi-ui/src/api/mill/equipmentPart.js +++ b/ruoyi-ui/src/api/mill/equipmentPart.js @@ -1,7 +1,8 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' export function listEquipmentPart(query) { - return request({ url: '/mill/eqp/part/list', method: 'get', params: query }) + return request({ url: '/mill/eqp/part/list', method: 'get', params: { ...query, productionLine: lineId } }) } export function getEquipmentPart(partId) { @@ -9,11 +10,11 @@ export function getEquipmentPart(partId) { } export function addEquipmentPart(data) { - return request({ url: '/mill/eqp/part', method: 'post', data: data }) + return request({ url: '/mill/eqp/part', method: 'post', data: { ...data, productionLine: lineId } }) } export function updateEquipmentPart(data) { - return request({ url: '/mill/eqp/part', method: 'put', data: data }) + return request({ url: '/mill/eqp/part', method: 'put', data: { ...data, productionLine: lineId } }) } export function delEquipmentPart(partId) { diff --git a/ruoyi-ui/src/api/mill/rollChange.js b/ruoyi-ui/src/api/mill/rollChange.js index 8bcf5a7d..0e4506ae 100644 --- a/ruoyi-ui/src/api/mill/rollChange.js +++ b/ruoyi-ui/src/api/mill/rollChange.js @@ -1,36 +1,37 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' // 查询换辊记录分页列表（支持按产线、机架、类型、时间筛选） export function listRollChange(query) { return request({ - url: '/mes/rollChange/list', + url: '/mill/change/list', method: 'get', - params: query + params: { ...query, lineId: lineId } }) } // 查询指定产线+机架当前在机轧辊（最近一次换辊记录） -export function getCurrentRolls(lineId, standNo) { +export function getCurrentRolls(_, standNo) { return request({ - url: '/mes/rollChange/current', + url: '/mill/change/current', method: 'get', - params: { lineId, standNo } + params: { lineId: lineId, standNo } }) } // 查询指定产线各机架各辊位实时工作绩效（workLength/coilCount/totalWeight） -export function getRollPerformance(lineId) { +export function getRollPerformance(_) { return request({ - url: '/mes/rollChange/performance', + url: '/mill/change/performance', method: 'get', - params: { lineId } + params: { lineId: lineId } }) } // 查询换辊记录详细 export function getRollChange(changeId) { return request({ - url: '/mes/rollChange/' + changeId, + url: '/mill/change/' + changeId, method: 'get' }) } @@ -38,25 +39,25 @@ export function getRollChange(changeId) { // 新增换辊记录（自动同步辊状态为 Online） export function addRollChange(data) { return request({ - url: '/mes/rollChange', + url: '/mill/change', method: 'post', - data: data + data: { ...data, lineId: lineId } }) } // 修改换辊记录 export function updateRollChange(data) { return request({ - url: '/mes/rollChange', + url: '/mill/change', method: 'put', - data: data + data: { ...data, lineId: lineId } }) } // 删除换辊记录 export function delRollChange(changeIds) { return request({ - url: '/mes/rollChange/' + changeIds, + url: '/mill/change/' + changeIds, method: 'delete' }) } diff --git a/ruoyi-ui/src/api/mill/rollInfo.js b/ruoyi-ui/src/api/mill/rollInfo.js index c3f7a240..25fb4cb5 100644 --- a/ruoyi-ui/src/api/mill/rollInfo.js +++ b/ruoyi-ui/src/api/mill/rollInfo.js @@ -1,7 +1,8 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' export function listRollInfo(query) { - return request({ url: '/mill/roll/info/list', method: 'get', params: query }) + return request({ url: '/mill/roll/info/list', method: 'get', params: { ...query, lineId: lineId } }) } export function getRollStats() { @@ -9,7 +10,7 @@ export function getRollStats() { } export function listRollOptions(rollType, status) { - return request({ url: '/mill/roll/info/options', method: 'get', params: { rollType, status } }) + return request({ url: '/mill/roll/info/options', method: 'get', params: { lineId: lineId, rollType: rollType, status: status } }) } export function getRollInfo(rollId) { @@ -17,11 +18,11 @@ export function getRollInfo(rollId) { } export function addRollInfo(data) { - return request({ url: '/mill/roll/info', method: 'post', data }) + return request({ url: '/mill/roll/info', method: 'post', data: { ...data, lineId: lineId } }) } export function updateRollInfo(data) { - return request({ url: '/mill/roll/info', method: 'put', data }) + return request({ url: '/mill/roll/info', method: 'put', data: { ...data, lineId: lineId } }) } export function delRollInfo(rollIds) { diff --git a/ruoyi-ui/src/api/mill/rollStandby.js b/ruoyi-ui/src/api/mill/rollStandby.js index 5e028436..15446d24 100644 --- a/ruoyi-ui/src/api/mill/rollStandby.js +++ b/ruoyi-ui/src/api/mill/rollStandby.js @@ -1,18 +1,19 @@ import request from '@/utils/request' +import { lineId, lineName } from '@/utils/constant' // 查询指定产线+机架下批轧辊列表 -export function listRollStandby(lineId, standNo) { +export function listRollStandby(_, standNo) { return request({ - url: '/mes/rollStandby/list', + url: '/mill/standby/list', method: 'get', - params: { lineId, standNo } + params: { lineId: lineId, standNo } }) } // 查询下批轧辊详细 export function getRollStandby(standbyId) { return request({ - url: '/mes/rollStandby/' + standbyId, + url: '/mill/standby/' + standbyId, method: 'get' }) } @@ -20,34 +21,34 @@ export function getRollStandby(standbyId) { // 新增下批轧辊（自动同步辊状态为 Standby） export function addRollStandby(data) { return request({ - url: '/mes/rollStandby', + url: '/mill/standby', method: 'post', - data: data + data: { ...data, lineId: lineId } }) } // 修改下批轧辊 export function updateRollStandby(data) { return request({ - url: '/mes/rollStandby', + url: '/mill/standby', method: 'put', - data: data + data: { ...data, lineId: lineId } }) } // 删除单条下批轧辊（自动恢复辊状态为 Offline） export function delRollStandby(standbyId) { return request({ - url: '/mes/rollStandby/' + standbyId, + url: '/mill/standby/' + standbyId, method: 'delete' }) } // 清空指定产线+机架全部下批轧辊 -export function clearRollStandby(lineId, standNo) { +export function clearRollStandby(_, standNo) { return request({ - url: '/mes/rollStandby/clear', + url: '/mill/standby/clear', method: 'delete', - params: { lineId, standNo } + params: { lineId: lineId, standNo } }) } diff --git a/ruoyi-ui/src/store/getters.js b/ruoyi-ui/src/store/getters.js index 5920c6e8..25a70f3b 100644 --- a/ruoyi-ui/src/store/getters.js +++ b/ruoyi-ui/src/store/getters.js @@ -15,5 +15,7 @@ const getters = { topbarRouters:state => state.permission.topbarRouters, defaultRoutes:state => state.permission.defaultRoutes, sidebarRouters:state => state.permission.sidebarRouters, + lineName: state => state.app.lineName, + lineId: state => state.app.lineId, } export default getters diff --git a/ruoyi-ui/src/store/modules/app.js b/ruoyi-ui/src/store/modules/app.js index 5a0ed6c9..e044e678 100644 --- a/ruoyi-ui/src/store/modules/app.js +++ b/ruoyi-ui/src/store/modules/app.js @@ -7,7 +7,9 @@ const state = { hide: false }, device: 'desktop', - size: Cookies.get('size') || 'medium' + size: Cookies.get('size') || 'medium', + lineName: '双机架', + lineId: 5 } const mutations = { diff --git a/ruoyi-ui/src/utils/constant.js b/ruoyi-ui/src/utils/constant.js new file mode 100644 index 00000000..e7baee38 --- /dev/null +++ b/ruoyi-ui/src/utils/constant.js @@ -0,0 +1,2 @@ +export const lineId = '5' +export const lineName = '双机架' \ No newline at end of file diff --git a/ruoyi-ui/src/views/cost/item.vue b/ruoyi-ui/src/views/cost/item.vue index aacacbad..4584f529 100644 --- a/ruoyi-ui/src/views/cost/item.vue +++ b/ruoyi-ui/src/views/cost/item.vue @@ -100,7 +100,7 @@ - + diff --git a/ruoyi-ui/src/views/mill/abnormal/components/AbnormalTable.vue b/ruoyi-ui/src/views/mill/abnormal/components/AbnormalTable.vue index 4c77ffec..4efb3263 100644 --- a/ruoyi-ui/src/views/mill/abnormal/components/AbnormalTable.vue +++ b/ruoyi-ui/src/views/mill/abnormal/components/AbnormalTable.vue @@ -44,10 +44,25 @@ - + + + + @@ -71,6 +86,14 @@ export default { coilInfo: { type: Object, default: () => ({}) + }, + showBindActions: { + type: Boolean, + default: false + }, + relationMap: { + type: Object, + default: () => ({}) } }, dicts: ['coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree'], @@ -85,6 +108,16 @@ export default { this.$emit('update', row); } }, + getRelationStatus(abnormalId) { + const rel = this.relationMap[abnormalId]; + return rel ? rel.bindStatus : 0; + }, + handleBind(row) { + this.$emit('bind', row); + }, + handleWithdraw(row) { + this.$emit('withdraw', row); + }, // 计算目标列的异常挂载时机 // 如果coilInfo.coilId存在，且与row.coilId相同， // 判断钢卷的createBy和row.createBy是否相同 diff --git a/ruoyi-ui/src/views/mill/abnormal/performance.vue b/ruoyi-ui/src/views/mill/abnormal/performance.vue index 61ec51e0..d7bea593 100644 --- a/ruoyi-ui/src/views/mill/abnormal/performance.vue +++ b/ruoyi-ui/src/views/mill/abnormal/performance.vue @@ -168,8 +168,12 @@ :list="abnormalList" :editable="true" :showCoil="false" + :showBindActions="true" + :relationMap="relationMap" @update="handleAbnormalUpdate" @delete="handleAbnormalDelete" + @bind="handleBind" + @withdraw="handleWithdraw" /> @@ -191,12 +195,25 @@ 取 消 + + + + + + + +
+ 确 定 + 取 消 +
+