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/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
index 5f802b5..5468375 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java
@@ -2,7 +2,6 @@
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.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -11,7 +10,6 @@
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
-import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
@@ -53,23 +51,29 @@
temperingGlassInfo.setState(-1);
baseMapper.updateById(temperingGlassInfo);
log.info("3銆佷慨鏀归挗鍖栧皬鐗囪〃浠诲姟鐘舵��");
- BigStorageCageOutTask bigStorageCageOutTask =new BigStorageCageOutTask();
+ BigStorageCageOutTask bigStorageCageOutTask = new BigStorageCageOutTask();
bigStorageCageOutTask.setId(temperingGlassInfo.getId());
- }else{
+ } else {
break;
}
}
}
+ @Override
+ public boolean saveBatch(List<TemperingGlassInfo> list) {
+ log.info("闇�瑕侀挗鍖栫殑鐜荤拑涓猴細{}", list);
+ return baseMapper.saveBatch(list);
+ }
+
//璋冨害
@Override
- public void schedulingTask(){
+ public void schedulingTask() {
QueryWrapper<BigStorageCageDetails> detailsWrapper1 = Wrappers.query();
detailsWrapper1.select("tempering_layout_id", "count(distinct slot)")
.groupBy("tempering_layout_id");
List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(detailsWrapper1);
- boolean key=false;
+ boolean key = false;
for (Map<String, Object> row : temperingLayoutIdList) {
for (Map.Entry<String, Object> entry : row.entrySet()) {
String temperingId = entry.getKey();
--
Gitblit v1.8.0