From 68c638f6107fc3704ebe5f9ac318233b7e117b95 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 06 十二月 2024 14:24:42 +0800
Subject: [PATCH] 还原上片常州版本，去除义乌数据
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java | 17 +----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/impl/UpPattenUsageServiceImpl.java | 40 +++---------
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java | 14 ----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 25 ++-----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java | 15 +----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java | 16 -----
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java | 10 +-
7 files changed, 33 insertions(+), 104 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
index 07ec598..5e9e82d 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/controller/EngineeringController.java
@@ -54,11 +54,11 @@
@ResponseBody
public Result <List<UpPattenUsage>> pause(@RequestBody Engineering engineering) {
boolean work=engineeringService.pauseTask(engineering.getEngineerId(),engineering.getState());
-// List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
+ List<UpPattenUsage> glass = upPattenUsageService.prioritylist();String message;
if(work){
- return Result.build(200, "鎴愬姛", null);
+ return Result.build(200,"鎴愬姛",glass);
}else {
- return Result.build(100, "鎴愬姛", null);
+ return Result.build(100,"鎴愬姛",glass);
}
}
@@ -69,7 +69,7 @@
log.info("engineeringId:{}", engineering);
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage != null) {
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
return Result.build(200, "宸蹭繚瀛樿繃", work);
@@ -85,7 +85,7 @@
engineeringService.saveEngineering(listEngineering);
log.info("鏇存敼pp琛ㄧ姸鎬佷负宸查鍙�");
//灏唀ngineering琛ㄧ姸鎬佷负姝ｅ湪涓婄墖
- boolean work = engineeringService.changeTask(engineering.getEngineerId(), engineering.getState());
+ boolean work=engineeringService.changeTask(engineering.getEngineerId(),engineering.getState());
List<UpPattenUsage> glass = upPattenUsageService.prioritylist();
optimizeProjectService.changeTask(engineering.getEngineerId(), 200);
if (work) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
index c9576ae..c9321fa 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/entity/Engineering.java
@@ -24,23 +24,13 @@
/**
* 宸ョ▼琛╥d
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ョ▼鍙�
*/
- private String engineerId;
-
- /**
- * 璁惧
- */
- private Integer stationCell;
-
- /**
- * 闄よ啘鏂瑰紡
- */
- private Integer filmRemove;
+ private String engineerId;
/**
* 宸ョ▼鍚嶇О
@@ -107,4 +97,5 @@
*/
private String notes;
+
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
index 6dd056b..23b8d67 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java
@@ -26,34 +26,20 @@
* @return List<Engineering>
*/
List<Engineering> selectEngineering(String engineeringId);
-
/**
* 淇濆瓨閽㈠寲淇℃伅
*/
void saveEngineering(List<Engineering> engineering);
-
/**
* 鏌ヨ鏄惁鏈変笂鐗囦换鍔�
- *
* @return Engineering
*/
Engineering selectInitiate(Integer state);
-
- /**
- * 鏌ヨ鏄惁鏈変笂鐗囦换鍔w
- *
- * @return Engineering
- */
- Engineering selectUpInitiate(Integer state, Integer equipmentId);
-
/**
* 鏌ヨ涓婄墖浠诲姟
- *
* @return Engineering
*/
List<Engineering> selectTask();
boolean pauseTask(String engineerId, Integer state);
-
- boolean changeTask(String engineerId, Integer state, Integer filmRemove, Integer stationCell);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
index 64169f1..3b1819f 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java
@@ -95,17 +95,11 @@
}
@Override
- public Engineering selectInitiate(Integer state) {
+ public Engineering selectInitiate(Integer state) {
//鏌ヨ鏄惁鏈夊紑濮嬩笂鐗囩殑宸ョ▼浠诲姟
QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
- wrapper.eq("state", state)
- .last("limit 1");
+ wrapper.eq("state", state);
return engineeringMapper.selectOne(wrapper);
- }
-
- @Override
- public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
- return null;
}
@Override
@@ -120,10 +114,9 @@
public boolean pauseTask(String engineerId, Integer state) {
//鏆傚仠姝ｅ湪杩涜宸ョ▼
LambdaUpdateChainWrapper<Engineering> pauseWrapper = new LambdaUpdateChainWrapper<>(this.getBaseMapper());
- pauseWrapper.set(Engineering::getState, state);
- pauseWrapper.eq(Engineering::getEngineerId, engineerId);
- return pauseWrapper.update();
+ pauseWrapper.set(Engineering::getState,0);
+ pauseWrapper.eq(Engineering::getState,1);
+ return pauseWrapper.update();
}
-
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index 6ea664c..3d98ea2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -2,6 +2,7 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
+import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -35,8 +36,6 @@
private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
-
-
@ApiOperation("鏄剧ず閫夋嫨鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
@@ -50,19 +49,17 @@
@PostMapping("/selectUpPattenUsage") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
- List<UpPattenUsage> upPattenUsages = null;
+ List<UpPattenUsage> upPattenUsages=null;
UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
- if (upPattenUsage == null) {
-// return Result.build(200, "澶辫触鏃犳暟鎹�", null);
-// upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+ if(upPattenUsage == null){
upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
- } else {
- upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
+ }else {
+ upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
if (!upPattenUsages.isEmpty()) {
return Result.build(200, "鎴愬姛", upPattenUsages);
- } else {
+ }else {
return Result.build(100, "澶辫触", upPattenUsages);
}
@@ -73,19 +70,13 @@
@ResponseBody
public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
- if (whether) {
+ if (whether){
return Result.build(200, "鎴愬姛", whether);
- } else {
+ }else {
return Result.build(100, "澶辫触", whether);
}
}
- @ApiOperation("璁剧疆涓婄墖鏌ヨ鏉′欢")
- @PostMapping("/setUpPattenRequest")
- public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
- log.info("鏌ヨ涓婄墖淇℃伅:{}", request);
- return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.setRawGlassTaskRequest(request));
- }
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
index 2c1e2f8..9bcefd7 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java
@@ -1,7 +1,5 @@
package com.mes.uppattenusage.service;
-
import com.github.yulichang.base.MPJBaseService;
-import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;
import java.util.List;
@@ -38,17 +36,13 @@
* 鏇存柊涓婄墖琛ㄧ姸鎬�
*/
void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);
-
/**
* 鍒ゆ柇姝ゅ伐绋嬫槸鍚﹀凡淇濆瓨杩�
- *
* @return UpPattenUsage
*/
- UpPattenUsage selectedTaskEngineering(String engineeringId);
-
+ UpPattenUsage selectedEngineering(String engineeringId);
/**
* 鏌ヨ姝ｅ湪鎵ц鐨勪笂鐗囦换鍔�
- *
* @return UpPattenUsage
*/
UpPattenUsage selectOverTask();
@@ -60,17 +54,9 @@
/**
* 鏇存敼涓婄墖鐜荤拑鐘舵��
- *
* @return UpPattenUsage
*/
Boolean updateGlassState(UpPattenUsage upPattenUsage);
- List<Engineering> setRawGlassTaskRequest(Engineering request);
-
-// List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);
-
-// UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);
-
- UpPattenUsage selectedEngineering(String engineerId);
}
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 0cfcb0c..409cfb2 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;
@@ -45,10 +44,10 @@
//log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷{}",engineering);
if(engineering!=null){
LambdaQueryWrapper<UpPattenUsage> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(UpPattenUsage::getEngineeringId, engineering.getEngineerId());
+ wrapper.eq(UpPattenUsage::getEngineeringId,engineering.getEngineerId());
return this.list(wrapper);
- } else {
- return null;
+ }else {
+ return null;
}
}
@@ -56,10 +55,7 @@
@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());
return this.list(wrapper);
}
@@ -107,25 +103,16 @@
@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 selectedTaskEngineering(String engineeringId) {
- return null;
- }
-
- @Override
- public UpPattenUsage selectedEngineering(String engineerId) {
- QueryWrapper<UpPattenUsage> wrapper = new QueryWrapper<>();
- wrapper.eq("engineering_id", engineerId)
-// .eq("station_cell", stationCell)
-// .eq("film_remove", filmRemove)
+ public UpPattenUsage selectedEngineering(String engineeringId) {
+ QueryWrapper<UpPattenUsage>wrapper = new QueryWrapper<>();
+ wrapper.eq("engineering_id",engineeringId)
.last("limit 1");
- log.info("鏌ヨ棰勮鍙傛暟");
- log.info("鏌ヨ棰勮鍙傛暟{}", this.getOne(wrapper));
return this.getOne(wrapper);
}
@@ -151,14 +138,9 @@
@Override
public Boolean updateGlassState(UpPattenUsage upPattenUsage) {
UpdateWrapper<UpPattenUsage> updateWrapper = new UpdateWrapper<>();
- updateWrapper.eq("id", upPattenUsage.getId())
- .set("state", upPattenUsage.getState());
+ updateWrapper.eq("id",upPattenUsage.getId())
+ .set("state",upPattenUsage.getState());
return this.update(updateWrapper);
- }
-
- @Override
- public Object Engineering(Engineering request) {
- return null;
}
--
Gitblit v1.8.0