From b08b4b56f53e4a3458da98178c03d44c3688a914 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 27 六月 2024 17:07:34 +0800
Subject: [PATCH] 下片功能已完成机械臂交互 待改进：界面新增人工出片功能，移除人工出片阈值校验
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 351 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 296 insertions(+), 55 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 01ed3ee..cd2a2f3 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -3,6 +3,7 @@
import cn.hutool.core.lang.Assert;
import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.mes.common.S7object;
import com.mes.common.config.Const;
import com.mes.device.PlcParameterObject;
@@ -11,22 +12,27 @@
import com.mes.downglassinfo.service.DownGlassInfoService;
import com.mes.downglassinfo.service.DownGlassTaskService;
import com.mes.downstorage.entity.DownStorageCage;
+import com.mes.downstorage.entity.DownStorageCageDetails;
import com.mes.downstorage.service.DownStorageCageDetailsService;
import com.mes.downstorage.service.DownStorageCageService;
import com.mes.downworkstation.entity.DownWorkstation;
import com.mes.downworkstation.entity.dto.DownGlassInfoDTO;
import com.mes.downworkstation.service.DownWorkstationService;
-import com.mes.downworkstation.service.DownWorkstationTaskService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Author : zhoush
@@ -49,14 +55,27 @@
DownWorkstationService downWorkstationService;
@Autowired
DownGlassInfoService downGlassInfoService;
- @Autowired
- private DownWorkstationTaskService downWorkstationTaskService;
+
+ @Value("${mes.threshold}")
+ private Integer threshold;
+
+ @Value("${mes.throughWidth}")
+ private Integer throughWidth;
+
+ @Value("${mes.throughHeight}")
+ private Integer throughHeight;
+
+ @Value("${mes.maxWidth}")
+ private Integer maxWidth;
+
+ @Value("${mes.maxHeight}")
+ private Integer maxHeight;
@Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- String taskRequestTypeValue = plcParameterObject.getPlcParameter("RequestWord").getValue();
+ String requestWord = plcParameterObject.getPlcParameter("RequestWord").getValue();
String glassIdeValue = plcParameterObject.getPlcParameter("G04ID").getValue();
String confirmationWrodValue = plcParameterObject.getPlcParameter("MES_confirmation_word").getValue();
//A08 A09琛ㄧず绾胯矾鐩稿悓 鍙仛绛変环 鏃犳暟鎹浆int寮傚父
@@ -66,9 +85,9 @@
String currentSlot = plcParameterObject.getPlcParameter("Current_slot").getValue();
log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{}锛岃幏鍙栧埌鐨勭‘璁ゅ瓧涓猴細{}锛岃幏鍙栧埌鐨勫嚭鐗囩姸鎬佸垎鍒负锛欰09:{}銆丄10:{},褰撳墠鏍煎瓙鍙蜂负锛歿}",
- taskRequestTypeValue, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
+ requestWord, glassIdeValue, confirmationWrodValue, out08Glassstate, out10Glassstate, currentSlot);
- if ("0".equals(taskRequestTypeValue)) {
+ if ("0".equals(requestWord)) {
if ("0".equals(confirmationWrodValue)) {
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓�0锛屼笖纭瀛椾负0锛屼笉鎵ц浠诲姟");
return;
@@ -81,61 +100,80 @@
log.info("2銆佽幏鍙栧埌鐨勮姹傚瓧涓嶄负0锛屽皢纭瀛椾笉涓�0锛岀洿鎺ョ粨鏉�");
return;
}
- if ("1".equals(taskRequestTypeValue)) {
+ if ("1".equals(requestWord)) {
log.info("2銆佽繘鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
- inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
- } else if ("2".equals(taskRequestTypeValue)) {
+ inTo(glassIdeValue, requestWord, confirmationWrodAddress, currentSlot);
+ } else if ("2".equals(requestWord)) {
//09绌洪棽 锛�1 10绌洪棽 锛�2 閮界┖闂诧細3 鍏朵粬0
log.info("2銆佸嚭鐗囪姹傦紝涓旂‘璁ゅ瓧涓�0锛屾墽琛岃繘鐗囦换鍔�");
// outTo(Integer.parseInt(out08Glassstate),
// Integer.parseInt(out10Glassstate), confirmationWrodAddress, "", 0);
- } else if ("3".equals(taskRequestTypeValue)) {
+ } else if ("3".equals(requestWord)) {
log.info("2銆佽繘鐗囧拰鍑虹墖閮界┖闂诧紝鎵ц鍑虹墖浠诲姟");
//鍔犵瀛愰噷闈㈡槸鍚︽湁鐜荤拑锛屾湁鍏堝嚭锛屾棤鐜荤拑鍏堣繘
-// boolean outFlase = outTo(Integer.parseInt(out08Glassstate),
+ boolean outFlase = false;
+// outTo(Integer.parseInt(out08Glassstate),
// Integer.parseInt(out10Glassstate), confirmationWrodAddress, glassIdeValue, Integer.parseInt(currentSlot));
-// log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
-// if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
-// inTo(glassIdeValue, confirmationWrodAddress, currentSlot);
-// }
+ log.info("鍑虹墖浠诲姟鏄惁瀹屾垚锛歿},澶辫触涓旂幓鐠僫d:{}涓嶄负绌哄垯鎵ц杩涚墖浠诲姟", outFlase, glassIdeValue);
+ if (!outFlase && StringUtils.isNotBlank(glassIdeValue)) {
+ inTo(glassIdeValue, requestWord, confirmationWrodAddress, currentSlot);
+ }
}
}
- private void inTo(String glassId, String confirmationWrodAddress, String currentSlot) {
+ private void inTo(String glassId, String requestWord, String confirmationWrodAddress, String currentSlot) {
log.info("1銆佹寜鐓х幓鐠僫d:{}鑾峰彇鐜荤拑灏忕墖淇℃伅,褰撳墠鏍煎瓙涓�:{}", glassId, currentSlot);
//娣诲姞杩涚墖浠诲姟 鏌ユ壘绌烘牸
DownStorageCage nearestEmpty = downStorageCageService.selectCacheEmpty(Integer.parseInt(currentSlot), Boolean.FALSE);
- Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧");
+ Assert.isTrue(null != nearestEmpty, "鏍煎瓙宸叉弧,鏃犳硶鎵ц杩涚墖鎿嶄綔");
log.info("2銆佹煡璇㈠崸寮忕悊鐗囩閲岄潰鐨勭┖鏍�:{}", nearestEmpty);
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
Assert.isFalse(null == glassInfo, "鐜荤拑淇℃伅涓嶅瓨鍦�");
- //鑾峰彇璇ョ幓鐠冪殑娴佺▼鍗℃槸鍚﹀凡缁戝畾鏋跺瓙
- DownWorkstation one = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
- .eq(DownWorkstation::getLayer, glassInfo.getLayer())
- .eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
- Boolean checkFlag = Boolean.TRUE;
- GlassInfo tempGlassInfo = null;
- if (null != one) {
- log.info("璇ユ祦绋嬪崱宸茬粦瀹氭灦瀛�");
- checkFlag = multilayerCheck(glassInfo);
+ if ("1".equals(requestWord) && (glassInfo.getWidth() > throughWidth || glassInfo.getHeight() > throughHeight)) {
+ log.info("鐜荤拑褰撳墠灏哄瀹斤細{}锛岄珮锛歿}鍙兘鐩撮�氾紝褰撳墠杩涚墖浠诲姟闇�绛夊緟", glassInfo.getWidth(), glassInfo.getHeight());
+ return;
+ }
+ Boolean checkFlag = Boolean.FALSE;
+ //鐜荤拑灏哄鏄惁璧颁汉宸ヤ笅鐗�
+ if (glassInfo.getWidth() > maxWidth || glassInfo.getHeight() > maxHeight) {
+ log.info("璇ョ幓鐠冨昂瀵歌蛋浜哄伐涓嬬墖,鐩存帴杩涚墖");
} else {
- log.info("璇ョ幓鐠冪殑娴佺▼鍗℃湭缁戝畾鏋跺瓙锛岃幏鍙栨槸鍚︽湁绌烘灦瀛�");
- List<DownWorkstation> list = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>().isNull(DownWorkstation::getFlowCardId));
- if (CollectionUtils.isNotEmpty(list)) {
- log.info("鏈夌┖鏋跺瓙,灏嗘祦绋嬪崱涓庢灦瀛愬ソ缁戝畾锛屾墽琛岃繘鐗囦换鍔� 缁撴潫");
- checkFlag = Boolean.TRUE;
- } else {
+ log.info("璇ョ幓鐠冨昂瀵搁潪浜哄伐涓嬬墖");
+ //鑾峰彇璇ョ幓鐠冪殑娴佺▼鍗℃槸鍚﹀凡缁戝畾鏋跺瓙
+ DownWorkstation one = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getLayer, glassInfo.getLayer())
+ .eq(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId()));
+ Boolean isBind = Boolean.FALSE;
+ if (null != one) {
+ log.info("璇ユ祦绋嬪崱宸茬粦瀹氭灦瀛�");
+ isBind = Boolean.TRUE;
+ checkFlag = multilayerCheck(glassInfo);
+ }
+ if (!checkFlag && !isBind) {
+ log.info("璇ョ幓鐠冪殑娴佺▼鍗℃湭缁戝畾鏋跺瓙锛岃幏鍙栨槸鍚︽湁绌烘灦瀛�");
+ List<DownWorkstation> list = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .isNull(DownWorkstation::getFlowCardId));
+ if (CollectionUtils.isNotEmpty(list)) {
+ log.info("鏈夌┖鏋跺瓙,灏嗘祦绋嬪崱涓庢灦瀛愬ソ缁戝畾锛屾墽琛岃繘鐗囦换鍔� 缁撴潫");
+ //缁戝畾娴佺▼鍗�
+ downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId())
+ .eq(DownWorkstation::getWorkstationId, list.get(0).getWorkstationId()));
+ checkFlag = Boolean.TRUE;
+ }
+ }
+ if (!checkFlag) {
log.info("鏃犵┖鏋跺瓙,鑾峰彇宸茬粦瀹氭灦瀛愮殑娴佺▼鍗′俊鎭�,鏌ョ湅鐜荤拑淇℃伅鏄惁鍙瀵硅皟");
- List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationNotIn();
+ List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.FALSE);
log.info("鑾峰彇鏋跺瓙涓婂凡缁戝畾娴佺▼鍗¤惤鏋剁殑鏁伴噺鍙婃湭钀芥灦鐨勭幓鐠冩暟鎹細{}", downGlassInfoDTOList);
Assert.isTrue(CollectionUtils.isNotEmpty(downGlassInfoDTOList), "宸茬粦瀹氭祦绋嬪崱鍧囨棤鏈惤鏋剁幓鐠冿紝璇峰強鏃跺鐞嗘灦瀛愪笂鐨勭幓鐠冿紝娓呴櫎娴佺▼鍗�");
+ //鏇挎崲鐜荤拑淇℃伅
endLoop:
for (DownGlassInfoDTO e : downGlassInfoDTOList) {
List<GlassInfo> glassInfoList = e.getGlassInfoList();
for (GlassInfo item : glassInfoList) {
if (item.getWidth().equals(glassInfo.getWidth()) && item.getHeight().equals(glassInfo.getHeight())
&& item.getThickness().equals(glassInfo.getThickness()) && item.getFilmsid().equals(glassInfo.getFilmsid())) {
- //todo:鐜荤拑鏄惁涓哄灞�
+ //鐜荤拑鏄惁涓哄灞�
checkFlag = multilayerCheck(item);
if (checkFlag) {
//鐜荤拑鏇挎崲 浠呮浛鎹㈡祦绋嬪崱id鍙婂眰鏁�
@@ -144,7 +182,7 @@
String flowCardId = glassInfo.getFlowCardId();
Integer layer = glassInfo.getLayer();
log.info("鏇挎崲娴佺▼鍗′俊鎭�,褰撳墠鐜荤拑淇℃伅:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗},鏇挎崲鍚庣幓鐠冧俊鎭�:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗}",
- tempGlassInfo, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
+ item, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
glassInfo.setFlowCardId(tempFlowCardId);
glassInfo.setLayer(tempLayer);
glassInfoService.updateById(glassInfo);
@@ -156,29 +194,193 @@
}
}
}
-
- }
- if (checkFlag) {
- //鐢熸垚杩涚墖浠诲姟 鎵ц杩涚墖鎿嶄綔
- initDownGlassTask(glassInfo, nearestEmpty.getSlot() + "", null, Const.GLASS_CACHE_TYPE_IN);
}
}
-
-
-// log.info("3銆佸皢鐜荤拑淇℃伅鎻掑叆鍗у紡鐞嗙墖绗�,褰撳墠鐜荤拑淇℃伅:{}", glassInfo);
-// EdgStorageCageDetails details = new EdgStorageCageDetails();
-// BeanUtils.copyProperties(glassInfo, details);
-// details.setState(Const.GLASS_STATE_IN);
-// details.setSlot(nearestEmpty.getSlot());
-// details.setDeviceId(nearestEmpty.getDeviceId());
-// edgStorageCageDetailsService.save(details);
-// log.info("4銆佺幓鐠冧俊鎭凡瀛樺叆鐞嗙墖绗艰鎯呰〃锛岀幓鐠冧俊鎭负{}", details);
-// //娣诲姞杩涚墖浠诲姟
-// boolean taskCache = saveTaskCache(details.getGlassId(), 0, nearestEmpty.getSlot(), Const.GLASS_CACHE_TYPE_IN);
-// log.info("5銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
-//
+ //灏嗕换鍔℃彃鍏ョ悊鐗囩璇︽儏琛�
+ DownStorageCageDetails downStorageCageDetails = new DownStorageCageDetails();
+ BeanUtils.copyProperties(glassInfo, downStorageCageDetails);
+ downStorageCageDetails.setState(Const.GLASS_STATE_IN);
+ downStorageCageDetailsService.save(downStorageCageDetails);
+// 鐢熸垚杩涚墖浠诲姟
+ initDownGlassTask(glassInfo, nearestEmpty.getSlot(), null, Const.GLASS_CACHE_TYPE_IN);
+ //log.info("5銆佺敓鎴愯繘鐗囦换鍔′俊鎭瓨鍏ヤ换鍔¤〃鏄惁瀹屾垚锛歿}", taskCache);
// S7object.getinstance().plccontrol.writeWord(confirmationWrodAddress, (short) 1);
// log.info("6銆佸彂閫佺‘璁ゅ瓧瀹屾垚");
+ }
+
+ private Boolean outTo(String glassStatus06, String glassStatus11, String glassStatus13, String glassId) {
+ if ("2".equals(glassStatus06) && "2".equals(glassStatus11) && "2".equals(glassStatus13)) {
+ log.info("G06銆丟11銆丟13鍒嗗埆涓簕},{}銆亄}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", glassStatus06, glassStatus11, glassStatus13);
+ return Boolean.FALSE;
+ }
+ List<DownStorageCageDetails> tempList = downStorageCageDetailsService.list(new LambdaQueryWrapper<DownStorageCageDetails>()
+ .eq(DownStorageCageDetails::getState, Const.GLASS_STATE_IN));
+ log.info("绗煎唴鐜荤拑鐨勬暟鎹湁锛歿}", tempList);
+ if (CollectionUtils.isEmpty(tempList)) {
+ log.info("绗煎唴娌℃湁鐜荤拑,鏃犳硶鎵ц鍑虹墖");
+ return Boolean.FALSE;
+ }
+ //鑾峰彇2涓満姊拌噦鑼冨洿鍐呯殑鏋跺瓙缁戝畾鐨勬祦绋嬪崱淇℃伅
+ List<Integer> workList = new ArrayList();
+ if (!"2".equals(glassStatus06)) {
+ workList.addAll(Const.G06_WORK_STATION);
+ }
+ if (!"2".equals(glassStatus11)) {
+ workList.addAll(Const.G11_WORK_STATION);
+ }
+ List<DownStorageCageDetails> list = new ArrayList();
+ Boolean isEmptyShelf = Boolean.FALSE;
+ //瀵圭鍐呯幓鐠冭繘琛岃繃婊わ紝浠呭嚭绗﹀悎閫昏緫鐨勭幓鐠�
+ if (CollectionUtils.isNotEmpty(workList)) {
+ List<DownWorkstation> downWorkstationList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getEnableState, 0).in(DownWorkstation::getWorkstationId, workList));
+ log.info("鏋跺瓙琚鐢紝鏃犳硶鍑虹墖钀芥灦");
+ if (CollectionUtils.isEmpty(downWorkstationList)) {
+ log.info("绗煎瓙琚鐢紝鏃犳硶璧版満姊拌噦涓嬬墖");
+ //璧颁汉宸ヤ笅鐗�
+ if (!"2".equals(glassStatus13)) {
+ list = tempList.stream().filter(item -> item.getWidth() > maxWidth || item.getHeight() > maxHeight).collect(Collectors.toList());
+ }
+ } else {
+ List<DownWorkstation> workstationsIsNotBind = downWorkstationList.stream().filter(item -> null == (item.getFlowCardId())).collect(Collectors.toList());
+ Map<String, List<DownWorkstation>> listMap = downWorkstationList.stream().collect(Collectors.groupingBy(item -> item.getFlowCardId() + ":" + item.getLayer()));
+ if (CollectionUtils.isEmpty(workstationsIsNotBind)) {
+ log.info("涓嶅瓨鍦ㄦ湭缁戝畾娴佺▼鍗℃灦瀛�");
+ //绛涢�夊嚭瀵瑰簲鏋跺瓙宸茬粦瀹氭祦绋嬪崱鍙笅鐗囩殑鐜荤拑
+ list = tempList.stream().filter(item -> listMap.containsKey(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ } else {
+ log.info("瀛樺湪鏈粦瀹氭祦绋嬪崱鏋跺瓙锛岀洿鎺ヨ幏鍙栫鍐呮墍鏈夌幓鐠�");
+ isEmptyShelf = Boolean.TRUE;
+ //todo:濡傛灉绂佺敤鏋跺瓙宸茬粦瀹氭祦绋嬪崱锛屽洜涓烘椂闂翠笉纭畾锛岀瀛愬唴鐨勭幓鐠冨彲閲嶆柊缁戝畾鏂版灦瀛�
+// list = tempList.stream().filter(item -> !listMap.containsKey(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ list = tempList;
+ }
+ }
+ } else {
+ //鐩存帴璧颁汉宸ヤ笅鐗�
+ list = tempList.stream().filter(item -> item.getWidth() > maxWidth || item.getHeight() > maxHeight).collect(Collectors.toList());
+ }
+ if (CollectionUtils.isEmpty(list)) {
+ log.info("绗煎唴鐜荤拑鏃犳硶鎵ц鍑虹墖");
+ return Boolean.FALSE;
+ }
+ //瀹氫箟绗煎唴鏃犳硶鍑虹墖鐜荤拑鏁伴噺
+ int glassCount = tempList.size() - list.size();
+ String tempGlassId = null;
+ Boolean isBind = Boolean.FALSE;
+
+ for (DownStorageCageDetails item : list) {
+ if (item.getWidth() > maxWidth || item.getHeight() > maxHeight) {
+ log.info("鐜荤拑瀹藉害鎴栭珮搴﹁秴鍑洪槇鍊硷紝鎵ц浜哄伐涓嬬墖");
+ tempGlassId = item.getGlassId();
+ break;
+ }
+ }
+ loop:
+ if (tempGlassId == null) {
+ //鑾峰彇姝ｅ湪钀芥灦鐨勭粦瀹氭祦绋嬪崱鐨勪俊鎭�(娴佺▼鍗°�佸眰鏁般�佽惤鏋舵暟閲�)
+ List<DownGlassInfoDTO> downGlassInfoDTOList = downGlassInfoService.queryWorkStationIsIn(Boolean.TRUE);
+ List<String> downGlassFlowList = downGlassInfoDTOList.stream().map(item -> item.getFlowCardId() + ":" + item.getLayer()).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(downGlassFlowList)) {
+ //鏋跺瓙鐜荤拑閮戒负绌猴紝鍑虹鍐呭瓙鏁伴噺鏈�澶氬昂瀵告渶澶х殑鐜荤拑
+ DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getGlassInfoMaxCount();
+ //缁戝畾娴佺▼鍗★紝鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟锛�
+ tempGlassId = downStorageCageDetails.getGlassId();
+ isBind = Boolean.TRUE;
+ break loop;
+ }
+ //灏嗙瀛愬唴鐨勭幓鐠冭繘琛岃繃婊わ紝浠呰幏鍙栨棤娉曡惤鏋剁殑娴佺▼鍗＄幓鐠�
+ List<DownStorageCageDetails> noDownLoadList = list.stream().filter(item -> !downGlassFlowList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(noDownLoadList)) {
+ //鏄惁鏈夌┖鏋跺瓙
+// List<DownWorkstation> emptyShelfList = downWorkstationService.list(new LambdaQueryWrapper<DownWorkstation>()
+// .isNull(DownWorkstation::getFlowCardId));
+ if (isEmptyShelf) {
+ DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getGlassInfoMaxCount();
+ //缁戝畾娴佺▼鍗★紝鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
+ tempGlassId = downStorageCageDetails.getGlassId();
+ isBind = Boolean.TRUE;
+ break loop;
+ }
+ glassCount = noDownLoadList.size();
+ if (glassCount > threshold) {
+ //鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浜哄伐涓嬬墖浠诲姟
+ tempGlassId = noDownLoadList.get(0).getGlassId();
+ isBind = Boolean.FALSE;
+ break loop;
+ }
+ }
+ //灏嗙瀛愬唴鐨勭幓鐠冭繘琛岃繃婊わ紝浠呰幏鍙栧彲钀芥灦鐨勬祦绋嬪崱鐜荤拑
+ List<DownStorageCageDetails> downLoadList = list.stream().filter(item -> downGlassFlowList.contains(item.getFlowCardId() + ":" + item.getLayer())).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(downLoadList)) {
+ //涓嶆墽琛屽嚭鐗囦换鍔★紝绗煎唴娌℃湁鍚堥�傜殑鍑虹墖鐜荤拑
+ return Boolean.FALSE;
+ }
+ //灏嗙鍐呯幓鐠冪殑娴佺▼鍗�+灞傚彿 鍜岃惤鏋剁殑娴佺▼鍗� 鍘婚噸锛屽緱鍑哄睍绀烘棤娉曡惤鏋剁殑鐜荤拑锛屽垽鏂幓鐠冩暟鏄惁瓒呰繃闃堝��
+ //绗煎唴鐜荤拑鏄惁鍙惤鏋�:绗煎唴鏄惁鏈夐渶瑕佷腑绌虹殑
+ List<DownStorageCageDetails> multiLayerList = list.stream().filter(item -> item.getTotalLayer() >= 2).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(multiLayerList)) {
+ for (DownStorageCageDetails item : multiLayerList) {
+ DownGlassInfoDTO downGlassInfoDTO = downGlassInfoService.queryDownGlassMaxLayer(item.getFlowCardId());
+ if (null == downGlassInfoDTO) {
+// 钀芥灦鐜荤拑鏌ュ埌鐩稿叧娴佺▼鍗＄幓鐠冧俊鎭紝琛ㄦ槑褰撳墠娴佺▼鍗＄幓鐠冩湭钀芥灦
+ log.info("");
+ return Boolean.FALSE;
+ }
+ if (downGlassInfoDTO.getLayer().equals(downGlassInfoDTO.getLayer())) {
+ log.info("褰撳墠鐜荤拑鐨勬祦绋嬪湪鏋跺瓙涓婅惤鏋舵渶澶�,鐩存帴鍑虹墖");
+ //鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
+ tempGlassId = noDownLoadList.get(0).getGlassId();
+ isBind = Boolean.FALSE;
+ break loop;
+ }
+ Integer sequence = downGlassInfoService.queryMaxSequence(item.getFlowCardId(), item.getLayer());
+ log.info("鑾峰彇褰撳墠鐜荤拑闇�瑕佹斁鐨勬搴忥細绗煎唴鍚屾祦绋� 鍚屽眰鏁扮殑閫氳揪娆″簭+1:{}", sequence);
+ DownGlassInfo downGlassInfo = downGlassInfoService.getOne(new LambdaQueryWrapper<DownGlassInfo>()
+ .eq(DownGlassInfo::getFlowCardId, downGlassInfoDTO.getFlowCardId())
+ .eq(DownGlassInfo::getLayer, downGlassInfoDTO.getLayer()).eq(DownGlassInfo::getSequence, sequence));
+ if (null != downGlassInfoDTO && downGlassInfo.getWidth().equals(item.getWidth()) && downGlassInfo.getHeight().equals(item.getHeight())) {
+ log.info("鐩稿悓娆″簭鐜荤拑瀵瑰簲涓婏紝鍙墽琛岃繘鐗囦换鍔�");
+ //鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
+ tempGlassId = noDownLoadList.get(0).getGlassId();
+ isBind = Boolean.FALSE;
+ break loop;
+ } else {
+ log.info("鍚屾搴忕幓鐠冨搴斾笉涓婏紝闇�鎵ц鏇挎崲鐜荤拑鐨勬搷浣�");
+ glassCount += 1;
+ if (glassCount > threshold) {
+ tempGlassId = noDownLoadList.get(0).getGlassId();
+ isBind = Boolean.FALSE;
+ break loop;
+ }
+ continue;
+ }
+ }
+ }
+
+ Map<String, List<DownStorageCageDetails>> singleLayerMap = list.stream().filter(item -> item.getTotalLayer() == 1)
+ .collect(Collectors.groupingBy(item -> item.getFlowCardId() + item.getLayer(), Collectors.toList()));
+ if (tempGlassId == null) {
+ if (CollectionUtils.isNotEmpty(singleLayerMap)) {
+ //鑾峰彇宸茶惤鏋舵祦绋嬪崱淇℃伅锛屾寜钀芥灦鏁伴噺鎺掑簭
+ for (DownGlassInfoDTO e : downGlassInfoDTOList) {
+ List<DownStorageCageDetails> downStorageCageDetails = singleLayerMap.get(e.getFlowCardId() + e.getLayer());
+ if (CollectionUtils.isNotEmpty(downStorageCageDetails)) {
+ tempGlassId = downStorageCageDetails.get(0).getGlassId();
+ isBind = Boolean.FALSE;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (tempGlassId == null) {
+ log.info("娌℃湁鎵惧埌鍙互涓嬬墖鐨勭殑鐜荤拑锛岀粨鏉熶换鍔�");
+ return Boolean.FALSE;
+ } else {
+ //鎸夌収鍑虹墖鐨勭幓鐠僫d鏇存柊绗煎唴鐨勭幓鐠冪姸鎬佷负宸插嚭鐗�
+ return generateDownGlassOutTask(tempGlassId, Const.GLASS_CACHE_TYPE_OUT, isBind);
+ }
}
private Boolean multilayerCheck(GlassInfo glassInfo) {
@@ -213,7 +415,46 @@
}
}
- private Boolean initDownGlassTask(GlassInfo glassInfo, String startCell, String endCell, Integer taskType) {
+ private Boolean generateDownGlassOutTask(String glassId, Integer taskType, Boolean isBind) {
+ //鎸夌幓鐠僫d鑾峰彇鐜荤拑淇℃伅
+ DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getOne(new LambdaQueryWrapper<DownStorageCageDetails>()
+ .eq(DownStorageCageDetails::getGlassId, glassId));
+ Integer endCell = null;
+ if (isBind) {
+ //鑾峰彇绌烘灦瀛愪俊鎭紝灏嗙┖鏋跺瓙淇℃伅缁戝畾娴佺▼鍗�
+ DownWorkstation emptyDownWorkstation = downWorkstationService.getOne(new LambdaQueryWrapper<DownWorkstation>()
+ .isNull(DownWorkstation::getFlowCardId).orderByDesc(DownWorkstation::getWorkstationId).last("limit 1"));
+ if (null != emptyDownWorkstation) {
+ log.info("鑾峰彇鍒扮┖鏋跺瓙淇℃伅锛岀粦瀹氭祦绋嬪崱");
+ emptyDownWorkstation.setFlowCardId(downStorageCageDetails.getFlowCardId());
+ emptyDownWorkstation.setLayer(downStorageCageDetails.getLayer());
+ downWorkstationService.updateById(emptyDownWorkstation);
+ endCell = emptyDownWorkstation.getWorkstationId();
+ } else {
+ log.info("娌℃湁绌烘灦瀛愪俊鎭紝鏃犳硶缁戝畾娴佺▼鍗�");
+ return Boolean.FALSE;
+ }
+ } else {
+ DownWorkstation workstation = downWorkstationService.getOne(new LambdaUpdateWrapper<DownWorkstation>()
+ .eq(DownWorkstation::getFlowCardId, downStorageCageDetails.getFlowCardId()).eq(DownWorkstation::getLayer, downStorageCageDetails.getLayer()));
+ endCell = workstation.getWorkstationId();
+ }
+ //鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬�
+ if (downStorageCageDetailsService.update(new LambdaUpdateWrapper<DownStorageCageDetails>()
+ .set(DownStorageCageDetails::getState, Const.GLASS_STATE_OUT).eq(DownStorageCageDetails::getGlassId, glassId))) {
+ log.info("鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬佹垚鍔�");
+ } else {
+ log.info("鏇存柊璇︽儏琛ㄥ唴鐨勭姸鎬佸け璐�");
+ return Boolean.FALSE;
+ }
+ //鐢熸垚浠诲姟淇℃伅
+ GlassInfo glassInfo = new GlassInfo();
+ BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
+ return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot(), endCell, taskType);
+ }
+
+ private Boolean initDownGlassTask(GlassInfo glassInfo, Integer startCell, Integer endCell, Integer taskType) {
+ log.info("鐜荤拑{}鐢熸垚杩涚墖浠诲姟", glassInfo.getGlassId());
DownGlassTask downGlassTask = new DownGlassTask();
BeanUtils.copyProperties(glassInfo, downGlassTask);
downGlassTask.setStartCell(startCell);
--
Gitblit v1.8.0