From 2935442d9bdb795fecaa704d3bce2f6249b208d4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 25 十二月 2024 16:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 165 +++++++++++++++---------------------------------------
1 files changed, 46 insertions(+), 119 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..b5328a8 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
@@ -403,126 +403,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;
@@ -894,8 +809,8 @@
* 鎸夌収鐜荤拑id鍒ゆ柇鐜荤拑鐘舵�佸強鍗ц浆绔嬫槸鍚﹀彲鐩存帴鍚姩
*/
public Boolean judgeGlassTypeStatus(String glassId, Integer line, String mesAddress) {
- //棰勬帓鏍煎瓙
- computeSlot(glassId);
+// 棰勬帓鏍煎瓙
+// computeSlot(glassId);
//鍒ゆ柇姝ょ幓鐠冩槸鍦ㄧ鍐呮垨宸茬敓鎴愯繘鐗囦换鍔�
BigStorageCageFeedTask bigStorageCageFeedTask = bigStorageCageFeedTaskService.getOne(
new LambdaQueryWrapper<BigStorageCageFeedTask>()
@@ -1061,7 +976,7 @@
damageService.deleteByGlassId(glassId);
Damage damage = new Damage();
damage.setGlassId(glassId);
- damage.setWorkingProcedure("閽㈠寲");
+ damage.setWorkingProcedure("纾ㄨ竟");
damage.setLine(line);
damage.setType(1);
damage.setRemark("杩涘ぇ鐞嗙墖");
@@ -1419,9 +1334,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) {
--
Gitblit v1.8.0