From 4aeb3e87088be598e644796f2bafbe707bfb04fb Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 21 八月 2024 15:14:15 +0800
Subject: [PATCH] 修改标签样式，修改大理片查询磨边队列sql，防止在卧转立前将玻璃放到另一条线进片时出现问题
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 a7da6ff..c400f4e 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,12 +30,16 @@
public List<TemperingGlassInfo> selectWaitingGlass() {
//鑾峰彇绛夊緟杩涚倝涓殑鐜荤拑淇℃伅
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.select("Top 1 *").eq("state",1);
+ wrapper.select("Top 1 *").in("state",1,0);
TemperingGlassInfo glass=temperingMapper.selectOne(wrapper);
- QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
- glassinfo.eq("engineer_id",glass.getEngineerId())
- .eq("tempering_layout_id", glass.getTemperingLayoutId());
- return temperingMapper.selectList(glassinfo);
+ if(glass!=null) {
+ QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
+ glassinfo.eq("engineer_id", glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId());
+ return temperingMapper.selectList(glassinfo);
+ }else {
+ return null;
+ }
}
@Override
@@ -55,11 +59,14 @@
wrap.select("Top 1 *").eq("state",3);
TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
- QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
- wapper.eq("engineer_id",glass.getEngineerId())
- .eq("tempering_layout_id", glass.getTemperingLayoutId())
- .orderByAsc("tempering_layout_id","tempering_feed_sequence");
- return temperingMapper.selectList(wapper);
+ if(glass != null) {
+ QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
+ wapper.eq("engineer_id", glass.getEngineerId())
+ .eq("tempering_layout_id", glass.getTemperingLayoutId())
+ .orderByAsc("tempering_layout_id", "tempering_feed_sequence");
+ return temperingMapper.selectList(wapper);
+ }
+ return null;
}
@Override
@@ -101,7 +108,7 @@
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
- .lt("state",5)
+ .lt("state",6)
.set("state", temperingGlassInfo.getState());;
if (temperingMapper.update(null,wrapper) > 0) {
return 200;
--
Gitblit v1.8.0