From 1bd93d6d748edfda1b95b692f7d4ce4f38363e32 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 19 四月 2024 13:31:59 +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/DownWorkstationServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
index ca152d0..0c44dac 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/service/impl/DownWorkstationServiceImpl.java
@@ -3,6 +3,7 @@
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.DownGlassTask;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.DownWorkstationTask;
import com.mes.downworkstation.mapper.DownWorkstationMapper;
@@ -13,6 +14,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
+import java.util.Map;
@Service
public class DownWorkstationServiceImpl extends ServiceImpl<DownWorkstationMapper, DownWorkstation> implements DownWorkstationService {
@@ -22,7 +24,8 @@
private DownWorkstationTaskMapper downWorkstationTaskMapper;
- // @Override
+
+// @Override
// public List<DownWorkstation> gettwoDownWorkstations() {
// return downWorkstationMapper.getDownWorkstationsInRange(6,10);
// }
@@ -43,7 +46,7 @@
// return totalQuantity != null ? totalQuantity : 0;
// }
- // @Override
+// @Override
// public int getRacksNumber(int workstationId) {
// Integer racksNumber = downWorkstationMapper.getRacksNumber(workstationId);
// return racksNumber != null ? racksNumber : 0;
@@ -58,8 +61,7 @@
DownWorkstation result = baseMapper.selectOne(queryWrapper);
return result != null ? result.getRacksnumber() : 0;
}
-
- //鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
+//鏍规嵁鏉′欢鑾峰彇宸ヤ綅鐜荤拑淇℃伅
@Override
public List<DownWorkstation> getoneDownWorkstations(int startId, int endId) {
QueryWrapper<DownWorkstation> queryWrapper = new QueryWrapper<>();
@@ -75,9 +77,10 @@
@Override
public void updateracksnumber(String flowCardId, int racksNumber) {
UpdateWrapper<DownWorkstation> updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("racks_number", racksNumber).eq("flow_card_id", flowCardId);
+ updateWrapper.set("racks_number",racksNumber).eq("flow_card_id", flowCardId);
baseMapper.update(null, updateWrapper);
}
+
@Override
@@ -102,6 +105,13 @@
}
+
+
+
+
+
+
+
@Transactional
public void crossDatabaseQuery() {
// 浠� MySQL 鏁版嵁搴撲腑鏌ヨ鏁版嵁锛屽彧杩斿洖涓�鏉＄鍚堟潯浠剁殑鏁版嵁
@@ -110,7 +120,10 @@
// 浠� SQL Server 鏁版嵁搴撲腑鏌ヨ鏁版嵁
List<DownWorkstationTask> downWorkstationTasks = downWorkstationTaskMapper.selectList();
-
}
+
+
+
+
}
--
Gitblit v1.8.0