From 5dee8e0784b69cb3e346a3f9acd549cc726c9e27 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 27 八月 2024 10:00:27 +0800
Subject: [PATCH] 代码恢复
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 537dbdf..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
@@ -36,8 +36,7 @@
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());
+ return temperingMapper.selectList(glassinfo);
}else {
return null;
}
@@ -46,13 +45,11 @@
@Override
public List<TemperingGlassInfo> selectIntoGlass(TemperingGlassInfo temperingGlassInfo) {
//鑾峰彇杩涚倝涓殑鐜荤拑淇℃伅
-// QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
-// wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
-// .eq("engineer_id", temperingGlassInfo.getEngineerId())
-// .orderByAsc("tempering_layout_id","tempering_feed_sequence");
-// return temperingMapper.selectList(wrapper);
- return temperingMapper.selectByEngineerIdAndLayoutId(temperingGlassInfo.getEngineerId(),temperingGlassInfo.getTemperingLayoutId());
-
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("tempering_layout_id", temperingGlassInfo.getTemperingLayoutId())
+ .eq("engineer_id", temperingGlassInfo.getEngineerId())
+ .orderByAsc("tempering_layout_id","tempering_feed_sequence");
+ return temperingMapper.selectList(wrapper);
}
@Override
@@ -63,9 +60,13 @@
TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
if(glass != null) {
- return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
+ 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;
+ return null;
}
@Override
@@ -79,8 +80,11 @@
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
- return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId());
+ QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
+ wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId())
+ .eq("engineer_id",glassinfo.getEngineerId());
+ return temperingMapper.selectList(wrapper);
}
@Override
@@ -93,7 +97,7 @@
}
@Override
- public List<TemperingGlassInfo> selectTaskType() {
+ public List<TemperingGlassInfo> selectTaskType() {
QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
wrapper.select("state")
.groupBy("state");
@@ -102,7 +106,11 @@
@Override
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
- if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) {
+ UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
+ wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
+ .lt("state",6)
+ .set("state", temperingGlassInfo.getState());;
+ if (temperingMapper.update(null,wrapper) > 0) {
return 200;
}else {
return 100;
--
Gitblit v1.8.0