From 2c0efecea0ed579ce66b69548d9c02e76e56d1f1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 16 十二月 2024 09:22:49 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 458 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 357 insertions(+), 101 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 f2ea464..78840f9 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
@@ -22,7 +22,6 @@
import com.mes.bigstoragetask.service.BigStorageCageOutTaskService;
import com.mes.common.S7object;
import com.mes.common.config.Const;
-import com.mes.common.utils.RedisUtil;
import com.mes.damage.entity.Damage;
import com.mes.damage.service.DamageService;
import com.mes.device.PlcParameterObject;
@@ -33,6 +32,8 @@
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.S7control;
+import com.mes.utils.RedisUtil;
+import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -98,6 +99,9 @@
private String d01GlassId = "";
private String d04GlassId = "";
+ private List<BigStorageCageOutTask> allTask = new ArrayList<>();
+ private List<BigStorageCageOutTask> notAllTask = new ArrayList<>();
+
@Scheduled(fixedDelay = 300)
public void plcToHomeEdgScan() {
Date startDate = new Date();
@@ -117,7 +121,7 @@
String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
-// d04Id="P24110503|17|4";
+// d01Id="P24111102|1|13";
// d04ToMES="1";
// d01ToMES="1";
@@ -132,13 +136,13 @@
}
//鎸夌収绾胯矾鍙婄幓鐠僫d鑾峰彇鐩搁偦涓ゅ潡鐜荤拑 鍗ц浆绔嬩笂鐨勭幓鐠�: 鐘舵�佷负0涓嶆搷浣滐紙D01閫佺墖锛�0涓嶆搷浣滐紝1鍏佽閫佺墖锛夛紝璇锋眰瀛椾负1锛� 锛�02鐜荤拑id涓虹┖鎴栬�呭崸杞珛鏈惎鍔級
if (!REQUEST_WORD.equals(mesD01Value) && REQUEST_WORD.equals(d01ToMES) && (StringUtils.isBlank(d02State) || !REQUEST_WORD.equals(d03State))) {
- List<BigStorageCageFeedTask> bigStorageCageFeedTasks=bigStorageCageFeedTaskService.list(
- new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .gt(BigStorageCageFeedTask::getTargetSlot,0)
- .eq(BigStorageCageFeedTask::getLine,Const.A09_OUT_TARGET_POSITION)
- .eq(BigStorageCageFeedTask::getTaskState,Const.BIG_STORAGE_IN_UP)
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ .eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
);
- if(CollectionUtils.isEmpty(bigStorageCageFeedTasks)){
+ if (CollectionUtils.isEmpty(bigStorageCageFeedTasks)) {
if (!d01GlassId.equals(d01Id)) {
judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD01Address);
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
@@ -149,13 +153,13 @@
}
// 鐘舵�佷负0涓嶆搷浣滐紙D01閫佺墖锛�0涓嶆搷浣滐紝1鍏佽閫佺墖锛夛紝璇锋眰瀛椾负1锛� 鍗ц浆绔嬫湭鍚姩
if (!REQUEST_WORD.equals(mesD04Value) && REQUEST_WORD.equals(d04ToMES) && !REQUEST_WORD.equals(d05State)) {
- List<BigStorageCageFeedTask> bigStorageCageFeedTasks=bigStorageCageFeedTaskService.list(
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
- .gt(BigStorageCageFeedTask::getTargetSlot,0)
- .eq(BigStorageCageFeedTask::getLine,Const.A10_OUT_TARGET_POSITION)
- .eq(BigStorageCageFeedTask::getTaskState,Const.BIG_STORAGE_IN_UP)
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ .eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
);
- if(CollectionUtils.isEmpty(bigStorageCageFeedTasks)){
+ if (CollectionUtils.isEmpty(bigStorageCageFeedTasks)) {
if (!d04GlassId.equals(d04Id)) {
judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD04Address);
edgGlassTaskInfoService.update(new LambdaUpdateWrapper<EdgGlassTaskInfo>()
@@ -204,11 +208,6 @@
if (!REQUEST_WORD.equals(d03ToMES) && !REQUEST_WORD.equals(d05ToMES)) {
Date endDate = new Date();
log.info("鍗ц浆绔嬬涓�娆℃病鏈夐�佺墖璇锋眰锛岀粨鏉熼�佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
- return;
- }
- if (!REQUEST_WORD.equals(d03ToMES) && !REQUEST_WORD.equals(d05ToMES)) {
- Date endDate = new Date();
- log.info("鍗ц浆绔嬬浜屾娌℃湁閫佺墖璇锋眰锛岀粨鏉熼�佺墖浠诲姟锛屼换鍔＄粨鏉熸椂闂达細{}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
}
// List<Integer> lines=new ArrayList<>();
@@ -260,8 +259,8 @@
//鑾峰彇鍗ц浆绔嬪墿浣欏搴�
if (computeIsRun(lineFirst, lineGlassId)) {
computeTargetByLine(lineFirst);
- }else{
- log.info("褰撳墠绾胯矾锛歿}锛屾湁鎵爜鐜荤拑锛歿}",lineFirst,lineGlassId);
+ } else {
+ log.info("褰撳墠绾胯矾锛歿}锛屾湁鎵爜鐜荤拑锛歿}", lineFirst, lineGlassId);
}
}
Date endDate = new Date();
@@ -305,10 +304,10 @@
log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
}
- @Scheduled(fixedDelay = 10000)
+ @Scheduled(fixedDelay = 5000)
public void plcToHomeEdgOutTask() {
Date startDate = new Date();
- log.info("澶х悊鐗囩绌鸿溅杩涚墖浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
+ log.info("澶х悊鐗囩鍑虹墖浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
String e02State = plcMesObject.getPlcParameter("E02State").getValue();
if (REQUEST_WORD.equals(e02State)) {
@@ -323,16 +322,20 @@
return;
}
if (redisUtil.getCacheObject("temperingSwitch")) {
+// if(true){
//鏄惁鏈夋鍦ㄩ挗鍖栫殑鐜荤拑
List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoService.selectJoinList(TemperingGlassInfo.class, new MPJLambdaWrapper<TemperingGlassInfo>()
.selectAll(TemperingGlassInfo.class)
- .leftJoin(BigStorageCageOutTask.class, BigStorageCageOutTask::getGlassId, TemperingGlassInfo::getGlassId)
+ .leftJoin(BigStorageCageOutTask.class, on -> on
+ .eq(TemperingGlassInfo::getGlassId, BigStorageCageOutTask::getGlassId)
+ .ne(BigStorageCageOutTask::getTaskState, Const.BIG_STORAGE_OUT_SUCCESS))
.eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
.isNull(BigStorageCageOutTask::getGlassId)
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
+ log.info("鏌ヨ鐨勫嚭鐗囦换鍔★細{}", temperingGlassInfoList);
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
- computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
+ computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, 1);
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -345,7 +348,7 @@
.orderByAsc(BigStorageCageDetails::getSlot)
.orderByDesc(BigStorageCageDetails::getId));
if (CollectionUtils.isNotEmpty(artificialList)) {
- computeOutMoreGlassInfo(artificialList, Boolean.FALSE, mesToPLCAddress);
+ computeOutMoreGlassInfo(artificialList, Boolean.FALSE, 1);
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -368,7 +371,7 @@
.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence));
if (CollectionUtils.isNotEmpty(temperingGlassInfos)) {
temperingGlassInfoService.saveBatch(temperingGlassInfos);
- computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, mesToPLCAddress);
+ computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, 1);
Date endDate = new Date();
log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
return;
@@ -376,43 +379,151 @@
}
}
}
- }
- //鎵ц鍐呴儴璋冨害浠诲姟
- List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
- if (CollectionUtils.isNotEmpty(temperingOccupySlotList)) {
- loop:
- for (TemperingLayoutDTO temperingOccupySlot : temperingOccupySlotList) {
- List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
- for (int i = 0; i < slotSequenceList.size() - 1; i++) {
- SlotSequenceDTO first = slotSequenceList.get(i);
- SlotSequenceDTO second = slotSequenceList.get(i + 1);
- int slotWidth = carWidth - first.getRemainWidth() - glassGap;
- if (first.getMinSequence() == second.getMaxSequence() + 1
- && second.getRemainWidth() > slotWidth && slotWidth >= 0) {
- List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getSlot, first.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
- .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence));
- if (CollectionUtils.isNotEmpty(list)) {
- List<BigStorageCageOutTask> outTasks = new ArrayList<>();
- int serialNumber = 1;
- for (BigStorageCageDetails item : list) {
- outTasks.add(new BigStorageCageOutTask(item.getGlassId(), first.getSlot(), second.getSlot(),
- item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
+ } else {
+ //鎵ц鍐呴儴璋冨害浠诲姟
+ List<TemperingLayoutDTO> temperingOccupySlotList = bigStorageCageDetailsService.queryTemperingOccupySlot();
+ if (CollectionUtils.isNotEmpty(temperingOccupySlotList)) {
+ loop:
+ for (TemperingLayoutDTO temperingOccupySlot : temperingOccupySlotList) {
+ List<GlassInfo> glassInfos = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getEngineerId, temperingOccupySlot.getEngineerId())
+ .eq(GlassInfo::getTemperingLayoutId, temperingOccupySlot.getTemperingLayoutId())
+ .notInSql(GlassInfo::getGlassId, "select glass_id from damage where type=8 and engineer_id='"
+ + temperingOccupySlot.getEngineerId() + "' and tempering_layout_id = '" + temperingOccupySlot.getTemperingLayoutId() + "'")
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
+ );
+ Map<Integer, List<GlassInfo>> listMap = glassInfos.stream().collect(Collectors.groupingBy(item -> item.getTargetSlot()));
+ for (Map.Entry<Integer, List<GlassInfo>> entry : listMap.entrySet()) {
+ List<GlassInfo> valueList = entry.getValue();
+ List<String> glassIds = valueList.stream().map(GlassInfo::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .in(BigStorageCageDetails::getGlassId, glassIds)
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+ .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence)
+ );
+ //褰撲竴鏍肩幓鐠冮兘鍒伴綈鏃�
+ if (bigStorageCageDetailsList.size() == valueList.size()) {
+ long distinctSlotCount = bigStorageCageDetailsList.stream()
+ .map(BigStorageCageDetails::getSlot)
+ .distinct()
+ .count();
+ //褰撶幓鐠冧笉鍦ㄥ悓涓�鏍兼椂
+ if (distinctSlotCount > 1) {
+ BigStorageCageDetails maxSequenceDetail = bigStorageCageDetailsList.stream()
+ .max(Comparator.comparingInt(BigStorageCageDetails::getTemperingFeedSequence))
+ .orElse(null); // 濡傛灉娌℃湁鍏冪礌锛岃繑鍥� null
+ int maxSlot = maxSequenceDetail.getSlot();
+ int serialNumber = 1;
+ for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
+ ) {
+ if (bigStorageCageDetails.getSlot() != maxSlot) {
+ bigStorageCageOutTaskService.save(new BigStorageCageOutTask(bigStorageCageDetails.getGlassId(), bigStorageCageDetails.getSlot(), maxSlot,
+ bigStorageCageDetails.getWidth() * 10, bigStorageCageDetails.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
+
+ bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)
+ .set(BigStorageCageBaseInfo::getSlot, maxSlot).eq(BigStorageCageDetails::getGlassId, bigStorageCageDetails.getGlassId())
+ .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
+ //涓ゆ鏇存柊绗煎瓙鐨勫墿浣欏昂瀵革細绗竴娆￠槻姝㈡湁鐜荤拑缁х画杩涜皟搴﹀悗鐨勭瀛愶紝绗簩娆℃洿鏂帮細璁＄畻鏍煎瓙鐨勫疄闄呭昂瀵�
+ // 浠呮洿鏂拌皟搴﹀悗鐨勬牸瀛愪俊鎭細璧峰鏍煎瓙瀹屾垚鍚庢洿鏂帮細闃叉璋冨害鍑虹墖杩囩▼涓湁鏂扮幓鐠冭繘鍏ワ紝
+// List<Integer> updateSlots = new ArrayList<>();
+// updateSlots.add(bigStorageCageDetails.getSlot());
+// updateSlotRemainBySlots(updateSlots);
+ }
+ }
+ break loop;
}
- //鏂板璋冨害浠诲姟
- bigStorageCageOutTaskService.saveBatch(outTasks);
- //鏇存柊鐞嗙墖绗艰鎯呰〃璋冨害鐨勫悗鐨勭幓鐠冧綅缃俊鎭細鐢熸垚浠诲姟鍚庡厛灏嗙幓鐠冩牸瀛愪綅缃繘琛岃皟鏁达紝鐜荤拑鐘舵�佹敼涓鸿皟搴︿腑锛屾柊澧炶皟搴﹀畬鎴愪换鍔★紝澶勭悊璋冨害瀹屾垚鍚庣幓鐠冪姸鎬佹敼涓�100.
- List<String> glassList = list.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
- bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)
- .set(BigStorageCageBaseInfo::getSlot, second.getSlot()).in(BigStorageCageDetails::getGlassId, glassList));
- //涓ゆ鏇存柊绗煎瓙鐨勫墿浣欏昂瀵革細绗竴娆￠槻姝㈡湁鐜荤拑缁х画杩涜皟搴﹀悗鐨勭瀛愶紝绗簩娆℃洿鏂帮細璁＄畻鏍煎瓙鐨勫疄闄呭昂瀵�
- // 浠呮洿鏂拌皟搴﹀悗鐨勬牸瀛愪俊鎭細璧峰鏍煎瓙瀹屾垚鍚庢洿鏂帮細闃叉璋冨害鍑虹墖杩囩▼涓湁鏂扮幓鐠冭繘鍏ワ紝
- updateSlotRemainBySlots(Arrays.asList(second.getSlot()));
- break loop;
}
}
+// List<GlassInfo> glassInfoList = glassInfoService.list(
+// new LambdaQueryWrapper<GlassInfo>()
+// .eq(GlassInfo::getTemperingLayoutId, temperingOccupySlot.getTemperingLayoutId())
+// .eq(GlassInfo::getEngineerId, temperingOccupySlot.getEngineerId())
+// .notInSql(GlassInfo::getGlassId, "select glass_id from damage where type=8 and engineer_id='"
+// + temperingOccupySlot.getEngineerId() + "' and tempering_layout_id = '" + temperingOccupySlot.getTemperingLayoutId() + "'")
+// );
+// List<BigStorageCageDetails> glassInfoLists = new ArrayList<>();
+// glassInfoList.forEach(glassInfo -> {
+// BigStorageCageDetails details = new BigStorageCageDetails();
+// BeanUtils.copyProperties(glassInfo, details);
+// details.setSlot(1);
+// glassInfoLists.add(details);
+// });
+// List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+// new LambdaQueryWrapper<BigStorageCageDetails>()
+// .eq(BigStorageCageDetails::getEngineerId, temperingOccupySlot.getEngineerId())
+// .eq(BigStorageCageDetails::getTemperingLayoutId, temperingOccupySlot.getTemperingLayoutId())
+// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+// .orderBy(Boolean.TRUE, sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence)
+// );
+//// if (glassInfoLists.size() == bigStorageCageDetailsList.size()) {
+// computeOutMoreGlassInfo(glassInfoLists, Boolean.TRUE, 2);
+// computeOutMoreGlassInfo(bigStorageCageDetailsList, Boolean.TRUE, 3);
+// int allTrainNumber = allTask.stream()
+// .map(BigStorageCageOutTask::getTrainNumber)
+// .collect(Collectors.toSet())
+// .size();
+// int allTrainSlot = allTask.stream()
+// .map(BigStorageCageOutTask::getStartSlot)
+// .collect(Collectors.toSet())
+// .size();
+// int notallTrainNumber = notAllTask.stream()
+// .map(BigStorageCageOutTask::getTrainNumber)
+// .collect(Collectors.toSet())
+// .size();
+// int notallTrainSlot = notAllTask.stream()
+// .map(BigStorageCageOutTask::getStartSlot)
+// .collect(Collectors.toSet())
+// .size();
+//// if (allTrainNumber < notallTrainNumber || (allTrainNumber == notallTrainNumber && allTrainSlot < notallTrainSlot)) {
+// List<SlotSequenceDTO> slotSequenceList = bigStorageCageDetailsService.queryGlassMaxAndMin(temperingOccupySlot.getEngineerId(), temperingOccupySlot.getTemperingLayoutId());
+// for (int i = 0; i < slotSequenceList.size() - 1; i++) {
+// SlotSequenceDTO first = slotSequenceList.get(i);
+// SlotSequenceDTO second = slotSequenceList.get(i + 1);
+// int slotWidth = first.getRemainWidth() - glassGap;
+// List<BigStorageCageDetails> list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
+// .eq(BigStorageCageDetails::getSlot, second.getSlot()).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
+// .orderBy(Boolean.TRUE, !sequenceOrder, BigStorageCageDetails::getTemperingFeedSequence));
+// if (CollectionUtils.isNotEmpty(list)) {
+// List<BigStorageCageOutTask> outTasks = new ArrayList<>();
+// int serialNumber = 1;
+// for (BigStorageCageDetails item : list) {
+// int maxlength = (int) Math.max(item.getWidth(), item.getHeight());
+// if (slotWidth > maxlength) {
+// slotWidth = slotWidth - maxlength - glassGap;
+// outTasks.add(new BigStorageCageOutTask(item.getGlassId(), second.getSlot(), first.getSlot(),
+// item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
+// } else {
+// outTasks.add(new BigStorageCageOutTask(item.getGlassId(), second.getSlot(), second.getSlot(),
+// item.getWidth() * 10, item.getHeight() * 10, 1, serialNumber++, Const.BIG_STORAGE_OUT_NEW, new Date()));
+// }
+// }
+// List<String> glassList = outTasks.stream()
+// .filter(item -> !item.getStartSlot().equals(item.getEndSlot()))
+// .map(BigStorageCageOutTask::getGlassId)
+// .collect(Collectors.toList());
+// if (glassList.size() > 0) {
+// //鏂板璋冨害浠诲姟
+// bigStorageCageOutTaskService.saveBatch(outTasks);
+// //鏇存柊鐞嗙墖绗艰鎯呰〃璋冨害鐨勫悗鐨勭幓鐠冧綅缃俊鎭細鐢熸垚浠诲姟鍚庡厛灏嗙幓鐠冩牸瀛愪綅缃繘琛岃皟鏁达紝鐜荤拑鐘舵�佹敼涓鸿皟搴︿腑锛屾柊澧炶皟搴﹀畬鎴愪换鍔★紝澶勭悊璋冨害瀹屾垚鍚庣幓鐠冪姸鎬佹敼涓�100.
+//// List<String> glassList = list.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
+//
+// bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>().set(BigStorageCageDetails::getState, Const.GLASS_STATE_SCHEDULE_ING)
+// .set(BigStorageCageBaseInfo::getSlot, first.getSlot()).in(BigStorageCageDetails::getGlassId, glassList)
+// .ne(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT));
+//
+// //涓ゆ鏇存柊绗煎瓙鐨勫墿浣欏昂瀵革細绗竴娆￠槻姝㈡湁鐜荤拑缁х画杩涜皟搴﹀悗鐨勭瀛愶紝绗簩娆℃洿鏂帮細璁＄畻鏍煎瓙鐨勫疄闄呭昂瀵�
+// // 浠呮洿鏂拌皟搴﹀悗鐨勬牸瀛愪俊鎭細璧峰鏍煎瓙瀹屾垚鍚庢洿鏂帮細闃叉璋冨害鍑虹墖杩囩▼涓湁鏂扮幓鐠冭繘鍏ワ紝
+// updateSlotRemainBySlots(Arrays.asList(second.getSlot()));
+// break loop;
+// }
+//
+// }
+// }
+// }
+// }
}
- }
// //鍚憄lc鍐欏叆纭瀛�
// int returnData = 0;
// int count = 1;
@@ -422,10 +533,12 @@
// returnData = S7object.getinstance().plccontrol.readWord(mesToPLCAddress, 1).get(0);
// log.info("宸插悜plc绗瑊}娆″彂閫佸嚭鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{}", count++, mesToPLCAddress, returnData);
// }
- Date endDate = new Date();
- log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
- return;
+ Date endDate = new Date();
+ log.info("澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
}
+
}
@Scheduled(fixedDelay = 300)
@@ -469,7 +582,8 @@
log.info("1銆佸ぇ鐞嗙墖绗煎嚭鐗囧畬鎴愬悗鏇存柊澶х悊鐗囩鏁版嵁浠诲姟寮�濮嬫墽琛屾椂闂达細{}", startDate);
//鍥犱负澶х悊鐗囩鍜屽嚭鐗囦换鍔℃槸涓や釜搴撶殑鏁版嵁锛屾墍浠ヨ鍒嗗紑鏌ユ壘
List<Object> list = bigStorageCageDetailsService.listObjs(new LambdaQueryWrapper<BigStorageCageDetails>()
- .select(BigStorageCageDetails::getGlassId).eq(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING));
+ .select(BigStorageCageDetails::getGlassId)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT_ING));
if (CollectionUtils.isNotEmpty(list)) {
log.info("2銆佽幏鍙栨墍鏈夋鍦ㄥ嚭鐗囩殑鐜荤拑淇℃伅id:{}", list);
List<String> glassIds = list.stream().map(String::valueOf).collect(Collectors.toList());
@@ -559,14 +673,17 @@
bigStorageCageFeedTaskService.remove(new LambdaQueryWrapper<BigStorageCageFeedTask>().in(BigStorageCageFeedTask::getTaskState, Const.GLASS_STATE_DAMAGE_TAKE));
//鐞嗙墖绗艰鎯呰〃鏁版嵁鐘舵�佹洿鏂�
bigStorageCageDetailsService.remove(new LambdaQueryWrapper<BigStorageCageDetails>()
- .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
+// .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW)
+ .and(e -> e.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_NEW).or()
+ .eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN))
+ .in(BigStorageCageDetails::getGlassId, inDamageTaskInfoList.stream().map(BigStorageCageFeedTask::getGlassId).collect(Collectors.toList())));
//灏嗙牬鎹熶俊鎭柊澧炲叆鐮存崯琛�
List<Integer> slotList = new ArrayList<>();
for (BigStorageCageFeedTask bigStorageCageFeedTask : inDamageTaskInfoList) {
Damage damage = new Damage();
damage.setGlassId(bigStorageCageFeedTask.getGlassId());
damage.setLine(bigStorageCageFeedTask.getLine());
- damage.setWorkingProcedure("纾ㄨ竟");
+ damage.setWorkingProcedure("閽㈠寲");
damage.setRemark("杩涚鍓嶅崸杞珛");
damage.setStatus(1);
damage.setType(bigStorageCageFeedTask.getTaskState());
@@ -626,23 +743,30 @@
String d05ToMES = plcParameterObject.getPlcParameter("D05Request").getValue();
String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
+ String carRequest = plcParameterObject.getPlcParameter("CarRequest").getValue();
+ String carResponse = plcParameterObject.getPlcParameter("CarResponse").getAddress();
if (!REQUEST_WORD.equals(d01ToMES)) {
- log.info("鍦板潃锛歿}鍐欏叆0",mesD01Address);
+ log.info("鍦板潃锛歿}鍐欏叆0", mesD01Address);
S7object.getinstance().plccontrol.writeWord(mesD01Address, 0);
}
if (!REQUEST_WORD.equals(d04ToMES)) {
- log.info("鍦板潃锛歿}鍐欏叆0",mesD04Address);
+ log.info("鍦板潃锛歿}鍐欏叆0", mesD04Address);
S7object.getinstance().plccontrol.writeWord(mesD04Address, 0);
}
if (!REQUEST_WORD.equals(d03ToMES)) {
- log.info("鍦板潃锛歿}鍐欏叆0",mesD03Address);
+ log.info("鍦板潃锛歿}鍐欏叆0", mesD03Address);
S7object.getinstance().plccontrol.writeWord(mesD03Address, 0);
}
if (!REQUEST_WORD.equals(d05ToMES)) {
- log.info("鍦板潃锛歿}鍐欏叆0",mesD05Address);
+ log.info("鍦板潃锛歿}鍐欏叆0", mesD05Address);
S7object.getinstance().plccontrol.writeWord(mesD05Address, 0);
}
+ if (!REQUEST_WORD.equals(carRequest)) {
+ log.info("鍦板潃锛歿}鍐欏叆0", carResponse);
+ S7object.getinstance().plccontrol.writeWord(carResponse, 0);
+ }
}
+
/**
* 杩涚墖鐘舵�佷慨鏀�
@@ -654,6 +778,7 @@
String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
List<String> glassIds1 = new ArrayList<>();
List<String> glassIds2 = new ArrayList<>();
+ List<String> glassIdsCar = new ArrayList<>();
for (int i = 1; i <= 6; i++) {
String line1GlassId = plcParameterObject.getPlcParameter("D03ID" + i).getValue();
if (StringUtils.isNotEmpty(line1GlassId)) {
@@ -662,6 +787,10 @@
String line2GlassId = plcParameterObject.getPlcParameter("D05ID" + i).getValue();
if (StringUtils.isNotEmpty(line2GlassId)) {
glassIds2.add(line2GlassId);
+ }
+ String carGlassId = plcParameterObject.getPlcParameter("E01ID" + i).getValue();
+ if (StringUtils.isNotEmpty(carGlassId)) {
+ glassIdsCar.add(carGlassId);
}
}
List<BigStorageCageFeedTask> bigStorageCageFeedTasks1 = bigStorageCageFeedTaskService.list(
@@ -680,8 +809,8 @@
.filter(glassIds1::contains)
.distinct()
.collect(Collectors.toList());
- log.info("D3id{},鍖归厤id:{}",glassIds1,matchingIds1);
- if(CollectionUtils.isNotEmpty(matchingIds1)){
+ log.info("D3id{},鍖归厤id:{}", glassIds1, matchingIds1);
+ if (CollectionUtils.isNotEmpty(matchingIds1)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.in(BigStorageCageFeedTask::getGlassId, matchingIds1)
@@ -696,8 +825,8 @@
.filter(glassIds2::contains)
.distinct()
.collect(Collectors.toList());
- log.info("D5id{},鍖归厤id:{}",glassIds2,matchingIds2);
- if(CollectionUtils.isNotEmpty(matchingIds2)){
+ log.info("D5id{},鍖归厤id:{}", glassIds2, matchingIds2);
+ if (CollectionUtils.isNotEmpty(matchingIds2)) {
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.in(BigStorageCageFeedTask::getGlassId, matchingIds2)
@@ -708,7 +837,7 @@
}
if (CollectionUtils.isEmpty(glassIds1)) {
S7object.getinstance().plccontrol.writeWord(mesD03Address, 0);
- log.info("{}绾夸慨鏀圭幓鐠冪姸鎬佷负3",Const.A09_OUT_TARGET_POSITION);
+ log.info("{}绾夸慨鏀圭幓鐠冪姸鎬佷负3", Const.A09_OUT_TARGET_POSITION);
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
@@ -720,7 +849,7 @@
}
if (CollectionUtils.isEmpty(glassIds2)) {
S7object.getinstance().plccontrol.writeWord(mesD05Address, 0);
- log.info("{}绾夸慨鏀圭幓鐠冪姸鎬佷负3",Const.A10_OUT_TARGET_POSITION);
+ log.info("{}绾夸慨鏀圭幓鐠冪姸鎬佷负3", Const.A10_OUT_TARGET_POSITION);
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
@@ -730,12 +859,43 @@
.set(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
);
}
+ String carRequest = plcParameterObject.getPlcParameter("CarRequest").getValue();
+ log.info("澶ц溅褰撳墠鐜荤拑id{}", glassIdsCar);
+ log.info("鍗ц浆绔�1鐜荤拑id{}", glassIds1);
+ log.info("鍗ц浆绔�2鐜荤拑id{}", glassIds2);
+ if (CollectionUtils.isNotEmpty(glassIdsCar) && REQUEST_WORD.equals(carRequest)) {
+ List<BigStorageCageFeedTask> bigStorageCageFeedTasks = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP)
+ .eq(BigStorageCageFeedTask::getTargetSlot, 0)
+ );
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)) {
+ log.info("璁＄畻鐩爣鏍煎瓙鍙戦�佷换鍔}", bigStorageCageFeedTasks);
+ computeTargetByLineCar(bigStorageCageFeedTasks.get(0).getLine(), glassIdsCar);
+ } else {
+ log.info("鍐嶆鍙戦�佽繘鐗囦换鍔}", bigStorageCageFeedTasks);
+ List<BigStorageCageFeedTask> bigStorageCageFeedTaskList = bigStorageCageFeedTaskService.list(
+ new LambdaQueryWrapper<BigStorageCageFeedTask>()
+ .in(BigStorageCageFeedTask::getGlassId, glassIdsCar)
+ .eq(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_CAR)
+ .gt(BigStorageCageFeedTask::getTargetSlot, 0)
+ );
+ if (CollectionUtils.isNotEmpty(bigStorageCageFeedTaskList)) {
+ sendTaskListToPLCCar(bigStorageCageFeedTaskList);
+ }
+ }
+ }
+
+
}
/**
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
+ //棰勬帓鏍煎瓙
+ computeSlot(glassId);
//鍒ゆ柇姝ょ幓鐠冩槸鍦ㄧ鍐呮垨宸茬敓鎴愯繘鐗囦换鍔�
BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
@@ -770,8 +930,8 @@
);
EdgGlassTaskInfo edgGlassTaskInfo = new EdgGlassTaskInfo();
BeanUtils.copyProperties(glassInfo, edgGlassTaskInfo);
- edgGlassTaskInfo.setWidth((int) glassInfo.getWidth());
- edgGlassTaskInfo.setHeight((int) glassInfo.getHeight());
+ edgGlassTaskInfo.setWidth((int) glassInfo.getWidth() * 10);
+ edgGlassTaskInfo.setHeight((int) glassInfo.getHeight() * 10);
edgGlassTaskInfoList.add(edgGlassTaskInfo);
log.info("鍦ㄧ幓鐠冧俊鎭〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
}
@@ -854,6 +1014,37 @@
return flag;
}
+ public void computeSlot(String glassId) {
+ GlassInfo glassInfo = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, glassId)
+ );
+ if (glassInfo.getTargetSlot() == null) {
+ List<GlassInfo> glassInfos = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .eq(GlassInfo::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
+ .orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
+ );
+ List<BigStorageCageDetails> glassInfoLists = new ArrayList<>();
+ glassInfos.forEach(item -> {
+ BigStorageCageDetails details = new BigStorageCageDetails();
+ BeanUtils.copyProperties(item, details);
+ details.setSlot(1);
+ glassInfoLists.add(details);
+ });
+ computeOutMoreGlassInfo(glassInfoLists, Boolean.TRUE, 2);
+ for (BigStorageCageOutTask bigStorageCageOutTask : allTask
+ ) {
+ glassInfoService.update(
+ new LambdaUpdateWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, bigStorageCageOutTask.getGlassId())
+ .set(GlassInfo::getTargetSlot, bigStorageCageOutTask.getTrainNumber())
+ );
+ }
+ }
+ }
+
/**
* 娣诲姞浠诲姟淇℃伅
*/
@@ -870,7 +1061,7 @@
damageService.deleteByGlassId(glassId);
Damage damage = new Damage();
damage.setGlassId(glassId);
- damage.setWorkingProcedure("纾ㄨ竟");
+ damage.setWorkingProcedure("閽㈠寲");
damage.setLine(line);
damage.setType(1);
damage.setRemark("杩涘ぇ鐞嗙墖");
@@ -902,10 +1093,20 @@
* 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
*/
public boolean computeTargetByLine(Integer line) {
+ sendTaskListToPLC(new ArrayList<>(), line);
+ return true;
+ }
+
+ /**
+ * 璁＄畻浠诲姟琛ㄨ繘鐗囩嚎璺殑鐩爣鏍煎瓙锛屽苟鍚姩浠诲姟
+ */
+ public boolean computeTargetByLineCar(Integer line, List<String> carGlassId) {
//1銆佽幏鍙栦换鍔¤〃涓殑鎵�鏈夌幓鐠冿紙鎸囧畾绾胯矾涓斿凡缁忚繘鍗ц浆绔嬪畬鎴愶級
List<BigStorageCageFeedTask> taskList = bigStorageCageFeedTaskService.list(new LambdaQueryWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, line)
- .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or().eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
+ .in(BigStorageCageFeedTask::getGlassId, carGlassId)
+ .and(e -> e.isNull(BigStorageCageFeedTask::getTargetSlot).or()
+ .eq(BigStorageCageFeedTask::getTargetSlot, Const.OUT_TARGET_POSITION_ZERO))
.in(BigStorageCageFeedTask::getTaskState, Const.BIG_STORAGE_IN_UP_ALL)
.orderByAsc(BigStorageCageFeedTask::getId));
//2銆佸幓绗煎瓙鍐呮煡鎵炬槸鍚﹀彲浠ョ户缁瓨鏀剧殑绗煎瓙
@@ -928,9 +1129,20 @@
for (BigStorageCageFeedTask e : taskList) {
//鏇挎崲鐜荤拑id
queryAndChangeGlass(e.getGlassId());
- GlassInfo info = glassInfoMap.get(e.getGlassId());
+ GlassInfo info = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, e.getGlassId())
+ );
+// GlassInfo info = glassInfoMap.get(e.getGlassId());
if (info == null) {
continue;
+ }
+ if (info.getTargetSlot() == null) {
+ computeSlot(info.getGlassId());
+ info = glassInfoService.getOne(
+ new LambdaQueryWrapper<GlassInfo>()
+ .eq(GlassInfo::getGlassId, info.getGlassId())
+ );
}
BigStorageCageDetails cageDetails = new BigStorageCageDetails();
BeanUtils.copyProperties(info, cageDetails);
@@ -951,8 +1163,26 @@
bigStorageCageDetailsService.save(cageDetails);
}
- sendTaskListToPLC(taskList, line);
+ sendTaskListToPLCCar(taskList);
return Boolean.TRUE;
+ }
+
+ private void sendTaskListToPLCCar(List<BigStorageCageFeedTask> taskList) {
+ S7control s7control = S7object.getinstance().plccontrol;
+ PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
+ List<String> returnData = new ArrayList<>();
+ for (int i = 1; i <= taskList.size(); i++) {
+ s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
+ s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
+ returnData.add(taskList.get(i - 1).getGlassId());
+ log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
+ }
+ String carRequest = plcMesObject.getPlcParameter("CarRequest").getValue();
+ String CarResponse = plcMesObject.getPlcParameter("CarResponse").getAddress();
+ while (REQUEST_WORD.equals(carRequest)) {
+ s7control.writeWord(CarResponse, 1);
+ carRequest = plcMesObject.getPlcParameter("CarRequest").getValue();
+ }
}
private void sendTaskListToPLC(List<BigStorageCageFeedTask> taskList, Integer line) {
@@ -963,13 +1193,13 @@
String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
List<String> returnData = new ArrayList<>();
-
- for (int i = 1; i <= taskList.size(); i++) {
- s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
- s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
- returnData.add(taskList.get(i - 1).getGlassId());
- log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
- }
+ returnData.add("glassid");
+// for (int i = 1; i <= taskList.size(); i++) {
+// s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), taskList.get(i - 1).getLine());
+// s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), taskList.get(i - 1).getTargetSlot());
+// returnData.add(taskList.get(i - 1).getGlassId());
+// log.info("鍚憄lc鍙戦�佺{}鐗囩幓鐠冨凡瀹屾垚,璧峰浣嶇疆鏄瘂}锛岀洰鏍囦綅缃槸", i, taskList.get(i - 1).getLine(), taskList.get(i - 1).getTargetSlot());
+// }
// int returnData = 1;
int count = 1;
@@ -996,7 +1226,7 @@
returnData = glassIds2;
}
// returnData = s7control.readWord(outLine, 1).get(0);
- log.info("宸插悜plc绗瑊}娆″彂閫佽繘鐗囦换鍔＄‘璁わ紝鍦板潃涓猴細{},鍐欏叆鐨勫唴瀹逛负{},璇诲埌鐨勮姹備负{}", count++, outLine, 2,returnData);
+ log.info("宸插悜plc绗瑊}娆″彂閫佽繘鐗囧崸杞珛锛屽湴鍧�涓猴細{},鍐欏叆鐨勫唴瀹逛负{},璇诲埌鐨勮姹備负{}", count++, outLine, 2, returnData);
}
// while (returnData != 0) {
// s7control.writeWord(outLine, 2);
@@ -1070,11 +1300,11 @@
*
* @param list
* @param isTempering
- * @param mesToPLCAddress
+ * @param isTask
* @param <T>
* @return
*/
- public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, String mesToPLCAddress) {
+ public <T extends BigStorageCageBaseInfo> Boolean computeOutMoreGlassInfo(List<T> list, Boolean isTempering, Integer isTask) {
//浠诲姟鏁版嵁 鑾峰彇杞﹀瓙瀛樻斁鐜荤拑鏈�澶ф暟閲� 鐜荤拑闂撮殧
List<BigStorageCageOutTask> bigStorageCageOutTaskList = new ArrayList<>();
//鎵撹溅鍓╀綑灏哄
@@ -1082,26 +1312,44 @@
int trainNumber = 1;
int serialNumber = 1;
int maxX = 0;
+ int slot = 0;
for (T e : list) {
int maxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
- if (serialNumber > outCarMaxSize || maxLength > remainWidth) {
- remainWidth = carWidth;
- trainNumber = trainNumber + 1;
- serialNumber = 1;
- maxX = 0;
- }
- remainWidth = remainWidth - maxLength - glassGap;
if (isTempering) {
int minLength = Math.min((int) e.getWidth(), (int) e.getHeight());
- if (maxX + minLength <= xMaxSize) {
+ if (maxX + minLength <= xMaxSize && serialNumber <= outCarMaxSize && remainWidth > maxLength) {
+ if (slot != e.getSlot() && slot != 0) {
+ int finalMaxX = maxX;
+ int finalSerialNumber = serialNumber;
+ int finalRemainWidth = remainWidth;
+ List<T> lists = list.stream().filter(t -> t.getSlot() == (int) e.getSlot()).collect(Collectors.toList());
+ for (T x : lists) {
+ int finalMinLength = Math.min((int) x.getWidth(), (int) x.getHeight());
+ int finalMaxLength = Math.max((int) e.getWidth(), (int) e.getHeight());
+ if (finalMaxX + finalMinLength > xMaxSize || finalSerialNumber > outCarMaxSize || finalMaxLength > finalRemainWidth) {
+ remainWidth = carWidth;
+ trainNumber = trainNumber + 1;
+ serialNumber = 1;
+ maxX = 0;
+ break;
+ } else {
+ finalMaxX = Math.max(maxX, x.getXCoordinate());
+ finalRemainWidth = finalRemainWidth - finalMaxLength - glassGap;
+ finalSerialNumber++;
+ }
+ }
+ }
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
+ remainWidth = remainWidth - maxLength - glassGap;
maxX = Math.max(maxX, e.getXCoordinate());
+ slot = e.getSlot();
} else {
remainWidth = carWidth - maxLength - glassGap;
trainNumber = trainNumber + 1;
serialNumber = 1;
maxX = e.getXCoordinate();
+ slot = e.getSlot();
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.TEMPERING_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
}
@@ -1109,6 +1357,13 @@
bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
}
+ }
+ if (isTask == 2) {
+ allTask = bigStorageCageOutTaskList;
+ return Boolean.FALSE;
+ } else if (isTask == 3) {
+ notAllTask = bigStorageCageOutTaskList;
+ return Boolean.FALSE;
}
Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
@@ -1150,7 +1405,7 @@
});
}
//杩囨护涓嶅瓨鍦ㄧ幓鐠冪殑鏍煎瓙 灏嗗搴﹂噸缃负鍘熷瀹藉害5000
- Set<Integer> remainSlotList = slotRemainMap.keySet();
+ List<Integer> remainSlotList = new ArrayList<>(slotRemainMap.keySet());
slotList.removeAll(remainSlotList);
if (CollectionUtils.isNotEmpty(slotList)) {
bigStorageCageService.update(new LambdaUpdateWrapper<BigStorageCage>().set(BigStorageCage::getRemainWidth, slotWidth)
@@ -1181,8 +1436,9 @@
.eq(GlassInfo::getTotalLayer, glassInfo.getTotalLayer())
.eq(GlassInfo::getLayer, glassInfo.getLayer())
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
+ .eq(GlassInfo::getMarkIcon, glassInfo.getMarkIcon())
.notInSql(GlassInfo::getGlassId, "select distinct glass_id from big_storage_cage_details " +
- "where engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight())
+ "where state!=101 and engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight())
.orderByAsc(GlassInfo::getTemperingLayoutId)
.orderBy(Boolean.TRUE, sequenceOrder, GlassInfo::getTemperingFeedSequence)
.last("Limit 1");
--
Gitblit v1.8.0