From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 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 1b35075..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,16 +1,23 @@
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;
+import com.mes.downglassinfo.entity.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationTaskMapper;
import com.mes.downworkstation.service.DownWorkstationTaskService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author zhoush
@@ -20,24 +27,62 @@
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();
- entity.setFlowCardId(downGlassInfo.getFlowCardId());
- entity.setWidth(downGlassInfo.getWidth());
- entity.setHeight(downGlassInfo.getHeight());
- entity.setThickness(downGlassInfo.getThickness());
- entity.setFilmsid(downGlassInfo.getFilmsid());
- entity.setState(1);
+ // 鏌ヨ褰撳墠鏈�澶х殑 id 鍊�
+ Long maxId = getMaxId();
+ // 濡傛灉娌℃湁璁板綍锛屽垯灏� id 璁剧疆涓� 1锛涘惁鍒欙紝灏� id 璁剧疆涓哄綋鍓嶆渶澶� id 鍊煎姞 1
+ Long newId = (maxId == null) ? 1 : maxId + 1;
+
+ BeanUtils.copyProperties(downGlassInfo,entity);
+ entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id
+ entity.setState(1);
+ entity.setWorkstationid(workstationid);
baseMapper.insert(entity);
}
- @Override
- public void updateTaskStateToZero(String flowCardId) {
- UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("state", 0).eq("flow_card_id", flowCardId);
- baseMapper.update(null, updateWrapper);
+
+
+// 鏌ヨ鏈�澶х殑 ID
+ private Long getMaxId() {
+ QueryWrapper<DownWorkstationTask> wrapper = new QueryWrapper<>();
+ wrapper.select("MAX(id) as max_id");
+ List<Object> list = baseMapper.selectObjs(wrapper);
+ if (list != null && !list.isEmpty()) {
+ Object obj = list.get(0);
+ if (obj != null) {
+ return Long.parseLong(obj.toString());
+ }
+ }
+ // 濡傛灉娌℃湁鏌ヨ鍒扮粨鏋滐紝鍒欒繑鍥� 0
+ return 0L;
}
+ @Override
+ public List<DownWorkstationTask> getTaskState() {
+ QueryWrapper<DownWorkstationTask> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("state", 1);
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @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