From 22e17b6db03ca58bc477a35ca067e55a09cffce7 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 10 十二月 2025 17:04:08 +0800
Subject: [PATCH] 添加工程表及相关逻辑，防止重复导入Excel表序号重复生成
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceCoordinationServiceImpl.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceCoordinationServiceImpl.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceCoordinationServiceImpl.java
index 44513f8..9fb28a8 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceCoordinationServiceImpl.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/service/impl/DeviceCoordinationServiceImpl.java
@@ -80,13 +80,13 @@
// 鏍规嵁璁惧绫诲瀷锛屾彁鍙栧叧閿暟鎹苟鏇存柊涓婁笅鏂�
if (DeviceConfig.DeviceType.LOAD_VEHICLE.equals(fromDevice.getDeviceType())) {
- // 涓婂ぇ杞﹁澶囧畬鎴愶紝浼犻�掔幓鐠僆D鍒楄〃
+ // 澶ц溅璁惧瀹屾垚锛屼紶閫掔幓鐠僆D鍒楄〃
Object glassIds = data.get("glassIds");
if (glassIds instanceof List) {
@SuppressWarnings("unchecked")
List<String> ids = (List<String>) glassIds;
context.setLoadedGlassIds(new ArrayList<>(ids));
- log.info("涓婂ぇ杞﹁澶囨暟鎹紶閫�: fromDevice={}, toDevice={}, glassIds={}",
+ log.info("澶ц溅璁惧鏁版嵁浼犻��: fromDevice={}, toDevice={}, glassIds={}",
fromDevice.getDeviceCode(), toDevice.getDeviceCode(), ids);
}
} else if (DeviceConfig.DeviceType.LARGE_GLASS.equals(fromDevice.getDeviceType())) {
@@ -147,19 +147,13 @@
// 妫�鏌ヨ澶囩被鍨嬬壒瀹氱殑渚濊禆
String deviceType = device.getDeviceType();
if (DeviceConfig.DeviceType.LARGE_GLASS.equals(deviceType)) {
- // 澶х悊鐗囪澶囬渶瑕佷笂澶ц溅璁惧鍏堝畬鎴�
+ // 澶х悊鐗囪澶囬渶瑕佸ぇ杞﹁澶囧厛瀹屾垚
List<String> loadedGlassIds = context.getSafeLoadedGlassIds();
if (CollectionUtils.isEmpty(loadedGlassIds)) {
- missingDependencies.add("涓婂ぇ杞﹁澶囨湭瀹屾垚锛岀己灏戠幓鐠僆D鍒楄〃");
- }
- } else if (DeviceConfig.DeviceType.GLASS_STORAGE.equals(deviceType)) {
- // 鐜荤拑瀛樺偍璁惧闇�瑕佸ぇ鐞嗙墖璁惧鍏堝畬鎴愶紙浼樺厛锛夛紝鎴栦笂澶ц溅璁惧瀹屾垚
- List<String> processedGlassIds = context.getSafeProcessedGlassIds();
- List<String> loadedGlassIds = context.getSafeLoadedGlassIds();
- if (CollectionUtils.isEmpty(processedGlassIds) && CollectionUtils.isEmpty(loadedGlassIds)) {
- missingDependencies.add("鍓嶇疆璁惧鏈畬鎴愶紝缂哄皯鐜荤拑ID鍒楄〃");
+ missingDependencies.add("澶ц溅璁惧鏈畬鎴愶紝缂哄皯鐜荤拑ID鍒楄〃");
}
}
+ // 鍏朵粬璁惧绫诲瀷鏆備笉闇�瑕佷緷璧栨鏌�
// 妫�鏌ヨ澶囬厤缃腑鐨勪緷璧栧叧绯伙紙浠巈xtraParams涓鍙栵級
Map<String, Object> deviceDependencies = getDeviceDependencies(device);
--
Gitblit v1.8.0