From 8a7e936b92038a9e5c7de3e1314c43f1346202c1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 01 八月 2024 15:02:29 +0800
Subject: [PATCH] 大理片笼出片逻辑调整：1、尺寸限制 2、fixbug:玻璃重复进出，造成按照历史任务查询笼内玻璃尺寸返回多条记录sql查询异常 3、对列表在新增数据前先按照玻璃id对历史数据进行删除后新增，保证对列表数据唯一，防止大理片笼进片异常
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 0fddaea..9944d58 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
--
Gitblit v1.8.0