From 47c19d0819ed29c9e87f914ce8109128a15a70e8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 09 一月 2025 16:13:08 +0800
Subject: [PATCH] 1、大理片笼详情表新增旋转角度字段 2、原片仓储+上片联调，解决调试过程中的异常情况 3、上片新增定时任务用于扫描正在执行中的工程是否全部上片完成，及完成后的处理
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
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 2240fc8..5e13d71 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
@@ -37,15 +37,15 @@
@Override
public boolean changeTask(String projectId, Integer state) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
- LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- pauseWrapper.set(Engineering::getState,0);
- pauseWrapper.eq(Engineering::getState,1);
- boolean pause = pauseWrapper.update();
+// LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+// pauseWrapper.set(Engineering::getState,0);
+// pauseWrapper.eq(Engineering::getState,1);
+// boolean pause = pauseWrapper.update();
//浣跨敤projectId浣滀负鏉′欢寮�濮嬪伐绋�
LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
wrapper.set(Engineering::getState,state);
wrapper.eq(Engineering::getEngineerId,projectId);
- wrapper.update();
+ boolean pause = wrapper.update();
return pause;
}
@@ -98,7 +98,17 @@
public Engineering selectInitiate(Integer state) {
//鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
- wrapper.eq("state", state);
+ wrapper.eq("state", state)
+ .last("limit 1");
+ return engineeringMapper.selectOne(wrapper);
+ }
+ @Override
+ public Engineering selectInitiates(Integer state,Integer cell) {
+ //鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
+ QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
+ wrapper.eq("state", state)
+ .eq("station_cell", cell)
+ .last("limit 1");
return engineeringMapper.selectOne(wrapper);
}
@@ -119,14 +129,34 @@
public boolean pauseTask(String engineerId, Integer state) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- pauseWrapper.set(Engineering::getState, 0);
- pauseWrapper.eq(Engineering::getState, 1);
+ pauseWrapper.set(Engineering::getState, state);
+ pauseWrapper.eq(Engineering::getEngineerId, engineerId);
return pauseWrapper.update();
}
@Override
- public boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell) {
- return false;
+ public boolean deleteTask(String engineerId) {
+ //鍒犻櫎宸ョ▼琛�
+ QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", engineerId);
+ return this.remove(wrapper);
}
+ @Override
+ public boolean changeTasks(Engineering engineering) {
+ //鏆傚仠姝ｅ湪杩涜宸ョ▼
+ LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+ pauseWrapper.set(Engineering::getState,0);
+ pauseWrapper.eq(Engineering::getState,1);
+ pauseWrapper.eq(Engineering::getStationCell,engineering.getStationCell());
+ pauseWrapper.update();
+
+ LambdaUpdateChainWrapper<Engineering> wrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
+ wrapper.set(Engineering::getState,engineering.getState());
+ wrapper.set(Engineering::getStationCell,engineering.getStationCell());
+ wrapper.eq(Engineering::getEngineerId,engineering.getEngineerId());
+ return wrapper.update();
+ }
+
+
}
--
Gitblit v1.8.0