From 78e5175a05eeb3776d3f21f603fb6fb7a18b3d54 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 08 八月 2024 10:14:59 +0800
Subject: [PATCH] 1、任务表中新增是否删除字段 0：未删除 1：已删除 2、磨边队列方法改造：增加设置参数接口，websocket推送数据时可按照设置的参数推送对应的数据 3、任务新增破损、拿走状态处理 4、破损数据新增批量新增 5、工位流程卡玻璃是否到齐方法完善
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
index 01cf539..813c149 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java
@@ -1,6 +1,8 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.downglassinfo.entity.DownGlassInfo;
@@ -25,7 +27,7 @@
public class DownWorkstationTaskServiceImpl extends ServiceImpl<DownWorkstationTaskMapper, DownWorkstationTask> implements DownWorkstationTaskService {
- public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
+ public void insertdownWorkstationtask(DownGlassInfo downGlassInfo,String workstationid) {
DownWorkstationTask entity = new DownWorkstationTask();
// 鏌ヨ褰撳墠鏈�澶х殑 id 鍊�
Long maxId = getMaxId();
@@ -33,9 +35,10 @@
Long newId = (maxId == null) ? 1 : maxId + 1;
- BeanUtils.copyProperties(entity,downGlassInfo);
+ BeanUtils.copyProperties(downGlassInfo,entity);
entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id
entity.setState(1);
+ entity.setWorkstationid(workstationid);
baseMapper.insert(entity);
}
@@ -62,12 +65,24 @@
queryWrapper.eq("state", 1);
return baseMapper.selectList(queryWrapper);
}
- @Override
- public void updateTaskStateToZero(long id) {
- UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("state", 0).eq("id", id);
- baseMapper.update(new DownWorkstationTask(), updateWrapper);
+ @Override
+ public void updateTaskState(DownWorkstationTask downWorkstationTask) {
+ LambdaUpdateWrapper<DownWorkstationTask> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+
+ lambdaUpdateWrapper.set(DownWorkstationTask::getState, 2)
+ .eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId());
+
+ baseMapper.update(new DownWorkstationTask(), lambdaUpdateWrapper);
+ }
+
+
+ @Override
+ public void deleteTask(DownWorkstationTask downWorkstationTask) {
+ LambdaQueryWrapper<DownWorkstationTask> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(DownWorkstationTask::getGlassId, downWorkstationTask.getGlassId());
+
+ baseMapper.delete(queryWrapper);
}
}
--
Gitblit v1.8.0