From 889ff0512bc68be0f5d231a524bf97c9488ec37f Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 16 五月 2024 16:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
index cb42e3f..d145b2c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/service/impl/DownGlassTaskServiceImpl.java
@@ -11,6 +11,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -28,21 +29,21 @@
@Override
public List<DownGlassTask> getUnloadingTaskState() {
QueryWrapper<DownGlassTask> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("task_stauts", 1);
+ queryWrapper.eq("task_stauts", 0).eq("task_type", 2).or().eq("task_stauts", 3);
return baseMapper.selectList(queryWrapper);
}
@Override
- public void updateTaskStateToZero(long id) {
+ public void updateTaskState(String id) {
UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("task_stauts", 0).eq("id", id);
+ updateWrapper.set("task_stauts", 2).eq("id", id);
baseMapper.update(new DownGlassTask(), updateWrapper);
}
@Override
public void deleteTask(String id) {
LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(DownGlassTask::getFlowCardId, id);
+ queryWrapper.eq(DownGlassTask::getGlassId, id);
baseMapper.delete(queryWrapper);
}
@@ -60,40 +61,39 @@
@Override
public Integer insertCacheTask(DownGlassTask downGlassTask) {
- DownGlassTask glassInfo = new DownGlassTask();
-// glassInfo.setId(downGlassTask.getId());
-// glassInfo.setStartCell(downGlassTask.getStartCell());
-// glassInfo.setEndCell(downGlassTask.getEndCell());
-// glassInfo.setTaskType(downGlassTask.getTaskType());
-// glassInfo.setWidth(downGlassTask.getWidth());
-// glassInfo.setHeight(downGlassTask.getHeight());
-// glassInfo.setFilmsid(downGlassTask.getFilmsid());
-// glassInfo.setThickness(downGlassTask.getThickness());
-// glassInfo.setFlowCardId(downGlassTask.getFlowCardId());
- BeanUtils.copyProperties(downGlassTask,glassInfo);
- glassInfo.setTaskStauts(0); // 榛樿浠诲姟鐘舵�佷负0
+ // 鏌ヨ鏁版嵁搴擄紝妫�鏌ヤ富閿�兼槸鍚﹀凡缁忓瓨鍦�
+ DownGlassTask existingTask = baseMapper.selectById(downGlassTask.getId());
+ if (existingTask != null) {
+ // 濡傛灉宸插瓨鍦ㄧ浉鍚屼富閿�肩殑浠诲姟锛屽垯涓嶈繘琛屾彃鍏ユ搷浣滐紝杩斿洖 null 鎴栬�呮姏鍑哄紓甯�
+ // 杩欓噷绠�鍗曡捣瑙侊紝鐩存帴杩斿洖 null
+ return null;
+ }
- int rows = baseMapper.insert(glassInfo);
+ // 濡傛灉涓婚敭鍊间笉瀛樺湪锛屽垯杩涜鎻掑叆鎿嶄綔
+ DownGlassTask newDownGlassTask = new DownGlassTask();
+ BeanUtils.copyProperties(downGlassTask, newDownGlassTask);
+ newDownGlassTask.setTaskStauts(1); // 榛樿浠诲姟鐘舵�佷负1
+ newDownGlassTask.setCreateTime(new Date());
+ int rows = baseMapper.insert(newDownGlassTask);
return rows > 0 ? rows : null;
}
-
@Override
- public List<DownGlassTask> selectInputTaskCache(){
- return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status",0).eq("task_type",1));
+ public List<DownGlassTask> selectInputTaskCache() {
+ return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 1));
}
/**
* 鏌ヨ寰呭嚭鐗囦换鍔�
+ *
* @return
*/
@Override
- public List<DownGlassTask> selectOutTaskCache(){
- return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status",0).eq("task_type",2));
+ public List<DownGlassTask> selectOutTaskCache() {
+ return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
}
-
}
--
Gitblit v1.8.0