From 2f9b947344a9218390b30dd2d5d141c1f6d319b9 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 07 十一月 2025 08:17:41 +0800
Subject: [PATCH] 仓储异常情况断联，任务无法执行，添加clear按钮可手动清除异常状态任务，
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 759df14..fbf2587 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -176,8 +176,9 @@
log.info("娌℃湁姝ｅ湪鎵ц鐨勪换鍔�");
return;
}
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>().eq(RawGlassStorageDetails::getId, one.getId())
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ //鏇存柊浠诲姟鐘舵�佷负鈥滃湪杞︹��
+ one.setState(Const.RAW_GLASS_STATE_CAR);
+ rawGlassStorageDetailsService.updateById(one);
}
@Scheduled(fixedDelay = 1000)
@@ -186,8 +187,6 @@
// S7Data S7DataWL1 = new S7Data();
// S7DataWL1.setReportWord((short) 1);
String value = S7DataWL1.getReportWord().toString();
-// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
-// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -207,7 +206,8 @@
log.info("灏嗚鎯呰〃鐨勭姸鎬佹敼涓哄凡鍑哄簱");
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
.set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_OUT)
- .eq(RawGlassStorageDetails::getSlot, task.getStartSlot()).eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
+ .eq(RawGlassStorageDetails::getSlot, task.getStartSlot())
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_CAR));
log.info("浠诲姟鐘舵�佸凡鏇存敼涓猴細宸插畬鎴�");
rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
.eq(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_RUNNING)
@@ -225,7 +225,7 @@
log.info("2銆佸嚭鐗�,4銆佸悐瑁呬綅璇锋眰銆倇}", taskType);
targetDetails = new RawGlassStorageDetails();
targetDetails.setSlot(task.getEndSlot());
- targetDetails.setDeviceId(deviceId);
+ targetDetails.setDeviceId(4);
targetDetails.setShelf(task.getStartSlot());
targetDetails.setState(Const.RAW_GLASS_STATE_IN);
rawGlassStorageDetailsService.save(targetDetails);
@@ -302,7 +302,7 @@
// 姝ラ2锛氭鏌ヤ换鍔″叧鑱旂殑绌烘灦瀛愮姸鎬侊紙闇�涓衡�滃緟鍏ュ簱鈥濓紝涓旂‘瀹炴槸绌烘灦瀛愶級
RawGlassStorageDetails emptyShelf = rawGlassStorageDetailsService.getOne(new LambdaQueryWrapper<RawGlassStorageDetails>()
.eq(RawGlassStorageDetails::getSlot, inRequestTask.getStartSlot()) // 璧峰浣嶏細浠撳簱绌烘灦瀛愪綅
- .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING)); // 寰呭叆搴撶姸鎬�);
+ .eq(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
if (emptyShelf == null) {
log.info("绌烘灦瀛愬埌鍚婅浣嶈姹備换鍔″叧鑱旂殑鏋跺瓙寮傚父锛堥潪绌烘灦瀛愭垨鐘舵�侀敊璇級锛岃烦杩囨墽琛�");
@@ -318,12 +318,6 @@
log.info("鍚婅浣峽}宸叉湁鍏宠仈鏋跺瓙锛屾棤娉曟墽琛岀┖鏋跺瓙鍒板悐瑁呬綅璇锋眰", inRequestTask.getEndSlot());
return Boolean.FALSE;
}
-
- // 姝ラ4锛氭洿鏂扮┖鏋跺瓙鐘舵�佷负鈥滄墽琛屼腑鈥�
- rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
- .eq(RawGlassStorageDetails::getSlot, emptyShelf.getSlot())
- .eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
- .set(RawGlassStorageDetails::getState, Const.RAW_GLASS_STATE_RUNNING));
// 姝ラ5锛氭洿鏂颁换鍔＄姸鎬佷负鈥滄墽琛屼腑鈥濓紝閬垮厤閲嶅鎵ц
rawGlassStorageTaskService.update(new LambdaUpdateWrapper<RawGlassStorageTask>()
--
Gitblit v1.8.0