UI-Project/src/lang/zh.js
@@ -108,6 +108,8 @@ takeon:'摆片完成', }, searchOrder:{ deleteTask:'删除工程', pdeleteTask:'是否删除工程？', searchlayout:'非钢化流程卡查询', fullfurnaces:'满炉数量', specifiedproject:'当前指定工程', UI-Project/src/views/Returns/returns.vue
@@ -462,6 +462,33 @@ console.error(error); } } // 删除 const deleteTask = async () => { try { let engineeringId = window.localStorage.getItem('engineeringId') console.log(engineeringId); if (engineeringId !== '') { const response = await request.post('/loadGlass/engineering/engineering/deleteTask', { engineerId: engineeringId, }) if (response.code == 200) { ElMessage.success(response.message); blindb.value = false; } else { ElMessage.error(response.message); } } else { ElMessage({ type: 'info', message: t('basicData.infonull'), }) } } catch (error) { console.error(error); } } // 停止任务 const handleb = async () => { try { @@ -522,6 +549,10 @@ // 暂停 const handleBinda = (row) => { blinda.value = true; }; // 删除 const handledelete = (row) => { blindb.value = true; }; // 停止任务 const handleBindb = (row) => { @@ -609,6 +640,7 @@ <el-button :disabled="!canSelectProject" style="margin-top: 5px;margin-left: 15px;" type="primary" @click="selectproject">{{ $t('basicData.selectproject') }}</el-button> <el-button :disabled="!canSelectProject" :style="{ backgroundColor: canStartLoading ? 'green' : 'initial',color: canStartLoading ? 'white' : 'black', }" style="margin-top: 5px;margin-left: 20px;" @click="handleBind">{{ $t('basicData.startloading') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handledelete">{{ $t('searchOrder.deleteTask') }}</el-button> <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlezhiban">{{ $t('searchOrder.dutyinformation') }}</el-button> <!-- <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="handleBindb">停止任务</el-button> --> <el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading"> @@ -705,6 +737,16 @@ </div> </template> </el-dialog> <el-dialog v-model="blindb" top="30vh" width="25%" :title="$t('searchOrder.pdeleteTask')"> <template #footer> <div id="dialog-footer"> <el-button type="primary" @click="deleteTask"> {{ $t('basicData.confirm') }} </el-button> <el-button @click="blindb = false">{{ $t('basicData.cancel') }}</el-button> </div> </template> </el-dialog> <!-- <el-dialog v-model="blindb" top="30vh" width="25%" title="是否停止任务?" > <template #footer> <div id="dialog-footer"> UI-Project/src/views/hollow/hollowequipment.vue
@@ -48,8 +48,8 @@ <el-table-column prop="layoutSequence" :label="$t('hellow.coatingtypes')" align="center"/> <el-table-column prop="layoutSequence" :label="$t('hellow.height')" align="center"/> <el-table-column prop="layoutSequence" :label="$t('hellow.width')" align="center"/> <el-table-column prop="layoutSequence" :label="$t('hellow.state')" align="center"/> </el-table> <el-table-column prop="layoutSequence" :label="123" align="center"/> </el-table> <div style="float: right;"> <el-pagination layout="prev, pager, next" :total="50"/> </div> hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
@@ -33,7 +33,7 @@ List<Map<String, Object>> getFlowCardId(); void deleteTask(String engineerId); }
@@ -137,5 +137,12 @@ return result; } @Override public void deleteTask(String engineerId) { QueryWrapper<GlassInfo> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("engineer_id", engineerId); baseMapper.delete(queryWrapper); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -91,12 +91,29 @@ if (work) { return Result.build(200, "保存成功"+engineering.getEngineerId(), true); }else { return Result.build(200, "保存失败"+engineering.getEngineerId(), false); return Result.build(200, "保存成功"+engineering.getEngineerId(), false); } } } @ApiOperation("删除工程上片") @PostMapping("/deleteTask") //调用上片任务 @ResponseBody public Result <Boolean> deleteTask(@RequestBody Engineering engineering) { //删除工程表、小片表、上片表，更改优化表状态 boolean work=engineeringService.deleteTask(engineering.getEngineerId()); glassInfoService.deleteTask(engineering.getEngineerId()); upPattenUsageService.deleteTask(engineering.getEngineerId()); optimizeProjectService.changeTask(engineering.getEngineerId(), 100); if (work) { return Result.build(200, "删除成功"+engineering.getEngineerId(), true); }else { return Result.build(200, "删除失败"+engineering.getEngineerId(), false); } } @ApiOperation("查询可以上片的工程号") @GetMapping("/selectTask") //调用上片任务 @ResponseBody hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -42,4 +42,7 @@ List<Engineering> selectTask(); boolean pauseTask(String engineerId, Integer state); boolean deleteTask(String engineerId); }
@@ -119,4 +119,12 @@ return pauseWrapper.update(); } @Override public boolean deleteTask(String engineerId) { //删除工程表 QueryWrapper<Engineering> wrapper = new QueryWrapper<>(); wrapper.eq("engineer_id", engineerId); return this.remove(wrapper); } } hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -58,5 +58,7 @@ */ Boolean updateGlassState(UpPattenUsage upPattenUsage); void deleteTask(String engineerId); }
@@ -143,5 +143,12 @@ return this.update(updateWrapper); } @Override public void deleteTask(String engineerId) { QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>(); wrapper.eq("engineering_id",engineerId); this.remove(wrapper); } }
