From 999ac56a03c8221a084a3afab870d258dd4d9741 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 21 十一月 2024 17:09:40 +0800
Subject: [PATCH] 预览状态，开始上片，暂停接口完善，前端页面新增字段
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
index 5f31161..c1f9b24 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java
@@ -56,12 +56,16 @@
@Override
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId,upPattenUsage.getEngineeringId());
+ wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId())
+ .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
+ .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+
return this.list(wrapper);
+ //浣�
}
@Override
- @DS("pp")
+ @DS("pp") //閫欒！鍙偝浜嗗伐绋嬭櫉
public List<UpPattenUsage> selectSaveUpPattenUsage(String engineeringId) {
List<OptimizeUpPattenUsage> upPattenUsageList = null;
@@ -104,16 +108,25 @@
@Override
public void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state) {
upPattenUsage.setState(state);
- boolean updateSuccess=this.updateById(upPattenUsage);
- log.info("鏇存柊鐘舵�亄}",updateSuccess);
+ boolean updateSuccess = this.updateById(upPattenUsage);
+ log.info("鏇存柊鐘舵�亄}", updateSuccess);
//鏇存柊鐘舵��
}
@Override
- public UpPattenUsage selectedEngineering(String engineeringId) {
- QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id",engineeringId)
+ public UpPattenUsage selectedTaskEngineering(String engineeringId) {
+ return null;
+ }
+
+ @Override
+ public UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id", engineerId)
+ .eq("station_cell", stationCell)
+ .eq("film_remove", filmRemove)
.last("limit 1");
+ log.info("鏌ヨ棰勮鍙傛暟");
+ log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
--
Gitblit v1.8.0