From 4f5d1a4c178231bf0eb5db2f8e6f158fffbf5635 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 01 七月 2024 17:57:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 334 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 217 insertions(+), 117 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 01aa22e..b7f0f13 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.github.yulichang.toolkit.JoinWrappers;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import com.mes.base.entity.BigStorageCageBaseInfo;
import com.mes.bigstorage.entity.BigStorageCage;
import com.mes.bigstorage.entity.BigStorageCageDetails;
import com.mes.bigstorage.entity.BigStorageDTO;
@@ -16,24 +18,25 @@
import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
import com.mes.bigstoragetask.service.BigStorageCageFeedTaskService;
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
+import com.mes.common.S7object;
import com.mes.common.config.Const;
+import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
+import com.mes.tools.S7control;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -63,84 +66,96 @@
@Value("${mes.sequence.order}")
private boolean sequenceOrder;
+ @Value("${mes.carWidth}")
+ private Integer carWidth;
+
@Value("${mes.slotWidth}")
private Integer slotWidth;
- // @Scheduled(fixedDelay = 5000)
- public void plcToHomeEdgScan(String d01Id) {
-// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
-// String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
-// String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
-// String d02SitState = plcParameterObject.getPlcParameter("D02SitState").getValue();
-// String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
-// String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue();
-// String d05SitState = plcParameterObject.getPlcParameter("D05SitState").getValue();
+ @Value("${mes.inCarMaxSize}")
+ private Integer inCarMaxSize;
- String d01Request = "1";
- String d02SitState = "0";
-// String d01Id = "P24060403|3|6";
- String d04Request = "0";
- String d05SitState = "0";
-// String d04Id = "P24060403|4|3";
- String d04Id = "P24060403|5|4";
- log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
- d01Request, d01Id, d04Request, d04Id);
- if (!REQUEST_WORD.equals(d01Request) && !REQUEST_WORD.equals(d04Request)) {
+ @Value("${mes.outCarMaxSize}")
+ private Integer outCarMaxSize;
+
+ @Value("${mes.galssGap}")
+ private Integer galssGap;
+
+ // @Scheduled(fixedDelay = 5000)
+ public void plcToHomeEdgScan() {
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ String d03State = plcParameterObject.getPlcParameter("D03State").getValue();
+ String d05State = plcParameterObject.getPlcParameter("D05State").getValue();
+ String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
+ String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
+
+
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
- if (REQUEST_WORD.equals(d02SitState) && REQUEST_WORD.equals(d05SitState)) {
+ if (REQUEST_WORD.equals(d03State) && REQUEST_WORD.equals(d05State)) {
log.info("涓ゆ潯绾垮崸杞珛鍧囧湪鎵ц浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
- Boolean flag01 = Boolean.FALSE;
- Boolean flag04 = Boolean.FALSE;
+// Boolean flag01 = Boolean.FALSE;
+// Boolean flag04 = Boolean.FALSE;
//鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�
- if (REQUEST_WORD.equals(d01Request) && !REQUEST_WORD.equals(d02SitState)) {
- flag01 = judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION);
+ if (StringUtils.isNotBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
+ judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
}
- if (REQUEST_WORD.equals(d04Request) && !REQUEST_WORD.equals(d05SitState)) {
- flag04 = judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION);
+ if (StringUtils.isNotBlank(d04Id) && !REQUEST_WORD.equals(d05State)) {
+ judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
}
- if (flag01 && flag04) {
- //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
- Integer startLine = getStartLine();
- //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine);
- } else if (flag01 || flag04) {
- Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
- computeTargetByLine(startLine);
- } else {
- log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
- }
+ log.info("缁撴潫鎵爜浠诲姟");
+// if (flag01 && flag04) {
+// //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+// Integer startLine = getStartLine();
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+// computeTargetByLine(startLine);
+// } else if (flag01 || flag04) {
+// Integer startLine = flag01.equals(Boolean.TRUE) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+// computeTargetByLine(startLine);
+// } else {
+// log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
+// }
}
- // @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgFreeCarTask() {
-// PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
-// String e01Status = plcParameterObject.getPlcParameter("E01Status").getValue();
- String e01Status = "0";
+ PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
+ String e01Status = plcParameterObject.getPlcParameter("E01State").getValue();
if (REQUEST_WORD.equals(e01Status)) {
log.info("杩涚墖澶ц溅闈炵┖闂�");
return;
}
-// String d01Request = plcParameterObject.getPlcParameter("D01Request").getValue();
-// String d01Id = plcParameterObject.getPlcParameter("D01ID1").getValue();
-// String d04Request = plcParameterObject.getPlcParameter("D04Request").getValue();
-// String d04Id = plcParameterObject.getPlcParameter("D04ID1").getValue();
- String d01Request = "";
- String d01Id = "";
- String d04Request = "1";
- String d04Id = "";
- log.info("1銆佽幏鍙栧埌鐨勮姹傚瓧d01涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};鑾峰彇鍒扮殑璇锋眰瀛梔04涓猴細{}锛岃幏鍙栧埌鐨勬壂鎻廔D涓猴細{};",
- d01Request, d01Id, d04Request, d04Id);
- //涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
- if (Const.BIG_STORAGE_REQUEST_IN.equals(d01Request)
- && Const.BIG_STORAGE_REQUEST_IN.equals(d04Request)) {
- log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
- return;
+ List<BigStorageCageFeedTask> feedTaskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .eq(BigStorageCageFeedTask::getTaskType, Const.BIG_STORAGE_IN_RUN)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP));
+ if (CollectionUtils.isNotEmpty(feedTaskList)) {
+ if (feedTaskList.size() == 1) {
+ computeTargetByLine(feedTaskList.get(0).getLine());
+ return;
+ } else {
+ //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+ Integer startLine = getStartLine();
+// //璁＄畻鐩爣鏍煎瓙锛屽彂閫佸惎鍔ㄤ换鍔�
+ computeTargetByLine(startLine);
+ return;
+ }
}
+ String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
+ //涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
+// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
+// log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
+// return;
+// }
//鑾峰彇涓ゆ潯绾垮崸杞珛鏄惁鏈夌幓鐠冿紝涓斾换鍔＄姸鎬侀兘涓�2
List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
if (CollectionUtils.isEmpty(lineList)) {
@@ -149,62 +164,74 @@
}
Integer lineFirst = lineList.get(0);
String lineGlassId = lineFirst.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d04Id;
+ //浠呮湁涓�鏉″厛绗﹀悎鍚姩鍚姩鏉′欢
if (lineList.size() == 1) {
- //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ //濡傛灉杩涚墖璇锋眰浣嗙幓鐠冧负绌猴紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
if (StringUtils.isEmpty(lineGlassId)) {
computeTargetByLine(lineFirst);
+ } else {
+ //todo:璁＄畻鎵弿鍒扮殑鐜荤拑鏄惁鍙互瀛樿繘鍗ц浆绔�
+ //鑾峰彇鍗ц浆绔嬪墿浣欏搴�
+ if (computeIsRun(lineFirst, lineGlassId)) {
+ computeTargetByLine(lineFirst);
+ }
}
return;
}
+ //涓ゆ潯鍏堝潎鍙墽琛岃繘鐗囦换鍔★紝鍒ゆ柇涓ゆ潯绾挎槸鍚﹁繘鐗囪姹傛槸鍚﹂兘涓虹┖
if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
return;
+ } else if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
+// todo:涓や釜閮芥湁杩涚墖鐜荤拑
+ if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id) && computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
+ //姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
+ Integer line = getStartLine();
+ //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(line);
+ } else if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id)) {
+ computeTargetByLine(Const.A09_OUT_TARGET_POSITION);
+ } else if (computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
+ computeTargetByLine(Const.A10_OUT_TARGET_POSITION);
+ } else {
+ return;
+ }
+ } else {
+ //锛屾垨鑰呬粎鏈変竴鏉℃湁鐜荤拑
+ //涓�鏉＄嚎涓虹┖锛屼竴鏉＄嚎鏈夎繘鐗囪姹傛湁鐜荤拑
+ int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
+ //鑾峰彇杩涚墖璇锋眰鐜荤拑涓虹┖鐨勶紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
+ computeTargetByLine(outLine);
}
- int outLine = StringUtils.isBlank(d01Id) ? Const.A09_OUT_TARGET_POSITION : Const.A10_OUT_TARGET_POSITION;
- //璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
- computeTargetByLine(outLine);
+
}
// @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgOutTask() {
- //浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
- List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
+
+ List<BigStorageCageOutTask> outingList = bigStorageCageOutTaskService.list(new LambdaQueryWrapper<BigStorageCageOutTask>().eq(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_NEW));
+ Assert.isTrue(CollectionUtils.isEmpty(outingList), "鏈夋鍦ㄦ墽琛屽嚭鐗囩殑浠诲姟锛岀粨鏉熷綋鍓嶅嚭鐗囩嚎绋�");
+
//鏄惁鏈夋鍦ㄩ挗鍖栫殑鐜荤拑
- List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.list(new LambdaQueryWrapper<TemperingGlassInfo>()
+ List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
+ .selectAll(TemperingGlassInfo.class)
+ .leftJoin(BigStorageCageOutTask.class, BigStorageCageOutTask::getGlassId, TemperingGlassInfo::getGlassId)
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
+ .isNull(BigStorageCageOutTask::getGlassId)
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
- //鎵撹溅鍓╀綑灏哄
- Integer remainWidth = Const.BIG_STORAGE_WIDTH;
- for (TemperingGlassInfo e : temperingGlassInfoList) {
- if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) {
- break;
- }
- remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
- e.getWidth().intValue(), 0, 0, 1));
- }
- bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ computeOutGlassInfo(temperingGlassInfoList);
return;
}
//鏄惁鏈変汉宸ヤ笅鐗囦换鍔� 鏈夌洿鎺ュ嚭
List<BigStorageCageDetails> artificialList = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_ARTIFICIAL).orderByDesc(BigStorageCageDetails::getWidth));
if (CollectionUtils.isNotEmpty(artificialList)) {
- Integer remainWidth = Const.BIG_STORAGE_WIDTH;
- for (BigStorageCageDetails e : artificialList) {
- if (remainWidth < e.getWidth().intValue()) {
- break;
- }
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.A10_OUT_TARGET_POSITION,
- e.getWidth().intValue(), 0, 0, 1));
- remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
- }
- bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ computeOutGlassInfo(temperingGlassInfoList);
return;
}
//閽㈠寲浼樺厛锛氳幏鍙栫悊鐗囩 鐜荤拑灏忕墖 鐮存崯琛� 鏁伴噺 鍒ゆ柇绗煎唴鐗堝浘鏄惁鍒伴綈
@@ -214,24 +241,14 @@
//鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
.selectAll(GlassInfo.class)
+ .select("-1 as state")
.selectAs(BigStorageCageDetails::getSlot, TemperingGlassInfo::getSlot)
.innerJoin(BigStorageCageDetails.class, BigStorageCageDetails::getGlassId, GlassInfo::getGlassId)
.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
.eq(GlassInfo::getTemperingLayoutId, temperingLayoutDTO.getTemperingLayoutId())
.eq(GlassInfo::getEngineerId, temperingLayoutDTO.getEngineerId()));
temperingGlassInfoService.saveBatch(temperingGlassInfos);
-
- //澶ц溅鍓╀綑灏哄
- Integer remainWidth = Const.BIG_STORAGE_WIDTH;
- for (TemperingGlassInfo e : temperingGlassInfos) {
- if (bigStorageCageOutTaskList.size() > 5 || e.getWidth() > remainWidth) {
- break;
- }
- remainWidth = remainWidth - e.getWidth().intValue() - Const.BIG_STORAGE_GAP;
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getState(), Const.A09_OUT_TARGET_POSITION,
- e.getWidth().intValue(), 0, 0, 1));
- }
- bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ computeOutGlassInfo(temperingGlassInfoList);
return;
}
//鏈埌榻� 鎵ц鍐呴儴璋冨害浠诲姟
@@ -241,7 +258,7 @@
for (int i = 0; i < slotSequenceList.size() - 1; i++) {
SlotSequenceDTO first = slotSequenceList.get(i);
SlotSequenceDTO second = slotSequenceList.get(i + 1);
- int slotWidth = Const.BIG_STORAGE_WIDTH - first.getRemainWidth() - Const.BIG_STORAGE_GAP;
+ int slotWidth = carWidth - first.getRemainWidth() - galssGap;
if (first.getMinSequence() == second.getMaxSequence() + 1
&& second.getRemainWidth() > slotWidth) {
List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
@@ -259,7 +276,7 @@
/**
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
- public Boolean judgeGlassTypeStatus(String glassId, Integer line) {
+ public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
//1銆佽幏鍙栦换鍔¤〃涓浉閭荤幓鐠�
List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new LambdaQueryWrapper<EdgGlassTaskInfo>()
.eq(EdgGlassTaskInfo::getLine, line)
@@ -271,42 +288,48 @@
Integer remainWidth;
Integer glassCount;
if (0 == sitToUpRemainWidth.getGlassCount()) {
- remainWidth = Const.BIG_STORAGE_WIDTH;
+ remainWidth = carWidth;
glassCount = 0;
} else {
remainWidth = sitToUpRemainWidth.getWidth();
glassCount = sitToUpRemainWidth.getGlassCount();
}
+
+ Boolean flag = Boolean.TRUE;
//2銆佽幏鍙栧崸杞珛
Integer widthFirst = edgGlassTaskInfoList.get(0).getWidth();
if (edgGlassTaskInfoList.size() == 1) {
if (remainWidth >= widthFirst) {
if (glassCount <= 5) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
- return Boolean.FALSE;
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
- return Boolean.TRUE;
}
+ } else {
+ flag = Boolean.FALSE;
}
} else {
Integer widthSecond = edgGlassTaskInfoList.get(1).getWidth();
if (remainWidth >= widthFirst) {
- if (remainWidth - widthFirst - Const.BIG_STORAGE_GAP >= widthSecond) {
- if (glassCount <= 5) {
+ if (remainWidth - widthFirst - galssGap >= widthSecond) {
+ if (glassCount <= inCarMaxSize - 1) {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_WAIT, widthFirst);
- return Boolean.FALSE;
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
- return Boolean.TRUE;
}
} else {
addFeedTask(glassId, line, Const.BIG_STORAGE_IN_RUN, widthFirst);
}
+ } else {
+ flag = Boolean.FALSE;
}
}
+ //鍚憄lc鍙戦�佽繘鐗囩‘璁�
+ if (flag) {
+ S7object.getinstance().plccontrol.writeWord(mesAddress, (short) 1);
+ }
//璁板綍鏃犳硶鏀句笅鐜荤拑锛屽悗缁垽鏂惎鍔�
- return Boolean.TRUE;
+ return flag;
}
/**
@@ -354,17 +377,17 @@
//2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
List<String> glassIds = taskList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList());
List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, glassIds));
- return computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.TRUE) && computeIsTemperingTargetByLine(glassInfos, taskList, Boolean.FALSE);
+ return computeIsTemperingTargetByLine(glassInfos, taskList, line);
}
/**
* 鏄惁閽㈠寲鐜荤拑杩涚鐩爣浣嶇疆
*
- * @param glassInfos 褰撴潯绾垮崸杞珛鎵�鏈夌幓鐠�
- * @param taskList 褰撴潯绾垮崸杞珛鎵�鏈変换鍔�
- * @param isTempering true 閽㈠寲 false 涓嶉挗鍖�
+ * @param glassInfos 褰撴潯绾垮崸杞珛鎵�鏈夌幓鐠�
+ * @param taskList 褰撴潯绾垮崸杞珛鎵�鏈変换鍔�
+ * @param line 浠诲姟鏄摢鏉＄嚎
*/
- private boolean computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList, Boolean isTempering) {
+ private boolean computeIsTemperingTargetByLine(List<GlassInfo> glassInfos, List<BigStorageCageFeedTask> taskList, Integer line) {
//1銆佸皢鐜荤拑淇℃伅闆嗗悎杞负glassid涓簁ey鐨刴ap
Map<String, GlassInfo> glassInfoMap = glassInfos.stream()
.collect(Collectors.toMap(GlassInfo::getGlassId, p -> p));
@@ -382,7 +405,7 @@
.eq(BigStorageCage::getSlot, bigStorageDTO.getSlot()));
//4銆佹洿鏂拌繘鐗囦换鍔¤〃锛岀洰鏍囨牸瀛愬強鐘舵�侊紙鐘舵�佹敼涓�2 鐢垫皵鎵埌鑷澶勭悊锛� 閬囧埌闂锛氭棤娉曟壒閲忔洿鏂帮紝鎵归噺鏇存柊鏃犳硶璧版寚瀹氫粠搴�
e.setTargetSlot(bigStorageDTO.getSlot());
- e.setTaskType(Const.BIG_STORAGE_IN_RUN);
+// e.setTaskType(Const.BIG_STORAGE_IN_RUN);
bigStorageCageFeedTaskService.updateById(e);
//5銆佸皢杩涚墖淇℃伅瀛樺叆澶х悊鐗囩璇︽儏琛�
@@ -390,6 +413,83 @@
cageDetails.setState(Const.GLASS_STATE_IN);
bigStorageCageDetailsService.save(cageDetails);
}
+ sendTaskListToPLC(taskList, line);
return Boolean.TRUE;
}
+
+ private void sendTaskListToPLC(List<BigStorageCageFeedTask> taskList, Integer line) {
+ S7control s7control = S7object.getinstance().plccontrol;
+ PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
+ String mesD03Address = plcMesObject.getPlcParameter("MESToD03").getAddress();
+ String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
+ String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
+ for (int i = 1; i <= taskList.size(); i++) {
+ s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getLine());
+ s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getTargetSlot());
+ }
+ s7control.writeWord(outLine, (short) 1);
+ }
+
+ private <T extends BigStorageCageBaseInfo> Boolean computeOutGlassInfo(List<T> list) {
+ //浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
+ List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
+ //鎵撹溅鍓╀綑灏哄
+ Integer remainWidth = carWidth;
+ for (T e : list) {
+ if (bigStorageCageOutTaskList.size() > outCarMaxSize || e.getWidth() > remainWidth) {
+ break;
+ }
+ remainWidth = remainWidth - (int) e.getWidth() - galssGap;
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.A09_OUT_TARGET_POSITION,
+ (int) e.getWidth(), 0, 0, 1));
+ }
+ Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
+ log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
+ bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+ List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
+ log.info("灏嗗嚭鐗囩幓鐠儃}鐜荤拑鐘舵�佹敼涓哄凡鍑虹墖", glassIds);
+ bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
+ .set(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ .in(BigStorageCageDetails::getGlassId, glassIds));
+ //鏇存柊绗煎瓙鍐呮牸瀛愮殑鍓╀綑灏哄
+ updateSlotRemain(list, glassIds);
+ return Boolean.TRUE;
+ }
+
+ /**
+ * 鏇存柊绗煎瓙鍐呮牸瀛愮殑鍓╀綑灏哄
+ *
+ * @param list
+ * @param taskGlassIds
+ * @param <T>
+ */
+ public <T extends BigStorageCageBaseInfo> void updateSlotRemain(List<T> list, List<String> taskGlassIds) {
+ //鑾峰彇闇�瑕佸嚭鍘伙紙鍖呮嫭寰呭嚭鍘荤殑锛夌殑鎵�鏈夌幓鐠冩牸瀛愬彿
+ List<Integer> slotList = list.stream().map(T::getSlot).distinct().collect(Collectors.toList());
+ //鑾峰彇寰呭嚭鍘荤殑鐜荤拑淇℃伅锛堢瓑涓嬭溅鍑哄幓鐨勭幓鐠冿級
+ Map<Integer, Double> slotRemainMap = list.stream().filter(e -> !taskGlassIds.contains(e.getGlassId()))
+ .collect(Collectors.groupingBy(T::getSlot, Collectors.summingDouble(item -> item.getWidth() + galssGap)));
+ if (CollectionUtils.isNotEmpty(slotRemainMap)) {
+ //鎸夌収鏍煎瓙鍙锋洿鏂板墿浣欏昂瀵�
+ slotRemainMap.forEach((e, v) -> {
+ bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth - v)
+ .eq(BigStorageCage::getSlot, e));
+ });
+ }
+ Set<Integer> remainSlotList = slotRemainMap.keySet();
+ slotList.removeAll(remainSlotList);
+ if (CollectionUtils.isNotEmpty(slotList)) {
+ bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth)
+ .in(BigStorageCage::getSlot, slotList));
+ }
+ }
+
+ public Boolean computeIsRun(int line, String glassId) {
+ //鑾峰彇鍗ц浆绔嬪墿浣欏搴�
+ BigStorageDTO sitToUpRemainWidth = bigStorageCageFeedTaskService.querySitToUpRemainWidth(line);
+ //鑾峰彇鐜荤拑淇℃伅
+ GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+ return sitToUpRemainWidth.getWidth() < glassInfo.getWidth();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.8.0