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/downworkstation/service/impl/DownWorkstationTaskServiceImpl.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 4c81b4e..1e67462 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,12 +1,16 @@
package com.mes.downworkstation.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -22,6 +26,12 @@
public void insertdownWorkstationtask(DownGlassInfo downGlassInfo) {
DownWorkstationTask entity = new DownWorkstationTask();
+ // 鏌ヨ褰撳墠鏈�澶х殑 id 鍊�
+ Long maxId = getMaxId();
+ // 濡傛灉娌℃湁璁板綍锛屽垯灏� id 璁剧疆涓� 1锛涘惁鍒欙紝灏� id 璁剧疆涓哄綋鍓嶆渶澶� id 鍊煎姞 1
+ Long newId = (maxId == null) ? 1 : maxId + 1;
+
+ entity.setId(newId); // 璁剧疆鎵嬪姩閫掑鐨� id
entity.setFlowCardId(downGlassInfo.getFlowCardId());
entity.setWidth(downGlassInfo.getWidth());
entity.setHeight(downGlassInfo.getHeight());
@@ -32,6 +42,29 @@
baseMapper.insert(entity);
}
+
+
+
+// 鏌ヨ鏈�澶х殑 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 updateTaskStateToZero(long id) {
UpdateWrapper<DownWorkstationTask> updateWrapper = new UpdateWrapper<>();
--
Gitblit v1.8.0