From 2c0efecea0ed579ce66b69548d9c02e76e56d1f1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 16 十二月 2024 09:22:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java | 7 +++
UI-Project/src/views/Returns/returns.vue | 42 +++++++++++++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 8 ++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 7 +++
UI-Project/src/lang/zh.js | 2 +
UI-Project/src/views/hollow/hollowequipment.vue | 4 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java | 3 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java | 4 +-
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 2 +
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 19 +++++++++
10 files changed, 93 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 113d83b..48fa55d 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -108,6 +108,8 @@
takeon:'鎽嗙墖瀹屾垚',
},
searchOrder:{
+ deleteTask:'鍒犻櫎宸ョ▼',
+ pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
fullfurnaces:'婊＄倝鏁伴噺',
specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index f7a9744..c286673 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/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">
diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 7437db2..054b86e 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/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>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
index b2a6af1..29e4484 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/GlassInfoService.java
+++ b/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);
}
+
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
index d776817..61cd868 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/service/impl/GlassInfoServiceImpl.java
@@ -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);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 5e9e82d..7d41df4 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/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
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
index 23b8d67..599c053 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/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);
}
+
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 3b1819f..dd50586 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -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);
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 9bcefd7..0e512cf 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -58,5 +58,7 @@
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
+ void deleteTask(String engineerId);
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 409cfb2..41f369a 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -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);
+ }
+
}
--
Gitblit v1.8.0