From 47c33b4f988e65d1463d243e30422faacfbab99b Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 23 八月 2024 16:15:21 +0800
Subject: [PATCH] 防止破损表里有重复数据导致识别版图无法显示，当出现重复ID时，以最后一条的状态为准
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
index 2a8f6ea..2ea5807 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/Const.java
@@ -52,7 +52,8 @@
public static final Integer GLASS_STATE_SCHEDULE_ING = 104;
public static final Integer GLASS_STATE_TAKE = 200;
public static final Integer GLASS_STATE_DAMAGE = 201;
- public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103);
+ public static final List<Integer> GLASS_STATE_IN_ALL = Arrays.asList(100, 102, 103, 104);
+ public static final List<Integer> GLASS_STATE_IN_ALL_ZERO = Arrays.asList(0, 100, 102, 103, 104);
/**
* 鍗у紡鐞嗙墖绗艰鎯呰〃鐜荤拑鐘舵��
@@ -159,7 +160,7 @@
*/
public static final List<Integer> G06_WORK_STATION = Arrays.asList(1, 2, 3);
public static final List<Integer> G11_WORK_STATION = Arrays.asList(4, 5, 6);
- public static final List<Integer> G13_WORK_STATION = Arrays.asList(7);
+ public static final int G13_WORK_STATION = 7;
/**
* 鍚敤 1
--
Gitblit v1.8.0