From 3633e4fac369d00b8da0c2fd4f867df097fa083a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 02 一月 2025 14:13:19 +0800
Subject: [PATCH] 添加取消出片任务
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 8117246..30be731 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -30,15 +30,15 @@
public List<TemperingGlassInfo> selectWaitingGlass() {
//鑾峰彇绛夊緟杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("Top 1 *").in("state",1,0);
- TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
- if(glass!=null) {
+ wrapper.select("Top 1 *").in("state", 1, 0, -1);
+ TemperingGlassInfo glass = temperingMapper.selectOne(wrapper);
+ if (glass != null) {
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
glassinfo.eq("engineer_id", glass.getEngineerId())
.eq("tempering_layout_id", glass.getTemperingLayoutId());
//return temperingMapper.selectList(glassinfo);
- return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
- }else {
+ return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(), glass.getTemperingLayoutId());
+ } else {
return null;
}
}
@@ -51,7 +51,7 @@
// .eq("engineer_id", temperingGlassInfo.getEngineerId())
// .orderByAsc("tempering_layout_id","tempering_feed_sequence");
// return temperingMapper.selectList(wrapper);
- return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId());
+ return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(), temperingGlassInfo.getTemperingLayoutId());
}
@@ -59,13 +59,13 @@
public List<TemperingGlassInfo> selectOutGlass() {
//鑾峰彇鍑虹倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
- wrap.select("Top 1 *").eq("state",3);
- TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
+ wrap.select("Top 1 *").eq("state", 3);
+ TemperingGlassInfo glass = temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
- if(glass != null) {
- return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ if (glass != null) {
+ return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(), glass.getTemperingLayoutId());
}
- return null;
+ return null;
}
@Override
@@ -75,11 +75,11 @@
wapper.select("Top 1 *").eq("state", 4)
.orderByDesc("tempering_layout_id,engineer_id");
//鏍规嵁鏈�澶х殑鐗堝浘id鏄剧ず閽㈠寲鍚庣殑鐗堝浘淇℃伅
- TemperingGlassInfo glassinfo= temperingMapper.selectOne(wapper);
+ TemperingGlassInfo glassinfo = temperingMapper.selectOne(wapper);
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
- return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId());
+ return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(), glassinfo.getTemperingLayoutId());
}
@@ -87,7 +87,7 @@
public List<TemperingGlassInfo> selectLayoutId() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.select("tempering_layout_id,engineer_id,max(id) as id")
- .eq("state",2)
+ .eq("state", 2)
.groupBy("tempering_layout_id,engineer_id")
.orderByAsc("id");
return temperingMapper.selectList(wrapper);
@@ -105,24 +105,23 @@
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) {
return 200;
- }else {
+ } else {
return 100;
}
}
@Override
- public List<TemperingGlassInfo> selectGlassInfoById(Integer id)
- {
- List<TemperingGlassInfo> result=null;
+ public List<TemperingGlassInfo> selectGlassInfoById(Integer id) {
+ List<TemperingGlassInfo> result = null;
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("Top 1 *").in("state",1,0).eq("temperingLayoutId",id);
- TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
- if(glass!=null) {
+ wrapper.select("Top 1 *").in("state", 1, 0).eq("temperingLayoutId", id);
+ TemperingGlassInfo glass = temperingMapper.selectOne(wrapper);
+ if (glass != null) {
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
glassinfo.eq("engineer_id", glass.getEngineerId())
.eq("tempering_layout_id", id);
//return temperingMapper.selectList(glassinfo);
- result= temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ result = temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(), glass.getTemperingLayoutId());
}
return result;
}
--
Gitblit v1.8.0