From 924ce82faeec6d896fcdc360b279215e84b69fb9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 11 九月 2025 11:44:44 +0800
Subject: [PATCH] 1、代码补充提交
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 270 +++++++++++++++++++++++++++--------------------------
1 files changed, 139 insertions(+), 131 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 78840f9..71767b1 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
@@ -27,6 +27,8 @@
import com.mes.device.PlcParameterObject;
import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+import com.mes.engineering.entity.Engineering;
+import com.mes.engineering.mapper.EngineeringMapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -68,6 +70,8 @@
private TemperingGlassInfoService temperingGlassInfoService;
@Resource
private DamageService damageService;
+ @Resource
+ private EngineeringMapper engineeringMapper;
@Resource
private RedisUtil redisUtil;
@@ -121,7 +125,7 @@
String d04ToMES = plcParameterObject.getPlcParameter("D04ToMES").getValue();
-// d01Id="P24111102|1|13";
+// d01Id="P25031806|15|3";
// d04ToMES="1";
// d01ToMES="1";
@@ -134,6 +138,34 @@
log.info("涓ゆ潯绾垮崸杞珛鍧囧湪鎵ц浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
+// if (REQUEST_WORD.equals(d01ToMES)) {
+// 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_NEW)
+// .eq(BigStorageCageFeedTask::getGlassId, d01Id)
+// );
+// if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)) {
+// S7object.getinstance().plccontrol.writeWord(mesD01Address, 1);
+// }
+// log.info("{}绾垮啀娆″彂閫佽繘鐗囧惎鍔�", Const.A09_OUT_TARGET_POSITION);
+// return;
+// }
+// if (REQUEST_WORD.equals(d04ToMES)) {
+// 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_NEW)
+// .eq(BigStorageCageFeedTask::getGlassId, d01Id)
+// );
+// if (CollectionUtils.isNotEmpty(bigStorageCageFeedTasks)) {
+// S7object.getinstance().plccontrol.writeWord(mesD04Address, 1);
+// }
+// log.info("{}绾垮啀娆″彂閫佽繘鐗囧惎鍔�", Const.A10_OUT_TARGET_POSITION);
+// return;
+// }
//鎸夌収绾胯矾鍙婄幓鐠僫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(
@@ -270,7 +302,8 @@
//涓ゆ潯鍏堝潎鍙墽琛岃繘鐗囦换鍔★紝鍒ゆ柇涓ゆ潯绾挎槸鍚﹁繘鐗囪姹傛槸鍚﹂兘涓虹┖
if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
- Integer line = getStartLine();
+// Integer line = getStartLine();
+ Integer line = lineList.get(0);
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
Date endDate = new Date();
@@ -333,6 +366,17 @@
.isNull(BigStorageCageOutTask::getGlassId)
.orderBy(Boolean.TRUE, sequenceOrder, TemperingGlassInfo::getTemperingFeedSequence));
log.info("鏌ヨ鐨勫嚭鐗囦换鍔★細{}", temperingGlassInfoList);
+ List<String> glassIds = temperingGlassInfoList.stream().map(TemperingGlassInfo::getGlassId).collect(Collectors.toList());
+ List<BigStorageCageDetails> bigStorageCageDetailsList = bigStorageCageDetailsService.list(
+ new LambdaQueryWrapper<BigStorageCageDetails>()
+ .in(BigStorageCageDetails::getGlassId, glassIds)
+ .in(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT)
+ );
+ if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
+ List<String> detialGlassIds = bigStorageCageDetailsList.stream().map(BigStorageCageDetails::getGlassId).collect(Collectors.toList());
+ temperingGlassInfoList.removeIf(info -> detialGlassIds.contains(info.getGlassId()));
+ log.info("绗煎唴涓嶅瓨鍦ㄧ幓鐠冪殑閽㈠寲浠诲姟{}", bigStorageCageDetailsList);
+ }
if (CollectionUtils.isNotEmpty(temperingGlassInfoList)) {
log.info("鏈夋鍦ㄥ嚭鐗囩殑閽㈠寲浠诲姟");
computeOutMoreGlassInfo(temperingGlassInfoList, Boolean.TRUE, 1);
@@ -360,6 +404,16 @@
//鍒伴綈锛屽皢鐜荤拑灏忕墖鏁版嵁瀛樺叆閽㈠寲灏忕墖琛紝閫昏緫鐢熸垚鍑虹墖浠诲姟 缁撴潫
for (TemperingLayoutDTO item : temperingLayoutDTOList) {
if (redisUtil.getCacheObject("temperingengineerId").equals(item.getEngineerId())) {
+ Engineering engineering = engineeringMapper.selectOne(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getEngineerId, item.getEngineerId())
+ );
+ if (engineering.getState() == 2) {
+ redisUtil.setCacheObject("temperingengineerId", "");
+ Date endDate = new Date();
+ log.info("褰撳墠宸ョ▼琚姝㈢敓浜э紝澶х悊鐗囩鍑虹墖浠诲姟缁撴潫鏃堕棿锛歿}锛屽叡鑰楁椂锛歿}ms,缁撴潫鎵爜浠诲姟", endDate, endDate.getTime() - startDate.getTime());
+ return;
+ }
List<TemperingGlassInfo> temperingGlassInfos = glassInfoService.selectJoinList(TemperingGlassInfo.class, JoinWrappers.lambda(GlassInfo.class)
.selectAll(GlassInfo.class)
.select("-1 as state")
@@ -403,126 +457,41 @@
.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()));
+ List<BigStorageCageDetails> overSizeGlass = bigStorageCageDetailsList.stream().filter(
+ t -> Math.min(t.getWidth(), t.getHeight()) > 2500
+ ).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(overSizeGlass)) {
+ //褰撲竴鏍肩幓鐠冮兘鍒伴綈鏃�
+ 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);
+ 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));
+ //涓ゆ鏇存柊绗煎瓙鐨勫墿浣欏昂瀵革細绗竴娆￠槻姝㈡湁鐜荤拑缁х画杩涜皟搴﹀悗鐨勭瀛愶紝绗簩娆℃洿鏂帮細璁＄畻鏍煎瓙鐨勫疄闄呭昂瀵�
+ // 浠呮洿鏂拌皟搴﹀悗鐨勬牸瀛愪俊鎭細璧峰鏍煎瓙瀹屾垚鍚庢洿鏂帮細闃叉璋冨害鍑虹墖杩囩▼涓湁鏂扮幓鐠冭繘鍏ワ紝
+ }
}
+ break loop;
}
- 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;
@@ -837,7 +806,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, glassIds1);
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, Const.A09_OUT_TARGET_POSITION)
@@ -849,7 +818,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, glassIds2);
bigStorageCageFeedTaskService.update(
new LambdaUpdateWrapper<BigStorageCageFeedTask>()
.eq(BigStorageCageFeedTask::getLine, Const.A10_OUT_TARGET_POSITION)
@@ -894,8 +863,8 @@
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
- //棰勬帓鏍煎瓙
- computeSlot(glassId);
+// 棰勬帓鏍煎瓙
+// computeSlot(glassId);
//鍒ゆ柇姝ょ幓鐠冩槸鍦ㄧ鍐呮垨宸茬敓鎴愯繘鐗囦换鍔�
BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
@@ -1057,11 +1026,12 @@
bigStorageCageFeedTask.setWidth(width);
bigStorageCageFeedTask.setHeight(height);
bigStorageCageFeedTask.setCreateTime(new Date());
+ bigStorageCageFeedTask.setTargetSlot(0);
//鍒犻櫎鐞嗙墖绗艰〃鎷胯蛋/鐮存崯鏁版嵁鏁版嵁
damageService.deleteByGlassId(glassId);
Damage damage = new Damage();
damage.setGlassId(glassId);
- damage.setWorkingProcedure("閽㈠寲");
+ damage.setWorkingProcedure("纾ㄨ竟");
damage.setLine(line);
damage.setType(1);
damage.setRemark("杩涘ぇ鐞嗙墖");
@@ -1351,11 +1321,21 @@
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()));
+ e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
}
} else {
- bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
- e.getWidth() * 10, e.getHeight(), trainNumber, serialNumber++, 1, new Date()));
+ if (serialNumber <= outCarMaxSize && remainWidth > maxLength) {
+ remainWidth = remainWidth - maxLength - glassGap;
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
+ } else {
+ remainWidth = carWidth - maxLength - glassGap;
+ trainNumber = trainNumber + 1;
+ serialNumber = 1;
+ bigStorageCageOutTaskList.add(new BigStorageCageOutTask(e.getGlassId(), e.getSlot(), Const.ARTIFICIAL_OUT_TARGET_POSITION,
+ e.getWidth() * 10, e.getHeight() * 10, trainNumber, serialNumber++, 1, new Date()));
+ }
+
}
}
if (isTask == 2) {
@@ -1367,11 +1347,27 @@
}
Assert.isFalse(CollectionUtils.isEmpty(bigStorageCageOutTaskList), "鏈幏鍙栧嚭鐗囨暟鎹紝缁撴潫鍑虹墖浠诲姟");
log.info("鑾峰彇鍑虹墖浠诲姟鏁版嵁{}鏉★紝鎵ц淇濆瓨", bigStorageCageOutTaskList.size());
- for (BigStorageCageOutTask bigStorageCageOutTask : bigStorageCageOutTaskList
- ) {
- bigStorageCageOutTaskService.save(bigStorageCageOutTask);
+ List<String> outGlassIds = bigStorageCageOutTaskList.stream()
+ .map(BigStorageCageOutTask::getGlassId)
+ .collect(Collectors.toList());
+ //鍒ゆ柇宸ョ▼鍙樻洿鏃朵慨鏀瑰嚭鐗囦綅缃�
+ List<GlassInfo> glassInfos = glassInfoService.list(
+ new LambdaQueryWrapper<GlassInfo>()
+ .in(GlassInfo::getGlassId, outGlassIds)
+ .eq(GlassInfo::getProductionStatus, 3)
+ );
+ if (CollectionUtils.isNotEmpty(glassInfos)) {
+ List<String> changeGlassIds = glassInfos.stream()
+ .map(GlassInfo::getGlassId)
+ .collect(Collectors.toList());
+ bigStorageCageOutTaskList.forEach(task -> {
+ if (changeGlassIds.contains(task.getGlassId())) {
+ task.setEndSlot(Const.ARTIFICIAL_OUT_TARGET_POSITION);
+ }
+ });
}
-// bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
+
+ bigStorageCageOutTaskService.saveBatch(bigStorageCageOutTaskList);
List<String> glassIds = bigStorageCageOutTaskList.stream().map(BigStorageCageOutTask::getGlassId).collect(Collectors.toList());
log.info("灏嗗嚭鐗囩幓鐠儃}鐜荤拑鐘舵�佹敼涓哄凡鍑虹墖", glassIds);
bigStorageCageDetailsService.update(new LambdaUpdateWrapper<BigStorageCageDetails>()
@@ -1419,9 +1415,21 @@
if (sitToUpRemainWidth.getGlassCount() == 0) {
return Boolean.FALSE;
}
+ List<Integer> lineList = bigStorageCageFeedTaskService.querySitToUpGlass();
+ if (CollectionUtils.isNotEmpty(lineList)) {
+ Integer lineFirst = lineList.get(0);
+ if (line == lineFirst) {
+ return Boolean.TRUE;
+ } else {
+ return Boolean.FALSE;
+ }
+ } else {
+ return Boolean.FALSE;
+ }
+
//鑾峰彇鐜荤拑淇℃伅
- GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
- return sitToUpRemainWidth.getWidth() < Math.max(glassInfo.getWidth(), glassInfo.getHeight());
+// GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId));
+// return sitToUpRemainWidth.getWidth() < Math.max(glassInfo.getWidth(), glassInfo.getHeight());
}
public String queryAndChangeGlass(String glassId) {
@@ -1438,7 +1446,7 @@
.eq(GlassInfo::getEngineerId, glassInfo.getEngineerId())
.eq(GlassInfo::getMarkIcon, glassInfo.getMarkIcon())
.notInSql(GlassInfo::getGlassId, "select distinct glass_id from big_storage_cage_details " +
- "where state!=101 and engineer_id = '" + glassInfo.getEngineerId() + "' and width = " + glassInfo.getWidth() + " and height = " + glassInfo.getHeight())
+ "where 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