From 23ffcbc16fd92043aaaac784ad770c5cccb36b55 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 六月 2024 22:07:30 +0800
Subject: [PATCH] 下片任务自测完成50%，已完成基本进片出片，复杂逻辑为测试
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 144 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 63 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 cd2a2f3..e3afe50 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
@@ -25,7 +25,6 @@
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;
@@ -72,7 +71,7 @@
private Integer maxHeight;
- @Scheduled(fixedDelay = 1000)
+ // @Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String requestWord = plcParameterObject.getPlcParameter("RequestWord").getValue();
@@ -121,7 +120,7 @@
}
}
- private void inTo(String glassId, String requestWord, String confirmationWrodAddress, String currentSlot) {
+ public 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);
@@ -147,7 +146,7 @@
if (null != one) {
log.info("璇ユ祦绋嬪崱宸茬粦瀹氭灦瀛�");
isBind = Boolean.TRUE;
- checkFlag = multilayerCheck(glassInfo);
+ checkFlag = multilayerCheck(glassInfo, isBind);
}
if (!checkFlag && !isBind) {
log.info("璇ョ幓鐠冪殑娴佺▼鍗℃湭缁戝畾鏋跺瓙锛岃幏鍙栨槸鍚︽湁绌烘灦瀛�");
@@ -156,7 +155,9 @@
if (CollectionUtils.isNotEmpty(list)) {
log.info("鏈夌┖鏋跺瓙,灏嗘祦绋嬪崱涓庢灦瀛愬ソ缁戝畾锛屾墽琛岃繘鐗囦换鍔� 缁撴潫");
//缁戝畾娴佺▼鍗�
- downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>().set(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId())
+ downWorkstationService.update(new LambdaUpdateWrapper<DownWorkstation>()
+ .set(DownWorkstation::getFlowCardId, glassInfo.getFlowCardId())
+ .set(DownWorkstation::getLayer, glassInfo.getLayer())
.eq(DownWorkstation::getWorkstationId, list.get(0).getWorkstationId()));
checkFlag = Boolean.TRUE;
}
@@ -165,31 +166,34 @@
log.info("鏃犵┖鏋跺瓙,鑾峰彇宸茬粦瀹氭灦瀛愮殑娴佺▼鍗′俊鎭�,鏌ョ湅鐜荤拑淇℃伅鏄惁鍙瀵硅皟");
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())) {
- //鐜荤拑鏄惁涓哄灞�
- checkFlag = multilayerCheck(item);
- if (checkFlag) {
- //鐜荤拑鏇挎崲 浠呮浛鎹㈡祦绋嬪崱id鍙婂眰鏁�
- String tempFlowCardId = item.getFlowCardId();
- Integer tempLayer = item.getLayer();
- String flowCardId = glassInfo.getFlowCardId();
- Integer layer = glassInfo.getLayer();
- log.info("鏇挎崲娴佺▼鍗′俊鎭�,褰撳墠鐜荤拑淇℃伅:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗},鏇挎崲鍚庣幓鐠冧俊鎭�:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗}",
- item, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
- glassInfo.setFlowCardId(tempFlowCardId);
- glassInfo.setLayer(tempLayer);
- glassInfoService.updateById(glassInfo);
- item.setFlowCardId(flowCardId);
- item.setLayer(layer);
- glassInfoService.updateById(item);
- break endLoop;
+ if (CollectionUtils.isNotEmpty(downGlassInfoDTOList)) {
+ log.info("宸茬粦瀹氭祦绋嬪崱鍧囨棤鏈惤鏋剁幓鐠冿紝璇峰強鏃跺鐞嗘灦瀛愪笂鐨勭幓鐠冿紝娓呴櫎娴佺▼鍗�,鎵ц杩涚墖浠诲姟");
+ } else {
+ //鏇挎崲鐜荤拑淇℃伅
+ 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())) {
+ //鐜荤拑鏄惁涓哄灞�
+ checkFlag = multilayerCheck(item, Boolean.FALSE);
+ if (checkFlag) {
+ //鐜荤拑鏇挎崲 浠呮浛鎹㈡祦绋嬪崱id鍙婂眰鏁�
+ String tempFlowCardId = item.getFlowCardId();
+ Integer tempLayer = item.getLayer();
+ String flowCardId = glassInfo.getFlowCardId();
+ Integer layer = glassInfo.getLayer();
+ log.info("鏇挎崲娴佺▼鍗′俊鎭�,褰撳墠鐜荤拑淇℃伅:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗},鏇挎崲鍚庣幓鐠冧俊鎭�:{}鐨勬祦绋嬪崱鍙穥}鍙婂眰鏁皗}",
+ item, glassInfo, flowCardId, layer, tempFlowCardId, tempLayer);
+ glassInfo.setFlowCardId(tempFlowCardId);
+ glassInfo.setLayer(tempLayer);
+ glassInfoService.updateById(glassInfo);
+ item.setFlowCardId(flowCardId);
+ item.setLayer(layer);
+ glassInfoService.updateById(item);
+ break endLoop;
+ }
}
}
}
@@ -200,21 +204,32 @@
DownStorageCageDetails downStorageCageDetails = new DownStorageCageDetails();
BeanUtils.copyProperties(glassInfo, downStorageCageDetails);
downStorageCageDetails.setState(Const.GLASS_STATE_IN);
+ downStorageCageDetails.setSlot(nearestEmpty.getSlot());
downStorageCageDetailsService.save(downStorageCageDetails);
// 鐢熸垚杩涚墖浠诲姟
- initDownGlassTask(glassInfo, nearestEmpty.getSlot(), null, Const.GLASS_CACHE_TYPE_IN);
+ initDownGlassTask(glassInfo, 0, nearestEmpty.getSlot(), 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) {
+ public 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));
+ //todo:鑾峰彇寰呰繘鐗囩幓鐠�
+ DownStorageCageDetails cageDetails = new DownStorageCageDetails();
+ if (StringUtils.isNotBlank(glassId)) {
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+ BeanUtils.copyProperties(glassInfo, cageDetails);
+ cageDetails.setSlot(0);
+ tempList.add(cageDetails);
+ }
+
log.info("绗煎唴鐜荤拑鐨勬暟鎹湁锛歿}", tempList);
if (CollectionUtils.isEmpty(tempList)) {
log.info("绗煎唴娌℃湁鐜荤拑,鏃犳硶鎵ц鍑虹墖");
@@ -264,8 +279,6 @@
log.info("绗煎唴鐜荤拑鏃犳硶鎵ц鍑虹墖");
return Boolean.FALSE;
}
- //瀹氫箟绗煎唴鏃犳硶鍑虹墖鐜荤拑鏁伴噺
- int glassCount = tempList.size() - list.size();
String tempGlassId = null;
Boolean isBind = Boolean.FALSE;
@@ -282,7 +295,7 @@
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();
@@ -302,13 +315,6 @@
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());
@@ -323,14 +329,16 @@
for (DownStorageCageDetails item : multiLayerList) {
DownGlassInfoDTO downGlassInfoDTO = downGlassInfoService.queryDownGlassMaxLayer(item.getFlowCardId());
if (null == downGlassInfoDTO) {
-// 钀芥灦鐜荤拑鏌ュ埌鐩稿叧娴佺▼鍗＄幓鐠冧俊鎭紝琛ㄦ槑褰撳墠娴佺▼鍗＄幓鐠冩湭钀芥灦
+// 鍘嗗彶钀芥灦鐜荤拑鎸夌収鐩稿叧娴佺▼鍗″彇鏁版嵁搴撴湭鎵惧埌鏈�澶氱幓鐠冧俊鎭紝琛ㄦ槑褰撳墠娴佺▼鍗′笅鐨勬湁灞傜殑鐜荤拑鍧囨湭钀芥灦锛岀洿鎺ュ彲鍑哄綋鍓嶇幓鐠�
log.info("");
- return Boolean.FALSE;
+ isBind = Boolean.FALSE;
+ tempGlassId = item.getGlassId();
+ break loop;
}
if (downGlassInfoDTO.getLayer().equals(downGlassInfoDTO.getLayer())) {
log.info("褰撳墠鐜荤拑鐨勬祦绋嬪湪鏋跺瓙涓婅惤鏋舵渶澶�,鐩存帴鍑虹墖");
//鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
- tempGlassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = item.getGlassId();
isBind = Boolean.FALSE;
break loop;
}
@@ -342,18 +350,9 @@
if (null != downGlassInfoDTO && downGlassInfo.getWidth().equals(item.getWidth()) && downGlassInfo.getHeight().equals(item.getHeight())) {
log.info("鐩稿悓娆″簭鐜荤拑瀵瑰簲涓婏紝鍙墽琛岃繘鐗囦换鍔�");
//鏇存柊鐜荤拑鐘舵�侊紝鐢熸垚鍑虹墖浠诲姟
- tempGlassId = noDownLoadList.get(0).getGlassId();
+ tempGlassId = item.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;
}
}
}
@@ -379,18 +378,23 @@
return Boolean.FALSE;
} else {
//鎸夌収鍑虹墖鐨勭幓鐠僫d鏇存柊绗煎唴鐨勭幓鐠冪姸鎬佷负宸插嚭鐗�
- return generateDownGlassOutTask(tempGlassId, Const.GLASS_CACHE_TYPE_OUT, isBind);
+ return generateDownGlassOutTask(tempGlassId, Const.GLASS_CACHE_TYPE_OUT, isBind, cageDetails);
}
}
- private Boolean multilayerCheck(GlassInfo glassInfo) {
+ private Boolean multilayerCheck(GlassInfo glassInfo, boolean isBind) {
//鏌ヨ璇ユ祦绋嬪崱鏄惁涓哄灞�
if (glassInfo.getTotalLayer() > 1) {
log.info("鎸夌収娴佺▼鍗¤幏鍙栧綋鍓嶆祦绋嬪崱鍚勫眰宸茶惤鏋舵暟閲�");
DownGlassInfoDTO downGlassInfoDTO = downGlassInfoService.queryDownGlassMaxLayer(glassInfo.getFlowCardId());
if (null == downGlassInfoDTO) {
- log.info("鏋跺瓙宸茬粡鍗犳弧锛屽灞傜幓鐠冩棤娉曟壘鍒板搴旂殑鏍煎瓙锛岄渶鎵ц鏇挎崲鐜荤拑鐨勬搷浣�");
- return Boolean.FALSE;
+ if (isBind) {
+ return Boolean.TRUE;
+ } else {
+ log.info("鏋跺瓙宸茬粡鍗犳弧锛屽灞傜幓鐠冩棤娉曟壘鍒板搴旂殑鏍煎瓙锛岄渶鎵ц鏇挎崲鐜荤拑鐨勬搷浣�");
+ return Boolean.FALSE;
+ }
+
}
if (downGlassInfoDTO.getLayer().equals(glassInfo.getLayer())) {
log.info("褰撳墠鐜荤拑鐨勬祦绋嬪湪鏋跺瓙涓婅惤鏋舵渶澶� 鐩存帴杩涚墖");
@@ -415,10 +419,17 @@
}
}
- private Boolean generateDownGlassOutTask(String glassId, Integer taskType, Boolean isBind) {
+ private Boolean generateDownGlassOutTask(String glassId, Integer taskType, Boolean isBind, DownStorageCageDetails cageDetails) {
//鎸夌幓鐠僫d鑾峰彇鐜荤拑淇℃伅
- DownStorageCageDetails downStorageCageDetails = downStorageCageDetailsService.getOne(new LambdaQueryWrapper<DownStorageCageDetails>()
- .eq(DownStorageCageDetails::getGlassId, glassId));
+ DownStorageCageDetails downStorageCageDetails = null;
+ if (glassId.equals(cageDetails.getGlassId())) {
+ downStorageCageDetails = cageDetails;
+ taskType = 3;
+ } else {
+ downStorageCageDetails = downStorageCageDetailsService.getOne(new LambdaQueryWrapper<DownStorageCageDetails>()
+ .eq(DownStorageCageDetails::getGlassId, glassId));
+ }
+
Integer endCell = null;
if (isBind) {
//鑾峰彇绌烘灦瀛愪俊鎭紝灏嗙┖鏋跺瓙淇℃伅缁戝畾娴佺▼鍗�
@@ -448,6 +459,10 @@
return Boolean.FALSE;
}
//鐢熸垚浠诲姟淇℃伅
+ DownGlassInfo downGlassInfo = new DownGlassInfo();
+ BeanUtils.copyProperties(downStorageCageDetails, downGlassInfo);
+ downGlassInfoService.save(downGlassInfo);
+ //鐢熸垚浠诲姟淇℃伅
GlassInfo glassInfo = new GlassInfo();
BeanUtils.copyProperties(downStorageCageDetails, glassInfo);
return initDownGlassTask(glassInfo, downStorageCageDetails.getSlot(), endCell, taskType);
@@ -456,10 +471,13 @@
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);
+ downGlassTask.setGlassId(glassInfo.getGlassId());
downGlassTask.setEndCell(endCell);
downGlassTask.setTaskType(taskType + "");
+ downGlassTask.setWidth(glassInfo.getWidth().intValue());
+ downGlassTask.setHeight(glassInfo.getHeight().intValue());
+ downGlassTask.setFlowCardId(glassInfo.getFlowCardId());
downGlassTask.setTaskStauts(0);
downGlassTask.setCreateTime(new Date());
return downGlassTaskService.save(downGlassTask);
--
Gitblit v1.8.0