From 8f3a85044b6e4b56a8dd0b104ca023933f1f129c Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 十二月 2025 16:58:36 +0800
Subject: [PATCH] 统一卧转立扫码、卧转立、大车、大理片笼的定时器逻辑和步骤状态；添加设备拓扑图清除数据、联机状态切换按钮，
---
mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java | 406 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 305 insertions(+), 101 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
index aed9919..62569ad 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/interaction/vehicle/handler/LoadVehicleLogicHandler.java
@@ -1,10 +1,12 @@
package com.mes.interaction.vehicle.handler;
import com.mes.device.entity.DeviceConfig;
+import com.mes.device.entity.DeviceStatus;
import com.mes.device.service.DeviceConfigService;
import com.mes.device.service.DeviceGroupRelationService;
import com.mes.device.service.DevicePlcOperationService;
import com.mes.device.service.GlassInfoService;
+import com.mes.device.service.DeviceStatusService;
import com.mes.device.vo.DeviceGroupVO;
import com.mes.device.vo.DevicePlcVO;
import com.mes.interaction.BaseDeviceLogicHandler;
@@ -16,6 +18,8 @@
import com.mes.s7.enhanced.EnhancedS7Serializer;
import com.mes.s7.provider.S7SerializerProvider;
import com.mes.service.PlcDynamicDataService;
+import com.mes.task.model.TaskExecutionContext;
+import com.mes.interaction.workstation.scanner.handler.HorizontalScannerLogicHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -47,6 +51,9 @@
@Autowired(required = false)
private DeviceGroupRelationService deviceGroupRelationService;
+
+ @Autowired(required = false)
+ private DeviceStatusService deviceStatusService;
@Autowired(required = false)
private PlcDynamicDataService plcDynamicDataService;
@@ -187,6 +194,9 @@
case "stopTaskMonitor":
result = handleStopTaskMonitor(deviceConfig);
break;
+ case "setOnlineState":
+ result = handleSetOnlineState(deviceConfig, params, logicParams);
+ break;
default:
log.warn("涓嶆敮鎸佺殑鎿嶄綔绫诲瀷: {}", operation);
result = DevicePlcVO.OperationResult.builder()
@@ -219,8 +229,14 @@
* 鍒ゆ柇鎿嶄綔鏄惁闇�瑕佺姸鎬佹鏌�
*/
private boolean needsStateCheck(String operation) {
- // 鎵�鏈夋搷浣滈兘闇�瑕佹鏌ョ姸鎬侊紝闄や簡鏌ヨ绫绘搷浣�
- return !"query".equals(operation) && !"status".equals(operation);
+ // 鎵�鏈夋搷浣滈兘闇�瑕佹鏌ョ姸鎬侊紝闄や簡鏌ヨ绫绘搷浣滃拰鐗瑰畾鍐呴儴妫�鏌�
+ if ("query".equals(operation) || "status".equals(operation)) {
+ return false;
+ }
+ if ("checkMesConfirm".equals(operation)) {
+ return false;
+ }
+ return true;
}
/**
@@ -256,7 +272,23 @@
}
// 浠庨厤缃腑鑾峰彇閫熷害锛堝鏋滄湁锛�
- Double speed = getLogicParam(logicParams, "vehicleSpeed", null);
+ Object speedObj = logicParams != null ? logicParams.get("vehicleSpeed") : null;
+ Double speed = null;
+ if (speedObj != null) {
+ if (speedObj instanceof Double) {
+ speed = (Double) speedObj;
+ } else if (speedObj instanceof Integer) {
+ speed = ((Integer) speedObj).doubleValue();
+ } else if (speedObj instanceof Number) {
+ speed = ((Number) speedObj).doubleValue();
+ } else {
+ try {
+ speed = Double.parseDouble(String.valueOf(speedObj));
+ } catch (NumberFormatException e) {
+ log.warn("鏃犳硶瑙ｆ瀽vehicleSpeed: {}", speedObj);
+ }
+ }
+ }
if (speed != null) {
task.setSpeed(speed);
task.calculateEstimatedEndTime();
@@ -284,7 +316,7 @@
// 浠庨�昏緫鍙傛暟涓幏鍙栭厤缃紙浠� extraParams.deviceLogic 璇诲彇锛�
Integer vehicleCapacity = getLogicParam(logicParams, "vehicleCapacity", 6000);
- Integer glassIntervalMs = getLogicParam(logicParams, "glassIntervalMs", 1000);
+ Integer glassGap = getLogicParam(logicParams, "glassGap", 200); // 鐜荤拑涔嬮棿鐨勭墿鐞嗛棿闅旓紙mm锛夛紝榛樿200mm
Boolean autoFeed = getLogicParam(logicParams, "autoFeed", true);
Integer maxRetryCount = getLogicParam(logicParams, "maxRetryCount", 5);
@@ -301,14 +333,30 @@
Integer positionValue = (Integer) params.get("positionValue");
Boolean triggerRequest = (Boolean) params.getOrDefault("triggerRequest", autoFeed);
- List<GlassInfo> plannedGlasses = planGlassLoading(glassInfos, vehicleCapacity,
- getLogicParam(logicParams, "defaultGlassLength", 2000));
- if (plannedGlasses.isEmpty()) {
+ List<GlassInfo> plannedGlasses = planGlassLoading(glassInfos, vehicleCapacity, glassGap,
+ deviceConfig.getDeviceId());
+ if (plannedGlasses == null) {
+ // 鐜荤拑娌℃湁闀垮害鏃惰繑鍥瀗ull琛ㄧず閿欒
return DevicePlcVO.OperationResult.builder()
.success(false)
- .message("褰撳墠鐜荤拑灏哄瓒呭嚭杞﹁締瀹归噺锛屾棤娉曡杞�")
+ .message("鐜荤拑淇℃伅缂哄皯闀垮害鏁版嵁锛屾棤娉曡繘琛屽閲忚绠椼�傝妫�鏌ES绋嬪簭鏄惁姝ｇ‘鎻愪緵鐜荤拑闀垮害銆�")
.build();
}
+ if (plannedGlasses.isEmpty()) {
+ // 瑁呬笉涓嬶紝閫氱煡鍗ц浆绔嬫壂鐮佽澶囨殏鍋�
+ notifyScannerPause(params, true);
+ log.warn("澶ц溅璁惧瑁呬笉涓嬶紝宸查�氱煡鍗ц浆绔嬫壂鐮佹殏鍋�: deviceId={}, glassCount={}, vehicleCapacity={}",
+ deviceConfig.getId(), glassInfos.size(), vehicleCapacity);
+ return DevicePlcVO.OperationResult.builder()
+ .success(false)
+ .message("褰撳墠鐜荤拑灏哄瓒呭嚭杞﹁締瀹归噺锛屾棤娉曡杞斤紝宸查�氱煡鍗ц浆绔嬫壂鐮佹殏鍋�")
+ .build();
+ }
+
+ // 瑁呭緱涓嬶紝纭繚鍗ц浆绔嬫壂鐮佺户缁繍琛�
+ notifyScannerPause(params, false);
+
+ // 缁х画鎵ц鍘熸湁閫昏緫
// 鏋勫缓鍐欏叆鏁版嵁
Map<String, Object> payload = new HashMap<>();
@@ -321,17 +369,21 @@
}
payload.put("plcGlassCount", plcSlots);
- // 鍐欏叆浣嶇疆淇℃伅
+ // 鍐欏叆浣嶇疆淇℃伅锛歅LC渚ф湡鏈涚殑鏄� MES 缂栧彿锛堝1001/1002锛夛紝鑰屼笉鏄綅缃槧灏勫悗鐨勬牸瀛愬��
+ Integer plcPosition = null;
if (positionValue != null) {
- payload.put("inPosition", positionValue);
+ // 濡傛灉璋冪敤鏂圭洿鎺ヤ紶浜嗘暟鍊硷紝鍒欒涓鸿繖鏄疢ES缂栧彿锛岀洿鎺ュ啓鍏�
+ plcPosition = positionValue;
} else if (positionCode != null) {
- // 浠庝綅缃槧灏勪腑鑾峰彇浣嶇疆鍊�
- @SuppressWarnings("unchecked")
- Map<String, Integer> positionMapping = getLogicParam(logicParams, "positionMapping", new HashMap<>());
- Integer mappedValue = positionMapping.get(positionCode);
- if (mappedValue != null) {
- payload.put("inPosition", mappedValue);
+ // 灏濊瘯灏嗕綅缃唬鐮佽В鏋愪负鏁板瓧锛堜緥濡� "900" -> 900锛�
+ try {
+ plcPosition = Integer.parseInt(positionCode.trim());
+ } catch (NumberFormatException ignore) {
+ // 闈炴暟瀛楃紪鐮佹椂锛屼笉鍐欏叆inPosition锛岀敱PLC鎴栧悗缁�昏緫鑷澶勭悊
}
+ }
+ if (plcPosition != null) {
+ payload.put("inPosition", plcPosition);
}
// 鑷姩瑙﹀彂璇锋眰瀛�
@@ -347,18 +399,11 @@
log.info("澶ц溅璁惧鐜荤拑涓婃枡: deviceId={}, glassCount={}, position={}, plannedGlassIds={}",
deviceConfig.getId(), plcSlots, positionCode, plannedGlasses);
- if (glassIntervalMs != null && glassIntervalMs > 0) {
- try {
- Thread.sleep(glassIntervalMs);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
-
+ // 鍐欏叆PLC锛岃澶ц溅寮�濮嬭鐜荤拑
DevicePlcVO.OperationResult result = devicePlcOperationService.writeFields(
deviceConfig.getId(), payload, operationName);
- // 濡傛灉鎵ц鎴愬姛锛屾洿鏂颁綅缃俊鎭埌鐘舵�侊紝骞跺惎鍔ㄧ姸鎬佺洃鎺�
+ // 濡傛灉鎵ц鎴愬姛锛屾洿鏂颁綅缃俊鎭埌鐘舵��
if (Boolean.TRUE.equals(result.getSuccess())) {
VehicleStatus status = statusManager.getOrCreateVehicleStatus(
deviceConfig.getDeviceId(), deviceConfig.getDeviceName());
@@ -366,9 +411,16 @@
VehiclePosition position = new VehiclePosition(positionCode, positionValue);
status.setCurrentPosition(position);
}
-
- // 鍚姩鑷姩鐘舵�佺洃鎺э紝褰� state=1 鏃惰嚜鍔ㄥ崗璋冨崸杞珛璁惧
- startStateMonitoring(deviceConfig, logicParams);
+
+ // 浠呭湪鈥滈潪澶氳澶囦换鍔♀�濆満鏅笅锛屾墠鍚姩澶ц溅鑷韩鐨勮嚜鍔ㄧ姸鎬佺洃鎺у拰 MES 浠诲姟鐩戞帶
+ boolean inMultiDeviceTask = params != null && params.containsKey("_taskContext");
+ if (!inMultiDeviceTask) {
+ // 鍚姩鑷姩鐘舵�佺洃鎺э紝褰� state=1 鏃惰嚜鍔ㄥ崗璋冨崸杞珛璁惧
+ startStateMonitoring(deviceConfig, logicParams);
+
+ // 浠� PLC/MES 鍒涘缓姝ｅ紡浠诲姟骞跺惎鍔ㄧ洃鎺х殑閫昏緫锛屼繚鐣欑粰鐙珛 MES 鍦烘櫙浣跨敤
+ // 澶氳澶囦换鍔″満鏅笅锛岃繖閮ㄥ垎浜ょ敱 TaskExecutionEngine 缁熶竴缂栨帓
+ }
}
return result;
@@ -423,6 +475,7 @@
Map<String, Object> payload = new HashMap<>();
payload.put("plcRequest", 0);
payload.put("plcReport", 0);
+ payload.put("onlineState", Boolean.TRUE);
log.info("澶ц溅璁惧閲嶇疆: deviceId={}", deviceConfig.getId());
@@ -437,8 +490,65 @@
statusManager.clearVehicleTask(deviceConfig.getDeviceId());
statusManager.updateVehicleStatus(deviceConfig.getDeviceId(), VehicleState.IDLE);
stopStateMonitoring(deviceConfig.getDeviceId());
+ updateDeviceOnlineStatus(deviceConfig, true);
}
+ return result;
+ }
+
+ /**
+ * 璁剧疆鑱旀満鐘舵��
+ * @param deviceConfig 璁惧閰嶇疆
+ * @param params 鍙傛暟锛屽彲鍖呭惈 onlineState锛�1=鑱旀満锛�0=鑴辨満锛�
+ * @param logicParams 閫昏緫鍙傛暟
+ * @return 鎿嶄綔缁撴灉
+ */
+ private DevicePlcVO.OperationResult handleSetOnlineState(
+ DeviceConfig deviceConfig,
+ Map<String, Object> params,
+ Map<String, Object> logicParams) {
+
+ // 浠庡弬鏁颁腑鑾峰彇鑱旀満鐘舵�佸�硷紝榛樿涓簍rue锛堣仈鏈猴級
+ boolean onlineState = true;
+ if (params != null && params.containsKey("onlineState")) {
+ Object stateObj = params.get("onlineState");
+ if (stateObj instanceof Boolean) {
+ onlineState = (Boolean) stateObj;
+ } else if (stateObj instanceof Number) {
+ onlineState = ((Number) stateObj).intValue() != 0;
+ } else if (stateObj instanceof String) {
+ try {
+ String str = ((String) stateObj).trim();
+ if ("true".equalsIgnoreCase(str)) {
+ onlineState = true;
+ } else if ("false".equalsIgnoreCase(str)) {
+ onlineState = false;
+ } else {
+ onlineState = Integer.parseInt(str) != 0;
+ }
+ } catch (NumberFormatException e) {
+ log.warn("瑙ｆ瀽onlineState澶辫触锛屼娇鐢ㄩ粯璁ゅ�紅rue: deviceId={}, value={}",
+ deviceConfig.getId(), stateObj);
+ }
+ }
+ }
+
+ Map<String, Object> payload = new HashMap<>();
+ payload.put("onlineState", onlineState);
+
+ String stateText = onlineState ? "鑱旀満" : "鑴辨満";
+ log.info("澶ц溅璁惧璁剧疆鑱旀満鐘舵��: deviceId={}, onlineState={} ({})",
+ deviceConfig.getId(), onlineState, stateText);
+
+ DevicePlcVO.OperationResult result = devicePlcOperationService.writeFields(
+ deviceConfig.getId(),
+ payload,
+ "澶ц溅璁惧-璁剧疆鑱旀満鐘舵��(" + stateText + ")"
+ );
+
+ if (Boolean.TRUE.equals(result.getSuccess())) {
+ updateDeviceOnlineStatus(deviceConfig, onlineState);
+ }
return result;
}
@@ -465,6 +575,7 @@
payload.put("plcGlassCount", 0);
payload.put("plcRequest", 0);
payload.put("plcReport", 0);
+ payload.put("onlineState", Boolean.TRUE);
if (params != null && params.containsKey("positionValue")) {
payload.put("inPosition", params.get("positionValue"));
@@ -485,9 +596,23 @@
statusManager.clearVehicleTask(deviceConfig.getDeviceId());
statusManager.updateVehicleStatus(deviceConfig.getDeviceId(), VehicleState.IDLE);
stopStateMonitoring(deviceConfig.getDeviceId());
+ updateDeviceOnlineStatus(deviceConfig, true);
}
return result;
+ }
+
+ private void updateDeviceOnlineStatus(DeviceConfig deviceConfig, boolean online) {
+ if (deviceStatusService == null || deviceConfig == null || deviceConfig.getId() == null) {
+ return;
+ }
+ try {
+ String status = online ? DeviceStatus.Status.ONLINE : DeviceStatus.Status.OFFLINE;
+ deviceStatusService.updateDeviceOnlineStatus(deviceConfig.getId(), status);
+ } catch (Exception e) {
+ log.warn("鍚屾璁惧鍦ㄧ嚎鐘舵�佸埌鏁版嵁搴撳け璐�: deviceId={}, online={}, error={}",
+ deviceConfig.getDeviceId(), online, e.getMessage());
+ }
}
private List<String> resolveGlassSlotFields(Map<String, Object> logicParams, int fallbackCount) {
@@ -525,9 +650,9 @@
return "杞﹁締瀹归噺(vehicleCapacity)蹇呴』澶т簬0";
}
- Integer glassIntervalMs = getLogicParam(logicParams, "glassIntervalMs", null);
- if (glassIntervalMs != null && glassIntervalMs < 0) {
- return "鐜荤拑闂撮殧鏃堕棿(glassIntervalMs)涓嶈兘涓鸿礋鏁�";
+ Integer glassGap = getLogicParam(logicParams, "glassGap", null);
+ if (glassGap != null && glassGap < 0) {
+ return "鐜荤拑闂撮殧(glassGap)涓嶈兘涓鸿礋鏁�";
}
return null; // 楠岃瘉閫氳繃
@@ -537,7 +662,7 @@
public String getDefaultLogicParams() {
Map<String, Object> defaultParams = new HashMap<>();
defaultParams.put("vehicleCapacity", 6000);
- defaultParams.put("glassIntervalMs", 1000);
+ defaultParams.put("glassGap", 200); // 鐜荤拑涔嬮棿鐨勭墿鐞嗛棿闅旓紙mm锛夛紝榛樿200mm
defaultParams.put("autoFeed", true);
defaultParams.put("maxRetryCount", 5);
defaultParams.put("defaultGlassLength", 2000);
@@ -551,13 +676,6 @@
defaultParams.put("taskMonitorIntervalMs", 1000); // 浠诲姟鐩戞帶闂撮殧锛堟绉掞級
defaultParams.put("mesConfirmTimeoutMs", 30000); // MES纭瓒呮椂锛堟绉掞級
- // 鍑虹墖浠诲姟鐩稿叧閰嶇疆
- // outboundSlotRanges: 鍑虹墖浠诲姟鐨剆tartSlot鑼冨洿锛屼緥濡俒1, 101]琛ㄧず鏍煎瓙1~101閮芥槸鍑虹墖浠诲姟
- // 濡傛灉涓嶉厤缃紝鍒欓�氳繃鍒ゆ柇startSlot鏄惁鍦╬ositionMapping涓潵鍖哄垎杩涚墖/鍑虹墖
- List<Integer> outboundSlotRanges = new ArrayList<>();
- outboundSlotRanges.add(1); // 鏈�灏忔牸瀛愮紪鍙�
- outboundSlotRanges.add(101); // 鏈�澶ф牸瀛愮紪鍙�
- defaultParams.put("outboundSlotRanges", outboundSlotRanges);
// gridPositionMapping: 鏍煎瓙缂栧彿鍒颁綅缃殑鏄犲皠琛紙鍙�夛級
// 濡傛灉涓嶉厤缃紝鍒欐牸瀛愮紪鍙风洿鎺ヤ綔涓轰綅缃��
@@ -644,28 +762,56 @@
return null;
}
+ /**
+ * 瑙勫垝鐜荤拑瑁呰浇
+ * @param source 婧愮幓鐠冨垪琛�
+ * @param vehicleCapacity 杞﹁締瀹归噺锛坢m锛�
+ * @param glassGap 鐜荤拑涔嬮棿鐨勭墿鐞嗛棿闅旓紙mm锛夛紝榛樿200mm
+ * @param deviceId 璁惧ID锛堢敤浜庢棩蹇楋級
+ * @return 瑙勫垝鍚庣殑鐜荤拑鍒楄〃锛屽鏋滅幓鐠冩病鏈夐暱搴﹀垯杩斿洖null锛堢敤浜庢祴璇昅ES绋嬪簭锛�
+ */
private List<GlassInfo> planGlassLoading(List<GlassInfo> source,
int vehicleCapacity,
- Integer defaultGlassLength) {
+ int glassGap,
+ String deviceId) {
List<GlassInfo> planned = new ArrayList<>();
int usedLength = 0;
int capacity = Math.max(vehicleCapacity, 1);
- int fallbackLength = defaultGlassLength != null && defaultGlassLength > 0 ? defaultGlassLength : 2000;
+ int gap = Math.max(glassGap, 0); // 纭繚闂撮殧涓嶄负璐熸暟
for (GlassInfo info : source) {
- int length = info.getLength() != null && info.getLength() > 0 ? info.getLength() : fallbackLength;
+ Integer glassLength = info.getLength();
+
+ if (glassLength == null || glassLength <= 0) {
+ // 鐜荤拑娌℃湁闀垮害锛岀洿鎺ユ姤閿欙紙鐢ㄤ簬娴嬭瘯MES绋嬪簭锛�
+ log.error("鐜荤拑[{}]缂哄皯闀垮害鏁版嵁锛屾棤娉曡繘琛屽閲忚绠椼�俤eviceId={}锛岃妫�鏌ES绋嬪簭鏄惁姝ｇ‘鎻愪緵鐜荤拑闀垮害銆�",
+ info.getGlassId(), deviceId);
+ return null;
+ }
+
+ int length = glassLength;
+
if (planned.isEmpty()) {
+ // 绗竴鍧楃幓鐠冿紝涓嶉渶瑕侀棿闅�
planned.add(info.withLength(length));
usedLength = length;
continue;
}
- if (usedLength + length <= capacity) {
+
+ // 鍚庣画鐜荤拑闇�瑕佽�冭檻闂撮殭锛氱幓鐠冮暱搴� + 闂撮殭
+ int requiredLength = length + gap;
+ if (usedLength + requiredLength <= capacity) {
planned.add(info.withLength(length));
- usedLength += length;
+ usedLength += requiredLength; // 鍖呭惈闂撮殭
} else {
+ // 瑁呬笉涓嬩簡锛屽仠姝㈡坊鍔�
break;
}
}
+
+ log.debug("鐜荤拑瑁呰浇瑙勫垝: deviceId={}, total={}, planned={}, usedLength={}, capacity={}, glassGap={}",
+ deviceId, source.size(), planned.size(), usedLength, capacity, gap);
+
return planned;
}
@@ -1269,15 +1415,19 @@
// 杩欓噷绠�鍖栧鐞嗭細濡傛灉startSlot涓嶅湪positionMapping涓紝涓旀槸鏁板瓧锛屽彲鑳芥槸鏍煎瓙缂栧彿
// 鍙互閫氳繃閰嶇疆鎸囧畾鏍煎瓙缂栧彿鑼冨洿锛屾垨鑰呴�氳繃鏌ユ壘鍚岀粍璁惧鍒ゆ柇
- // 鏂规硶3锛氶�氳繃閰嶇疆鎸囧畾鍑虹墖浠诲姟鐨剆tartSlot鑼冨洿
+ // 鏂规硶3锛氶�氳繃閰嶇疆鎸囧畾杞﹁締杩愬姩鏍煎瓙鑼冨洿锛堝吋瀹规棫閰嶇疆outboundSlotRanges锛�
@SuppressWarnings("unchecked")
- List<Integer> outboundSlotRanges = getLogicParam(logicParams, "outboundSlotRanges", null);
- if (outboundSlotRanges != null && !outboundSlotRanges.isEmpty()) {
- // 濡傛灉閰嶇疆浜嗗嚭鐗噑lot鑼冨洿锛屾鏌tartSlot鏄惁鍦ㄨ寖鍥村唴
- // 渚嬪锛歔1, 101] 琛ㄧず鏍煎瓙1~101閮芥槸鍑虹墖浠诲姟
- if (outboundSlotRanges.size() >= 2) {
- int minSlot = outboundSlotRanges.get(0);
- int maxSlot = outboundSlotRanges.get(1);
+ List<Integer> vehicleSlotRange = getLogicParam(logicParams, "vehicleSlotRange", null);
+ if (vehicleSlotRange == null || vehicleSlotRange.isEmpty()) {
+ // 鍏煎鏃ч厤缃�
+ vehicleSlotRange = getLogicParam(logicParams, "outboundSlotRanges", null);
+ }
+ if (vehicleSlotRange != null && !vehicleSlotRange.isEmpty()) {
+ // 濡傛灉閰嶇疆浜嗚溅杈嗚繍鍔ㄦ牸瀛愯寖鍥达紝妫�鏌tartSlot鏄惁鍦ㄨ寖鍥村唴
+ // 渚嬪锛歔1, 101] 琛ㄧず杞﹁締鍙兘鍦ㄦ牸瀛�1~101涔嬮棿杩愬姩
+ if (vehicleSlotRange.size() >= 2) {
+ int minSlot = vehicleSlotRange.get(0);
+ int maxSlot = vehicleSlotRange.get(1);
if (startSlot >= minSlot && startSlot <= maxSlot) {
return true;
}
@@ -1361,6 +1511,25 @@
*/
private TimeCalculation calculateTime(Integer currentPos, Integer startPos,
Integer targetPos, Map<String, Object> logicParams) {
+ // 楠岃瘉杞﹁締杩愬姩鏍煎瓙鑼冨洿
+ @SuppressWarnings("unchecked")
+ List<Integer> vehicleSlotRange = getLogicParam(logicParams, "vehicleSlotRange", null);
+ if (vehicleSlotRange == null || vehicleSlotRange.isEmpty()) {
+ // 鍏煎鏃ч厤缃�
+ vehicleSlotRange = getLogicParam(logicParams, "outboundSlotRanges", null);
+ }
+ if (vehicleSlotRange != null && vehicleSlotRange.size() >= 2) {
+ int minSlot = vehicleSlotRange.get(0);
+ int maxSlot = vehicleSlotRange.get(1);
+ // 楠岃瘉startPos鍜宼argetPos鏄惁鍦ㄥ厑璁哥殑鑼冨洿鍐�
+ if (startPos != null && (startPos < minSlot || startPos > maxSlot)) {
+ log.warn("璧峰浣嶇疆 {} 瓒呭嚭杞﹁締杩愬姩鏍煎瓙鑼冨洿 [{}, {}]", startPos, minSlot, maxSlot);
+ }
+ if (targetPos != null && (targetPos < minSlot || targetPos > maxSlot)) {
+ log.warn("鐩爣浣嶇疆 {} 瓒呭嚭杞﹁締杩愬姩鏍煎瓙鑼冨洿 [{}, {}]", targetPos, minSlot, maxSlot);
+ }
+ }
+
// 鑾峰彇閫熷害锛堟牸/绉掞紝grid/s锛�
Double speed = getLogicParam(logicParams, "vehicleSpeed", 1.0);
if (speed == null || speed <= 0) {
@@ -1547,65 +1716,80 @@
log.info("宸茬粰MES姹囨姤({}浠诲姟): deviceId={}, glassId={}",
taskType, deviceConfig.getDeviceId(), taskInfo.glassId);
- // 绛夊緟MES纭
- waitForMesConfirm(deviceConfig, serializer, taskInfo, logicParams);
-
+ // 澶氳澶囦换鍔″満鏅笅锛屼笉鍦ㄨ繖閲岄樆濉炵瓑寰匨ES纭锛岀敱浠诲姟寮曟搸瀹氭椂璋冪敤checkMesConfirm
} catch (Exception e) {
log.error("缁橫ES姹囨姤寮傚父: deviceId={}", deviceConfig.getDeviceId(), e);
}
}
/**
- * 绛夊緟MES纭
+ * 妫�鏌ES纭鐘舵�侊紙渚涗换鍔″紩鎿庡懆鏈熸�ц皟鐢級
+ * 杩斿洖OperationResult.data涓殑 completed 鏍囧織琛ㄧず鏄惁宸茬‘璁ゅ畬鎴�
*/
- private void waitForMesConfirm(DeviceConfig deviceConfig,
- EnhancedS7Serializer serializer,
- MesTaskInfo taskInfo,
- Map<String, Object> logicParams) {
-
+ public DevicePlcVO.OperationResult checkMesConfirm(DeviceConfig deviceConfig,
+ Map<String, Object> logicParams) {
+ if (plcDynamicDataService == null || s7SerializerProvider == null) {
+ return DevicePlcVO.OperationResult.builder()
+ .success(false)
+ .message("PlcDynamicDataService鎴朣7SerializerProvider鏈敞鍏�")
+ .build();
+ }
+ EnhancedS7Serializer serializer = s7SerializerProvider.getSerializer(deviceConfig);
+ if (serializer == null) {
+ return DevicePlcVO.OperationResult.builder()
+ .success(false)
+ .message("鑾峰彇PLC搴忓垪鍖栧櫒澶辫触")
+ .build();
+ }
+
+ Map<String, Object> data = new HashMap<>();
try {
- // 璇诲彇纭瀛楋紙鍋囪瀛楁鍚嶄负mesConfirm锛�
- Integer maxWaitTime = getLogicParam(logicParams, "mesConfirmTimeoutMs", 30000); // 榛樿30绉�
- long startTime = System.currentTimeMillis();
-
- while (System.currentTimeMillis() - startTime < maxWaitTime) {
- Object confirmValue = plcDynamicDataService.readPlcField(
- deviceConfig, "mesConfirm", serializer);
- Integer confirm = parseInteger(confirmValue);
-
- if (confirm != null && confirm == 1) {
- // MES宸茬‘璁わ紝娓呯┖state鍜屾眹鎶ュ瓧
- clearTaskStates(deviceConfig, serializer);
-
- // 浠诲姟瀹屾垚锛屾仮澶嶄负绌洪棽鐘舵��
- statusManager.updateVehicleStatus(
- deviceConfig.getDeviceId(), VehicleState.IDLE);
- statusManager.clearVehicleTask(deviceConfig.getDeviceId());
-
- // 绉婚櫎浠诲姟
- currentTasks.remove(deviceConfig.getDeviceId());
-
- // 鍋滄浠诲姟鐩戞帶
- handleStopTaskMonitor(deviceConfig);
-
- // 鎭㈠plcRequest=1锛堝彲浠ユ帴鏀舵柊浠诲姟锛�
- Map<String, Object> payload = new HashMap<>();
- payload.put("plcRequest", 1);
- plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
-
- log.info("MES浠诲姟宸插畬鎴�: deviceId={}, glassId={}",
- deviceConfig.getDeviceId(), taskInfo.glassId);
- return;
- }
-
- Thread.sleep(500); // 绛夊緟500ms鍚庨噸璇�
+ Object confirmValue = plcDynamicDataService.readPlcField(
+ deviceConfig, "mesConfirm", serializer);
+ Integer confirm = parseInteger(confirmValue);
+ boolean completed = confirm != null && confirm == 1;
+ data.put("completed", completed);
+
+ if (completed) {
+ // MES宸茬‘璁わ紝娓呯┖state鍜屾眹鎶ュ瓧
+ clearTaskStates(deviceConfig, serializer);
+
+ // 浠诲姟瀹屾垚锛屾仮澶嶄负绌洪棽鐘舵��
+ statusManager.updateVehicleStatus(
+ deviceConfig.getDeviceId(), VehicleState.IDLE);
+ statusManager.clearVehicleTask(deviceConfig.getDeviceId());
+
+ // 绉婚櫎浠诲姟璁板綍锛堝鏋滄湁锛�
+ currentTasks.remove(deviceConfig.getDeviceId());
+
+ // 鍋滄浠诲姟鐩戞帶
+ handleStopTaskMonitor(deviceConfig);
+
+ // 鎭㈠plcRequest=1锛堝彲浠ユ帴鏀舵柊浠诲姟锛�
+ Map<String, Object> payload = new HashMap<>();
+ payload.put("plcRequest", 1);
+ plcDynamicDataService.writePlcData(deviceConfig, payload, serializer);
+
+ log.info("MES浠诲姟宸茬‘璁ゅ畬鎴�: deviceId={}", deviceConfig.getDeviceId());
+ return DevicePlcVO.OperationResult.builder()
+ .success(true)
+ .message("MES浠诲姟宸茬‘璁ゅ畬鎴�")
+ .data(data)
+ .build();
}
-
- log.warn("绛夊緟MES纭瓒呮椂: deviceId={}, glassId={}",
- deviceConfig.getDeviceId(), taskInfo.glassId);
-
+
+ return DevicePlcVO.OperationResult.builder()
+ .success(true)
+ .message("绛夊緟MES纭涓�")
+ .data(data)
+ .build();
} catch (Exception e) {
- log.error("绛夊緟MES纭寮傚父: deviceId={}", deviceConfig.getDeviceId(), e);
+ log.error("妫�鏌ES纭鐘舵�佸紓甯�: deviceId={}", deviceConfig.getDeviceId(), e);
+ return DevicePlcVO.OperationResult.builder()
+ .success(false)
+ .message("妫�鏌ES纭鐘舵�佸紓甯�: " + e.getMessage())
+ .data(data)
+ .build();
}
}
@@ -1715,5 +1899,25 @@
Thread.currentThread().interrupt();
}
}
+
+ /**
+ * 閫氱煡鍗ц浆绔嬫壂鐮佽澶囨殏鍋滄垨缁х画
+ * @param params 鍙傛暟锛屽寘鍚玙taskContext寮曠敤
+ * @param pause true=鏆傚仠锛宖alse=缁х画
+ */
+ private void notifyScannerPause(Map<String, Object> params, boolean pause) {
+ if (params == null) {
+ return;
+ }
+
+ Object contextObj = params.get("_taskContext");
+ if (contextObj instanceof TaskExecutionContext) {
+ TaskExecutionContext context = (TaskExecutionContext) contextObj;
+ HorizontalScannerLogicHandler.setPauseFlag(context, pause);
+ log.info("宸查�氱煡鍗ц浆绔嬫壂鐮佽澶噞}: pause={}", pause ? "鏆傚仠" : "缁х画", pause);
+ } else {
+ log.debug("鏈壘鍒癟askExecutionContext锛屾棤娉曢�氱煡鍗ц浆绔嬫壂鐮佽澶囨殏鍋�");
+ }
+ }
}
--
Gitblit v1.8.0