From 3e0136494253e17019801f0d2c07fc7c65acaeb5 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 22 十一月 2024 14:18:47 +0800
Subject: [PATCH] 预览成功删除线路与除膜状态，更改开始上片逻辑，页面样式更改
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 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 c1f9b24..0cfcb0c 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,16 +56,15 @@
@Override
public List<UpPattenUsage> selectUpPattenUsage(UpPattenUsage upPattenUsage) {
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId, upPattenUsage.getEngineeringId())
- .eq(UpPattenUsage::getStationCell, upPattenUsage.getStationCell())
- .eq(UpPattenUsage::getFilmRemove, upPattenUsage.getFilmRemove());
+ 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;
@@ -119,11 +118,11 @@
}
@Override
- public UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell) {
+ public UpPattenUsage selectedEngineering(String engineerId) {
QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
wrapper.eq("engineering_id", engineerId)
- .eq("station_cell", stationCell)
- .eq("film_remove", filmRemove)
+// .eq("station_cell", stationCell)
+// .eq("film_remove", filmRemove)
.last("limit 1");
log.info("鏌ヨ棰勮鍙傛暟");
log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
--
Gitblit v1.8.0