From 91e4ba507f9806c975a4273154d79f1a43b836c4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 29 四月 2024 13:42:29 +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 | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 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 4e9cdf8..8389edd 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
@@ -39,9 +39,9 @@
}
@Override
- public void deleteTask(long id) {
+ public void deleteTask(String id) {
LambdaQueryWrapper<DownGlassTask> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(DownGlassTask::getId, id);
+ queryWrapper.eq(DownGlassTask::getFlowCardId, id);
baseMapper.delete(queryWrapper);
}
@@ -58,17 +58,17 @@
}
@Override
- public Integer insertCacheTask(Long id, String start, String end, String type, double width, double height, String filmsId, double thickness, String flowCardId) {
+ public Integer insertCacheTask(DownGlassTask downGlassTask) {
DownGlassTask glassInfo = new DownGlassTask();
- glassInfo.setId(id);
- glassInfo.setStartCell(start);
- glassInfo.setEndCell(end);
- glassInfo.setTaskType(type);
- glassInfo.setWidth(width);
- glassInfo.setHeight(height);
- glassInfo.setFilmsid(filmsId);
- glassInfo.setThickness(thickness);
- glassInfo.setFlowCardId(flowCardId);
+ 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
int rows = baseMapper.insert(glassInfo);
@@ -78,6 +78,20 @@
+ @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