diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java index 7bd80c52..5410f918 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/SchBasePoint.java @@ -224,5 +224,10 @@ public class SchBasePoint implements Serializable { */ private String control_point; + /** + * 点位优先级默认1 + */ + private String priority; + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java index 6a750e3f..0222fecc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java @@ -138,6 +138,7 @@ public class SchBasePointServiceImpl extends ServiceImpl) disDao::setTask_id) @@ -594,6 +595,7 @@ public class StIvtIostorinvCpOutServiceImpl extends ServiceImpl) disDao::setTask_id) diff --git a/mes/qd/src/views/login.vue b/mes/qd/src/views/login.vue index 29777e50..26ce01d4 100644 --- a/mes/qd/src/views/login.vue +++ b/mes/qd/src/views/login.vue @@ -2,7 +2,7 @@