From 93e36c526fe445c14d5fb19f3653f8a8e55e3a6c Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期四, 09 五月 2024 15:49:34 +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 | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 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 7c72877..8feea50 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
@@ -8,6 +8,7 @@
import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downglassinfo.mapper.DownGlassTaskMapper;
import com.mes.downglassinfo.service.DownGlassTaskService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -35,7 +36,7 @@
public void updateTaskStateToZero(long id) {
UpdateWrapper<DownGlassTask> updateWrapper = new UpdateWrapper<>();
updateWrapper.set("task_stauts", 0).eq("id", id);
- baseMapper.update(null, updateWrapper);
+ baseMapper.update(new DownGlassTask(), updateWrapper);
}
@Override
@@ -59,25 +60,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());
- 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(0); // 榛樿浠诲姟鐘舵�佷负0
+
+ 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));
+ }
+ /**
+ * 鏌ヨ寰呭嚭鐗囦换鍔�
+ *
+ * @return
+ */
+ @Override
+ public List<DownGlassTask> selectOutTaskCache() {
+ return baseMapper.selectList(new QueryWrapper<DownGlassTask>().eq("task_status", 0).eq("task_type", 2));
+ }
}
--
Gitblit v1.8.0