From a2068f3779b8172dd66f55d13a2da2ec62c9796a Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 15 四月 2024 11:24:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java | 124 ++++++++++++++++++++++++++++++-----------
1 files changed, 90 insertions(+), 34 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
index c2b5cff..032b285 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/service/impl/BigStorageCageServiceImpl.java
@@ -1,13 +1,18 @@
package com.mes.bigstorage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
import com.mes.bigstorage.mapper.BigStorageCageMapper;
import com.mes.bigstorage.service.BigStorageCageService;
-import com.mes.uppattenusage.entity.GlassInfo;
+import com.mes.glassinfo.entity.GlassInfo;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
import lombok.extern.slf4j.Slf4j;
+import com.mes.glassinfo.entity.GlassInfo;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -15,6 +20,7 @@
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+
/**
* <p>
@@ -27,7 +33,6 @@
@Service
@Slf4j
public class BigStorageCageServiceImpl extends ServiceImpl<BigStorageCageMapper, BigStorageCage> implements BigStorageCageService {
-
@Resource
private BigStorageCageMapper bigStorageCageMapper;
@@ -35,39 +40,105 @@
private BigStorageCageDetailsMapper bigStorageCageDetailsMapper;
@Override
- public BigStorageCageDetails FeedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
+ public BigStorageCageDetails feedGlass(GlassInfo glassInfo, BigStorageCageDetails bigStorageCageDetails) {
+ //1銆佹煡璇㈢悊鐗囩鍐呯幓鐠冪墖搴忕瓑浜庡綋鍓嶇幓鐠冪墖搴�-1鐨勭幓鐠�
+ LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
- //鑾峰彇鍚岄挗鍖栫増鍥緄d鍙繘鐗囩殑鏍煎瓙
- BigStorageCageDetails layoutSlotInfo = bigStorageCageMapper.SelectTemperingFeedSlot(glassInfo);
- //鏈夌鍚堟潯浠剁殑鏍煎瓙鏃�
- if (layoutSlotInfo != null) {
- //灏嗙幓鐠冧俊鎭～鍏ョ悊鐗囩璇︽儏琛�
+ BigStorageCageDetails layoutSlotInfo = bigStorageCageDetailsMapper.selectOne(wrapper);
+ BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
+ bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
+
+ //2銆佹湁绗﹀悎鏉′欢鐨勬牸瀛愭椿鐗囧簭涓�1鏃�
+ if (layoutSlotInfo.getSlot() != null) {
bigStorageCageDetails.setSlot(layoutSlotInfo.getSlot());
} else {
//鑾峰彇涓嶅埌鏃讹細
+// LambdaQueryWrapper<BigStorageCageDetails> BigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
+// BigStorageCageDetailslambdaQueryWrapper
+// .select(BigStorageCageDetails::getTemperingLayoutId)
+// .groupBy(BigStorageCageDetails::getTemperingLayoutId);
+// List<Map<String, Object>> temperingLayoutIdList= bigStorageCageDetailsMapper.selectMaps(BigStorageCageDetailslambdaQueryWrapper);
+// for (Map<String, Object> map : temperingLayoutIdList) {
+// for (Map.Entry<String, Object> entry : map.entrySet()) {
+// String prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+// String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+// if(suffix.equals(entry.getValue())){
+//
+// }
+// }
+// }
+
//鑾峰彇鍙繘鐗囨牸瀛愪俊鎭�
- BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.SelectEmptyFeedSlot();
- if (EmptySlotInfo != null) {
- bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
- } else {
- //鑾峰彇鍏朵粬绗兼牸瀛�-
- BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.SelectOtherFeedSlot();
- bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
- }
+// BigStorageCageDetails EmptySlotInfo = bigStorageCageMapper.selectEmptyFeedSlot();
+// if (EmptySlotInfo != null) {
+// bigStorageCageDetails.setSlot(EmptySlotInfo.getSlot());
+// } else {
+// //鑾峰彇鍏朵粬绗兼牸瀛�-
+// BigStorageCageDetails OtherSlotInfo = bigStorageCageMapper.selectOtherFeedSlot();
+// bigStorageCageDetails.setSlot(OtherSlotInfo.getSlot());
+// }
//灏嗙幓鐠冧俊鎭斁鍏ヨ鏍煎瓙
}
-
- updateRemainWidth(bigStorageCageDetails.getSlot());
+ if (bigStorageCageDetails.getSlot() != null) {
+ bigStorageCageDetailsMapper.insert(bigStorageCageDetails);
+ updateRemainWidth(bigStorageCageDetails.getSlot());
+ }
return bigStorageCageDetails;
+ }
+
+ @Override
+ public boolean outGlass() {
+// // 1銆佹煡璇㈤挗鍖栧皬鐗囦换鍔¤〃鏄惁鏈夊緟鍑虹幓鐠�
+// List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.SelectTemperingGlassInfo();
+// //娌℃湁鍙嚭鐨勭幓鐠冩椂
+// if (temperingGlassInfoList != null) {
+// //鏌ヨ鏄惁鏈夊皬鐗囧叏閮ㄥ埌榻愮殑閽㈠寲鐗堝浘
+// } else {
+// //缁х画褰撳墠閽㈠寲鐗堝浘鐨勪换鍔�
+// }
+ LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailslambdaQueryWrapper = new LambdaQueryWrapper<>();
+ bigStorageCageDetailslambdaQueryWrapper
+ .select(BigStorageCageDetails::getTemperingLayoutId)
+ .groupBy(BigStorageCageDetails::getTemperingLayoutId);
+ List<Map<String, Object>> temperingLayoutIdList = bigStorageCageDetailsMapper.selectMaps(bigStorageCageDetailslambdaQueryWrapper);
+ for (Map<String, Object> map : temperingLayoutIdList) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String prefix = entry.getKey().substring(0, entry.getKey().indexOf('-'));
+ String suffix = entry.getKey().substring(entry.getKey().indexOf('-') + 1);
+ if (suffix.equals(entry.getValue())) {
+
+ }
+ }
+ }
+ return true;
+ }
+
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ @Override
+ public void updateRemainWidth(int slot) {
+ //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
+ Integer width = 5000;
+ List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(slot));
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+ ) {
+ width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
+ }
+ //淇敼鏍煎瓙鍓╀綑瀹藉害
+ BigStorageCage bigStorageCage = new BigStorageCage();
+ bigStorageCage.setRemainWidth(width);
+ UpdateWrapper<BigStorageCage> bigStorageCageWrapper = new UpdateWrapper<>();
+ bigStorageCageWrapper.eq("remain_width", width);
+ bigStorageCageMapper.update(bigStorageCage, bigStorageCageWrapper);
}
@Override
public List<BigStorageCage> querybigStorageCageDetail() {
//1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭�
-// List<BigStorageCage> bigStorageCages = bigStorageCageMapper.querybigStorageCageDetail(null);
List<BigStorageCage> bigStorageCages = bigStorageCageMapper.selectList(null);
log.info("1銆佽幏鍙栧ぇ鐞嗙墖绗间俊鎭畬鎴愶紝鑾峰彇鍒扮殑鏁版嵁{}", bigStorageCages.size());
//2鑾峰彇鐞嗙墖绗兼墍鏈変俊鎭�
@@ -78,21 +149,6 @@
bigStorageCage.setBigStorageCageDetails(bigStorageCageDetails);
}
return bigStorageCages;
-
- }
-
- //淇敼鏍煎瓙鍓╀綑瀹藉害
- @Override
- public void updateRemainWidth(int Slot) {
- //鑾峰彇璇ユ牸瀛愬唴鐜荤拑淇℃伅
- int width = 5000;
- List<BigStorageCageDetails> bigStorageCageDetailsList = Collections.singletonList(bigStorageCageDetailsMapper.selectById(Slot));
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
- ) {
- width -= Integer.parseInt(bigStorageCageDetails.getWidth().toString()) + bigStorageCageDetails.getGap();
- }
- //淇敼鏍煎瓙鍓╀綑瀹藉害
- bigStorageCageMapper.UpdateRemainWidth(Slot, width);
}
}
--
Gitblit v1.8.0