From 595b8d1c505777db0d449622419d5e35eaf5cd7f Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:46:59 +0800
Subject: [PATCH] 增加放回接口和绕过全局逻辑方法,还原部门被覆盖代码
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 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 c400f4e..c34be28 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,7 +36,8 @@
QueryWrapper<TemperingGlassInfo> glassinfo = new QueryWrapper<>();
glassinfo.eq("engineer_id", glass.getEngineerId())
.eq("tempering_layout_id", glass.getTemperingLayoutId());
- return temperingMapper.selectList(glassinfo);
+ //return temperingMapper.selectList(glassinfo);
+ return temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
}else {
return null;
}
@@ -45,11 +46,13 @@
@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);
+// 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());
+
}
@Override
@@ -60,11 +63,7 @@
TemperingGlassInfo glass=temperingMapper.selectOne(wrap);
//鏍规嵁宸ョ▼鍙峰拰鐗堝浘鑾峰彇鏁版嵁
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 temperingMapper.selectByEngineerIdAndLayoutId(glass.getEngineerId(),glass.getTemperingLayoutId());
}
return null;
}
@@ -80,11 +79,8 @@
if (glassinfo == null) {
return null; // 鐩存帴杩斿洖null锛岃〃绀烘病鏈夋壘鍒扮鍚堟潯浠剁殑璁板綍
}
- QueryWrapper<TemperingGlassInfo> wrapper = new QueryWrapper<>();
- wrapper.eq("tempering_layout_id",glassinfo.getTemperingLayoutId())
- .eq("engineer_id",glassinfo.getEngineerId());
+ return temperingMapper.selectByEngineerIdAndLayoutId(glassinfo.getEngineerId(),glassinfo.getTemperingLayoutId());
- return temperingMapper.selectList(wrapper);
}
@Override
@@ -106,11 +102,7 @@
@Override
public Integer updateTemperingState(TemperingGlassInfo temperingGlassInfo) {
- UpdateWrapper<TemperingGlassInfo> wrapper = new UpdateWrapper<>();
- wrapper.eq("glass_id",temperingGlassInfo.getGlassId())
- .lt("state",6)
- .set("state", temperingGlassInfo.getState());;
- if (temperingMapper.update(null,wrapper) > 0) {
+ if (temperingMapper.updateTemperingGlassInfo(temperingGlassInfo) > 0) {
return 200;
}else {
return 100;
--
Gitblit v1.8.0