From c0514cd5c91a561213980025c567fd8ef816241f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 29 七月 2024 16:27:30 +0800
Subject: [PATCH] 大理片笼进片：1、临时更新格子的剩余尺寸：防止相邻玻璃进同一格子造成剩余尺寸不足，玻璃越界的情况，任务完成后再次更新大理片笼表剩余宽度（按照笼内玻璃数量更新大理片笼剩余尺寸） 2、玻璃宽度取宽高相比较后的最大值
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 62 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
index d944ad0..a1e95b4 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java
@@ -3,7 +3,9 @@
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.github.yulichang.toolkit.JoinWrappers;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
@@ -19,12 +21,15 @@
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
import com.mes.common.config.Const;
+import com.mes.common.utils.RedisUtil;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
+import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -59,7 +64,15 @@
private GlassInfoMapper glassInfoMapper;
@Resource
+ private GlassInfoService glassInfoService;
+
+ @Resource
+ private TemperingGlassInfoService temperingGlassInfoService;
+
+ @Resource
private DamageService damageService;
+ @Resource
+ private RedisUtil redisUtil;
@Value("${mes.minCount}")
private int minCount;
@@ -69,6 +82,10 @@
@Value("${mes.glassGap}")
private Integer glassGap;
+
+ @Value("${mes.sequence.order}")
+ private boolean sequenceOrder;
+
/**
* 鏌ヨ杩�/鍑虹墖浠诲姟
@@ -344,7 +361,7 @@
@Override
- public TemperingLayoutDTO queryTemperingOccupySlot() {
+ public List<TemperingLayoutDTO> queryTemperingOccupySlot() {
return baseMapper.queryTemperingOccupySlot(minCount);
}
@@ -354,37 +371,30 @@
}
@Override
- public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
+ public boolean temperingGlass(String temperingLayoutId, String engineerId) {
LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW);
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
if (temperingGlassInfoList.size() == 0) {
- LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
- .eq(BigStorageCageDetails::getEngineerId, engineerId)
- .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper);
-
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
- ) {
- TemperingGlassInfo temperingGlassInfo = new TemperingGlassInfo();
- LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
- glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId());
- GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);
-
- BeanUtils.copyProperties(glassInfo, temperingGlassInfo);
- temperingGlassInfo.setAngle((int) glassInfo.getAngle());
- temperingGlassInfo.setState(Const.TEMPERING_NEW);
- temperingGlassInfo.setSlot(bigStorageCageDetails.getSlot());
- temperingGlassInfoMapper.insert(temperingGlassInfo);
+ List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
+ .selectAll(GlassInfo.class)
+ .select("-1 as state")
+ .selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
+ .innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
+ .eq(GlassInfo::getTemperingLayoutId, temperingLayoutId)
+ .eq(GlassInfo::getEngineerId, engineerId)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
+ if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
+ temperingGlassInfoService.saveBatch(temperingGlassInfos);
+ return true;
}
- return true;
- } else {
- return false;
}
+ return false;
}
+
@Override
public List<Map<String, Object>> selectTemperingGlass() {
@@ -400,4 +410,10 @@
public void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state) {
baseMapper.updateBySlot(glassList, state);
}
+
+ @Override
+ public String temperingSwitch(Boolean flag) {
+ redisUtil.setCacheObject("temperingSwitch", flag);
+ return "success";
+ }
}
--
Gitblit v1.8.0