From 6bf911a38f75341dd5d2b86dad58fa313584a981 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 27 十一月 2024 09:46:13 +0800
Subject: [PATCH] `1、卧理正常第一版本代码提交 2、大理片笼正常版本提交
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 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..0923dd2 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
@@ -7,7 +7,6 @@
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.engineering.entity.Engineering;
-import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
import com.mes.pp.mapper.OptimizeProjectMapper;
@@ -56,16 +55,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 +117,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));
@@ -158,6 +156,10 @@
}
@Override
+ public List<Engineering> setRawGlassTaskRequest(Engineering request) {
+ return null;
+ }
+
public Object Engineering(Engineering request) {
return null;
}
--
Gitblit v1.8.0