From b94ae4d8f439b78a419da97d12e863d41ac4c181 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 10 十二月 2024 18:57:43 +0800
Subject: [PATCH] 1、fixbug:玻璃出片调度未将格子置空导致有进片任务，占用同一格的情况 2、大理片笼界面显示缺少任务信息 3、优化钢化推送任务
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 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 6be3bd5..06dc5bb 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
@@ -2,6 +2,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -9,6 +10,7 @@
import org.springframework.stereotype.Service;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -22,22 +24,27 @@
@Service
@DS("salve_hangzhoumes")
public class TemperingGlassInfoServiceImpl extends MPJBaseServiceImpl<TemperingGlassInfoMapper, TemperingGlassInfo> implements TemperingGlassInfoService {
- @Autowired
+ @Resource
TemperingGlassInfoMapper temperingMapper;
@Override
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).orderByDesc("id");
+
+ TemperingGlassInfo glass = temperingMapper.selectOne(wrapper);
+ if (glass != null) {
+ this.update(new LambdaUpdateWrapper<TemperingGlassInfo>().set(TemperingGlassInfo::getState, 2).in(TemperingGlassInfo::getState, 0, 1)
+ .and(e -> e.ne(TemperingGlassInfo::getEngineerId, glass.getEngineerId())
+ .or(e1 -> e1.eq(TemperingGlassInfo::getEngineerId, glass.getEngineerId())
+ .ne(TemperingGlassInfo::getTemperingLayoutId, glass.getTemperingLayoutId()))));
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;
}
}
@@ -50,7 +57,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());
}
@@ -58,13 +65,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
@@ -74,11 +81,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());
}
@@ -86,7 +93,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);
@@ -104,24 +111,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("tempering_layout_id",id);
- TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
- if(glass!=null) {
+ wrapper.select("Top 1 *").in("state", 1, 0).eq("tempering_layout_id", 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)
.orderByDesc("tempering_layout_id")
- .orderByAsc("tempering_feed_sequence");
+ .orderByAsc("tempering_feed_sequence");
return temperingMapper.selectList(glassinfo);
// result= temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
}
--
Gitblit v1.8.0