From 529d04102d54c3a2ed5da05ce4793af51472e454 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 22 七月 2024 08:10:18 +0800
Subject: [PATCH] 1、大理片笼进任务问题解决，不同版图进同一笼子问题解决 2、通信字电气未收到问题解决：发送后读取plc数据，未写进去一直写
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 71 ++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 22 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 8938678..b3fb398 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
@@ -18,6 +18,8 @@
import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
import com.mes.common.config.Const;
+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.temperingglass.entity.TemperingGlassInfo;
@@ -54,6 +56,9 @@
private BigStorageCageService bigStorageCageService;
@Resource
private GlassInfoMapper glassInfoMapper;
+
+ @Resource
+ private DamageService damageService;
@Value("${mes.minCount}")
private int minCount;
@@ -205,7 +210,12 @@
baseMapper.updateById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
//todo:鎻掑叆鐮存崯鏁版嵁
-
+ Damage damage = new Damage();
+ damage.setGlassId(bigStorageCageDetails.getGlassId());
+ damage.setWorkingProcedure("鍐峰姞宸�");
+ damage.setRemark("澶х悊鐗囩鐮存崯");
+ damage.setStatus(2);
+ damageService.insertDamage(damage);
}
//鏌ヨ鐜荤拑淇℃伅
@@ -222,7 +232,7 @@
List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
bigStorageCageDetailsList.add(bigStorageCageDetails);
return bigStorageCageDetailsList;
- }else{
+ } else {
return null;
}
@@ -264,7 +274,7 @@
.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
- .gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
+ .gt(BigStorageCage::getRemainWidth, Math.max(glassInfo.getWidth(), glassInfo.getHeight()))
.last("limit 1");
if (glassInfo.getTemperingLayoutId() == 0) {
wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
@@ -292,7 +302,23 @@
bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
return bigStorageDTO;
}
- //todo:鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
+
+ //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
+ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .notInSql(BigStorageCage::getDeviceId,
+ "select distinct device_id from big_storage_cage_details where state in (100,102,103)")
+ .gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
+ .orderByAsc(BigStorageCage::getDeviceId)
+ .last("limit 1"));
+ if (null != bigStorageCage) {
+ bigStorageDTO = new BigStorageDTO();
+ bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+ bigStorageDTO.setSlot(bigStorageCage.getSlot());
+ bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+ return bigStorageDTO;
+ }
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getRemainWidth, slotWidth)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
@@ -324,33 +350,34 @@
}
@Override
- public boolean TemperingGlass(String temperingLayoutId, String engineerId){
- LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
+ public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
+ LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
temperingGlassInfoLambdaQueryWrapper
- .eq(TemperingGlassInfo::getTemperingLayoutId,temperingLayoutId)
- .eq(TemperingGlassInfo::getEngineerId,engineerId);
- 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,Const.GLASS_STATE_OUT_ING);
- List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);
+ .eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId)
+ .eq(TemperingGlassInfo::getEngineerId, engineerId);
+ 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
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
) {
- TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
- LambdaQueryWrapper<GlassInfo> glassInfoLambdaQueryWrapper=new LambdaQueryWrapper<>();
- glassInfoLambdaQueryWrapper.eq(GlassInfo::getGlassId,bigStorageCageDetails.getGlassId());
- GlassInfo glassInfo=glassInfoMapper.selectOne(glassInfoLambdaQueryWrapper);
+ 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);
}
return true;
- }else{
+ } else {
return false;
}
@@ -358,7 +385,7 @@
}
@Override
- public List<Map<String, Object>> selectTemperingGlass(){
+ public List<Map<String, Object>> selectTemperingGlass() {
QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
.groupBy("engineer_id,tempering_layout_id");
--
Gitblit v1.8.0