From b2430c5d1b6edf6b608c1fecf25979a4e4ef17fe Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 16 十二月 2024 15:33:45 +0800
Subject: [PATCH] 更改删除工程逻辑，改为显示未进卧式理片的小片信息
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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..dff0ba9 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
@@ -1,5 +1,6 @@
package com.mes.uppattenusage.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,7 +8,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 +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;
@@ -101,8 +100,15 @@
@Override
public void saveUpPattenUsage(List<UpPattenUsage> upPattenUsage) {
- this.saveBatch(upPattenUsage);
- //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ if (CollectionUtil.isEmpty(upPattenUsage)){
+ return;
+ }
+ String engineerId = upPattenUsage.get(0).getEngineeringId();
+ int count = this.count(new LambdaQueryWrapper<UpPattenUsage>().eq(UpPattenUsage::getEngineeringId, engineerId));
+ if (count <=0){
+ //淇濆瓨鍘熺墖浣跨敤璇︽儏琛�
+ this.saveBatch(upPattenUsage);
+ }
}
@Override
@@ -119,15 +125,22 @@
}
@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));
return this.getOne(wrapper);
+ }
+
+ @Override
+ public void deleteTask(String engineerId) {
+ QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id",engineerId);
+ this.remove(wrapper);
}
@Override
@@ -158,6 +171,10 @@
}
@Override
+ public List<Engineering> setRawGlassTaskRequest(Engineering request) {
+ return null;
+ }
+
public Object Engineering(Engineering request) {
return null;
}
--
Gitblit v1.8.0