From 3633e4fac369d00b8da0c2fd4f867df097fa083a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 02 一月 2025 14:13:19 +0800
Subject: [PATCH] 添加取消出片任务
---
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 b5328a8..ebc1e53 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
@@ -134,6 +134,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 +298,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();
@@ -406,7 +435,7 @@
List<BigStorageCageDetails> overSizeGlass = bigStorageCageDetailsList.stream().filter(
t -> Math.min(t.getWidth(), t.getHeight()) > 2500
).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(overSizeGlass)){
+ if (CollectionUtils.isEmpty(overSizeGlass)) {
//褰撲竴鏍肩幓鐠冮兘鍒伴綈鏃�
if (bigStorageCageDetailsList.size() == valueList.size()) {
long distinctSlotCount = bigStorageCageDetailsList.stream()
@@ -752,7 +781,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)
@@ -764,7 +793,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)
@@ -1365,7 +1394,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