From 16f4bb3c28fc85cffcc511718c903ada9fdab134 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 26 十二月 2025 16:59:45 +0800
Subject: [PATCH] 调用mes导入工程参数修改，Excel表数据流程卡号一致;增加读取层号/工程号方法; 工程号一致覆盖更新
---
mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceConfig.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceConfig.java b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceConfig.java
index 86584a9..174df75 100644
--- a/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceConfig.java
+++ b/mes-processes/mes-plcSend/src/main/java/com/mes/device/entity/DeviceConfig.java
@@ -23,11 +23,7 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "璁惧鍞竴鏍囪瘑", example = "DEVICE_001")
- @TableField("device_id")
- private String deviceId;
-
- @ApiModelProperty(value = "璁惧鍚嶇О", example = "涓婂ぇ杞﹁澶�1")
+ @ApiModelProperty(value = "璁惧鍚嶇О", example = "澶ц溅璁惧1")
@TableField("device_name")
private String deviceName;
@@ -35,7 +31,7 @@
@TableField("device_code")
private String deviceCode;
- @ApiModelProperty(value = "璁惧绫诲瀷", example = "涓婂ぇ杞�/澶х悊鐗�/鐜荤拑瀛樺偍")
+ @ApiModelProperty(value = "璁惧绫诲瀷", example = "澶ц溅璁惧/澶х悊鐗囩")
@TableField("device_type")
private String deviceType;
@@ -59,7 +55,7 @@
@TableField("plc_type")
private String plcType;
- @ApiModelProperty(value = "妯″潡鍚嶇О", example = "涓婂ぇ杞︽ā鍧�")
+ @ApiModelProperty(value = "妯″潡鍚嶇О", example = "澶ц溅璁惧妯″潡")
@TableField("module_name")
private String moduleName;
@@ -75,7 +71,7 @@
@TableField("config_json")
private String configJson;
- @ApiModelProperty(value = "璁惧鎻忚堪", example = "涓婂ぇ杞﹁澶�1")
+ @ApiModelProperty(value = "璁惧鎻忚堪", example = "澶ц溅璁惧1")
@TableField("description")
private String description;
@@ -108,9 +104,10 @@
// 璁惧绫诲瀷甯搁噺
public static final class DeviceType {
- public static final String LOAD_VEHICLE = "涓婂ぇ杞�"; // 涓婂ぇ杞�
- public static final String LARGE_GLASS = "澶х悊鐗�"; // 澶х悊鐗�
- public static final String GLASS_STORAGE = "鐜荤拑瀛樺偍"; // 鐜荤拑瀛樺偍
+ public static final String LOAD_VEHICLE = "澶ц溅璁惧"; // 澶ц溅璁惧
+ public static final String LARGE_GLASS = "澶х悊鐗囩"; // 澶х悊鐗囩
+ public static final String WORKSTATION_SCANNER = "鍗ц浆绔嬫壂鐮佽澶�"; // 鍗ц浆绔嬫壂鐮佽澶�
+ public static final String WORKSTATION_TRANSFER = "鍗ц浆绔嬭澶�"; // 鍗ц浆绔嬭澶�
}
// PLC绫诲瀷甯搁噺
--
Gitblit v1.8.0