From c6cb57f307b0c62a05cac78cfd828c313f10e611 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 四月 2025 10:58:25 +0800
Subject: [PATCH] 1、卧式理片笼新增任务逻辑 2、入参时间加入时区
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 32b1480..93cfed3 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -7,6 +7,8 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -33,6 +35,8 @@
OptimizeProjectMapper optimizeProjectMapper;
@Autowired
private EngineeringMapper engineeringMapper;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
//寮�濮�/鏆傚仠浠诲姟
@Override
@@ -114,16 +118,29 @@
}
@Override
- public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
- return null;
+ public Engineering selectUpInitiate(String engineerId) {
+ QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", engineerId)
+ .last("limit 1");
+ return engineeringMapper.selectOne(wrapper);
+
}
@Override
- @DS("hangzhoumes")
+ public GlassInfo selectGlassinfoIsnull(String engineerId) {
+ QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineer_id", engineerId)
+ .last("limit 1");
+ return glassInfoMapper.selectOne(wrapper);
+
+ }
+
+ @Override
+ @DS("northGlassMes")
public List<Engineering> selectTask() {
//鏌ヨ鍙紑濮嬩换鍔＄殑宸ョ▼
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
-// wrapper.eq("state", 0);
+ wrapper.eq("state", 5);
return engineeringMapper.selectList(wrapper);
}
@@ -131,7 +148,7 @@
public boolean pauseTask(String engineerId, Integer state) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- pauseWrapper.set(Engineering::getState, state);
+ pauseWrapper.set(Engineering::getState, 5);
pauseWrapper.eq(Engineering::getEngineerId, engineerId);
return pauseWrapper.update();
}
--
Gitblit v1.8.0