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/bigstorage/service/impl/BigStorageCageDetailsServiceImpl.java | 227 +++++++++++++++++++++++++++-----------------------------
1 files changed, 110 insertions(+), 117 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 a1e95b4..8a73f9e 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
@@ -30,6 +30,7 @@
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
import com.mes.temperingglass.service.TemperingGlassInfoService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -49,6 +50,7 @@
* @author zhoush
* @since 2024-03-27
*/
+@Slf4j
@Service
public class BigStorageCageDetailsServiceImpl extends MPJBaseServiceImpl<BigStorageCageDetailsMapper, BigStorageCageDetails> implements BigStorageCageDetailsService {
@@ -87,78 +89,53 @@
private boolean sequenceOrder;
- /**
- * 鏌ヨ杩�/鍑虹墖浠诲姟
- */
@Override
- public List<BigStorageCageDetails> selectTask(int taskType) {
- if (taskType == 1) {
- //杩涚墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
- feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
+ public List<BigStorageCageDetails> selectFeedTask() {
+ //杩涚墖浠诲姟鏁版嵁
+ LambdaQueryWrapper<BigStorageCageDetails> feedWrapper = new LambdaQueryWrapper<>();
+ feedWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(feedWrapper);
- LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
- feedTaskWrapper
- .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
- .isNotNull(BigStorageCageFeedTask::getTargetSlot);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
-
- Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
- .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
- Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
- while (iterator.hasNext()) {
- BigStorageCageDetails bigStorageCageDetails = iterator.next();
- BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
- if (bigStorageCageDetails.getBigStorageCageFeedTask() == null) {
- iterator.remove();
- }
- }
- LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskNoTargetWrapper = new LambdaQueryWrapper<>();
- feedTaskNoTargetWrapper
- .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
- .isNull(BigStorageCageFeedTask::getTargetSlot);
- List<BigStorageCageFeedTask> bigStorageCageFeedTaskNoTargetList = bigStorageCageFeedTaskMapper.selectList(feedTaskNoTargetWrapper);
- for (BigStorageCageFeedTask bigStorageCageFeedTask : bigStorageCageFeedTaskNoTargetList
- ) {
- BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
- LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
- glassInfoWrapper.eq(GlassInfo::getGlassId, bigStorageCageFeedTask.getGlassId());
- GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
- BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
- bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
- bigStorageCageDetailsList.add(bigStorageCageDetails);
- }
- return bigStorageCageDetailsList;
- } else {
- //鍑虹墖浠诲姟鏁版嵁
- LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
- outWrapper.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN);
- List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
-
- LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
- outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
- List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
-
- Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
- .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
- for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
- BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
- }
- Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
- while (iterator.hasNext()) {
- BigStorageCageDetails bigStorageCageDetails = iterator.next();
- BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
- bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
- if (bigStorageCageDetails.getBigStorageCageOutTask() == null) {
- iterator.remove();
- }
- }
- return bigStorageCageDetailsList;
+ LambdaQueryWrapper<BigStorageCageFeedTask> feedTaskWrapper = new LambdaQueryWrapper<>();
+ feedTaskWrapper
+ .lt(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_SLOT)
+ .isNotNull(BigStorageCageFeedTask::getTargetSlot);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskMapper.selectList(feedTaskWrapper);
+ Map<String, BigStorageCageFeedTask> listMap = bigStorageCageFeedTaskList.stream()
+ .collect(Collectors.toMap(BigStorageCageFeedTask::getGlassId, task -> task));
+ Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+ while (iterator.hasNext()) {
+ BigStorageCageDetails bigStorageCageDetails = iterator.next();
+ BigStorageCageFeedTask bigStorageCageFeedTask = listMap.get(bigStorageCageDetails.getGlassId());
+ bigStorageCageDetails.setBigStorageCageFeedTask(bigStorageCageFeedTask);
}
+ return bigStorageCageDetailsList;
}
+
+ @Override
+ public List<BigStorageCageDetails> selectOutTask() {
+ LambdaQueryWrapper<BigStorageCageDetails> outWrapper = new LambdaQueryWrapper<>();
+ outWrapper.in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING, Const.GLASS_STATE_SCHEDULE_ING);
+ List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(outWrapper);
+ LambdaQueryWrapper<BigStorageCageOutTask> outTaskWrapper = new LambdaQueryWrapper<>();
+ outTaskWrapper.lt(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS);
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = bigStorageCageOutTaskMapper.selectList(outTaskWrapper);
+
+ Map<String, BigStorageCageOutTask> listMap = bigStorageCageOutTaskList.stream()
+ .collect(Collectors.toMap(BigStorageCageOutTask::getGlassId, task -> task));
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList) {
+ BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+ bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+ }
+ Iterator<BigStorageCageDetails> iterator = bigStorageCageDetailsList.iterator();
+ while (iterator.hasNext()) {
+ BigStorageCageDetails bigStorageCageDetails = iterator.next();
+ BigStorageCageOutTask bigStorageCageOutTask = listMap.get(bigStorageCageDetails.getGlassId());
+ bigStorageCageDetails.setBigStorageCageOutTask(bigStorageCageOutTask);
+ }
+ return bigStorageCageDetailsList;
+ }
+
/**
* 鍒ゆ柇褰撳墠鐜荤拑鏄惁鑳戒笂杞�
@@ -209,30 +186,34 @@
TemperingGlassInfo temperingGlassInfo = temperingGlassInfoMapper.selectOne(temperingGlassInfoWrapper);
LambdaQueryWrapper<BigStorageCageDetails> bigStorageCageDetailsWrapper = new LambdaQueryWrapper<>();
- bigStorageCageDetailsWrapper.eq(BigStorageCageDetails::getGlassId, glassId);
+ bigStorageCageDetailsWrapper
+ .eq(BigStorageCageDetails::getGlassId, glassId)
+ .eq(BigStorageCageDetails::getState,Const.GLASS_STATE_IN);
BigStorageCageDetails bigStorageCageDetails = baseMapper.selectOne(bigStorageCageDetailsWrapper);
if (temperingGlassInfo != null) {
if (status == 0) {
- temperingGlassInfo.setState(Const.TEMPERING_DAMAGE);
+ temperingGlassInfo.setState(Const.GLASS_STATE_DAMAGE);
} else {
- temperingGlassInfo.setState(Const.TEMPERING_TAKE);
+ temperingGlassInfo.setState(Const.GLASS_STATE_TAKE);
}
temperingGlassInfoMapper.updateById(temperingGlassInfo);
}
+ Damage damage = new Damage();
if (status == 0) {
bigStorageCageDetails.setState(Const.GLASS_STATE_DAMAGE);
+ damage.setType(Const.GLASS_STATE_DAMAGE);
} else {
bigStorageCageDetails.setState(Const.GLASS_STATE_TAKE);
+ damage.setType(Const.GLASS_STATE_TAKE);
}
baseMapper.updateById(bigStorageCageDetails);
bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
- //todo:鎻掑叆鐮存崯鏁版嵁
- Damage damage = new Damage();
damage.setGlassId(bigStorageCageDetails.getGlassId());
- damage.setWorkingProcedure("鍐峰姞宸�");
- damage.setRemark("澶х悊鐗囩鐮存崯");
- damage.setStatus(2);
+ damage.setWorkingProcedure("閽㈠寲");
+ damage.setLine(4001);
+ damage.setRemark("澶х悊鐗囩");
+ damage.setStatus(1);
damageService.insertDamage(damage);
}
@@ -240,6 +221,7 @@
@Override
public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
+ List<BigStorageCageDetails> bigStorageCageDetailsList=new ArrayList<>();
glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
@@ -247,13 +229,10 @@
BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
bigStorageCageDetails.setState(1);
bigStorageCageDetails.setGap(glassGap);
- List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
+ bigStorageCageDetailsList = new ArrayList<>();
bigStorageCageDetailsList.add(bigStorageCageDetails);
- return bigStorageCageDetailsList;
- } else {
- return null;
}
-
+ return bigStorageCageDetailsList;
}
//鐞嗙墖绗艰鎯呮坊鍔�
@@ -291,16 +270,21 @@
.selectAll(BigStorageCage.class)
.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL_ZERO)
+ .eq(BigStorageCageDetails::getEngineerId, glassInfo.getEngineerId())
.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
.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());
+ wrapper.eq(BigStorageCageDetails::getFlowCardId,glassInfo.getFlowCardId())
+ .eq(BigStorageCageDetails::getLayer,glassInfo.getLayer());
+// wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
} else {
wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
}
BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
if (null != bigStorageCage) {
+ log.info("鏃犻挗鍖栫増鍥緄d鎴栨牴鎹綋鍓嶇幓鐠冪墖搴�+1鎵惧埌鐩爣鏍煎瓙锛歿},鐜荤拑id锛歿}", bigStorageCage.getSlot(), glassInfo.getGlassId());
bigStorageDTO = new BigStorageDTO();
bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
bigStorageDTO.setSlot(bigStorageCage.getSlot());
@@ -310,11 +294,12 @@
bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
.eq(BigStorageCage::getRemainWidth, slotWidth)
- .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
+// .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
.inSql(BigStorageCage::getDeviceId,
- "select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
+ "select distinct device_id from big_storage_cage_details where engineer_id = '" + glassInfo.getEngineerId() + "' and tempering_layout_id = " + glassInfo.getTemperingLayoutId())
.last("limit 1"));
if (null != bigStorageCage) {
+ log.info("鏍规嵁鐗堝浘id鎵惧埌绗煎瓙鍐呯殑鐩爣鏍煎瓙锛歿},鐜荤拑id锛歿}", bigStorageCage.getSlot(), glassInfo.getGlassId());
bigStorageDTO = new BigStorageDTO();
bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
bigStorageDTO.setSlot(bigStorageCage.getSlot());
@@ -322,35 +307,42 @@
return bigStorageDTO;
}
- //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
- bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
- .eq(BigStorageCage::getRemainWidth, slotWidth)
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
- .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
- .notInSql(BigStorageCage::getDeviceId,
- "select distinct device_id from big_storage_cage_details where state in (100,102,103)")
- .ge(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;
+ //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨 鍥犱负瀛愭煡璇㈡帓搴忓涓籹ql鏃犲奖鍝嶏紝鎵�浠ュ厛鎵ц瀛愭煡璇㈣幏鍙栭『搴忥紝鐒跺悗涓�娆″幓鏌ヨ
+ List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(glassInfo.getThickness());
+ for (Integer item : deviceUsedList) {
+ bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+ .eq(BigStorageCage::getRemainWidth, slotWidth)
+ .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+ .eq(BigStorageCage::getDeviceId, item)
+ .last("limit 1"));
+ if (null != bigStorageCage) {
+ log.info("鎸夌収瀛樼鐜荤拑鏍煎瓙鏁板崰鐢ㄦ渶灏戞柟寮忚幏鍙栦俊鎭牸瀛愪负锛歿},鐜荤拑id锛歿}", bigStorageCage.getSlot(), glassInfo.getGlassId());
+ 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)
- .notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
- .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
- .ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
- .orderByAsc(BigStorageCage::getDeviceId)
- .last("limit 1"));
+
+ //鑾峰彇鐜荤拑鐨勫帤搴︼細閲嶆柊閫夌瀛愰渶瑕佹寜鐓х瀛愬彲鏀剧幓鐠冨帤搴﹁繘琛岄�夋嫨
+// List<Integer> deviceNotUsedList = bigStorageCageService.queryFreeDeviceByNotUsed(glassInfo.getThickness());
+// for (Integer item : deviceNotUsedList) {
+// bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
+// .eq(BigStorageCage::getRemainWidth, slotWidth)
+// .eq(BigStorageCage::getEnableState, Const.SLOT_ON)
+// .eq(BigStorageCage::getDeviceId, item)
+// .last("limit 1"));
+// if (null != bigStorageCage) {
+// log.info("鎸夌収瀛樼鐜荤拑鏍煎瓙鏁板墿浣欐渶澶氬緱鏂瑰紡鑾峰彇淇℃伅鐗堝浘id:{},鏍煎瓙锛歿},鐜荤拑id锛歿}", glassInfo.getTemperingLayoutId(), bigStorageCage.getSlot(), glassInfo.getGlassId());
+// bigStorageDTO = new BigStorageDTO();
+// bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
+// bigStorageDTO.setSlot(bigStorageCage.getSlot());
+// bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
+// return bigStorageDTO;
+// }
+// }
Assert.isTrue(null != bigStorageCage, "娌℃湁绌轰綑鐨勭瀛愬瓨鏀剧幓鐠�");
- bigStorageDTO = new BigStorageDTO();
- bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
- bigStorageDTO.setSlot(bigStorageCage.getSlot());
- bigStorageDTO.setDeviceId(bigStorageCage.getDeviceId());
return bigStorageDTO;
}
@@ -398,12 +390,8 @@
@Override
public List<Map<String, Object>> selectTemperingGlass() {
- QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
- wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
- .in("state", Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL)
- .groupBy("engineer_id,tempering_layout_id");
- List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
- return TemperingGlass;
+ List<Map<String, Object>> temperingGlass = baseMapper.selectTemperingGlassCount();
+ return temperingGlass;
}
@Override
@@ -416,4 +404,9 @@
redisUtil.setCacheObject("temperingSwitch", flag);
return "success";
}
+
+ @Override
+ public void appointEngineerId(String engineerId){
+ redisUtil.setCacheObject("temperingengineerId", engineerId);
+ }
}
--
Gitblit v1.8.0