diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
index 4cdec86..7306756 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java
@@ -183,7 +183,7 @@ public class NDCAgvServiceImpl implements NDCAgvService {
} else {
String instcode = inst.getInstruction_code();
- int type = Integer.parseInt(inst.getInstruction_type());
+ int type = Integer.parseInt(inst.getAgv_inst_type());
int priority = Integer.parseInt(inst.getPriority()) + 128;
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index 250d223..7de1854 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -312,10 +312,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
// standardOrdinarySiteDeviceDriver.setAgvphase(phase);
// standardOrdinarySiteDeviceDriver.setIndex(index);
// standardOrdinarySiteDeviceDriver.setInst(inst);
+
+ //if (standardInspectSiteDeviceDriver.getMove() > 0) {
+ data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
+ //}
standardInspectSiteDeviceDriver.writing(5);
- if (standardInspectSiteDeviceDriver.getMove() > 0) {
- data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
- }
}
}
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
index 4a59578..1a260f5 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
@@ -181,7 +181,7 @@ public class AutoCreateInst {
instdto.setAgv_inst_type("3");
}
} else {
- instdto.setAgv_inst_type("4");
+ instdto.setAgv_inst_type("1");
}
try {
diff --git a/acs/nladmin-system/src/main/resources/config/application-prod.yml b/acs/nladmin-system/src/main/resources/config/application-prod.yml
index 47dada2..fa04600 100644
--- a/acs/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/acs/nladmin-system/src/main/resources/config/application-prod.yml
@@ -6,7 +6,7 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
- url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+ url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ACS}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:123456}
# 初始连接数
diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml
index 7e3fbea..a4d00ab 100644
--- a/acs/nladmin-system/src/main/resources/config/application.yml
+++ b/acs/nladmin-system/src/main/resources/config/application.yml
@@ -2,7 +2,7 @@ spring:
freemarker:
check-template-location: false
profiles:
- active: dev
+ active: prod
jackson:
time-zone: GMT+8
data:
diff --git a/acs/nladmin-ui/.env.production b/acs/nladmin-ui/.env.production
index 762ac12..35afc5e 100644
--- a/acs/nladmin-ui/.env.production
+++ b/acs/nladmin-ui/.env.production
@@ -2,6 +2,6 @@ ENV = 'production'
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
-VUE_APP_BASE_API = 'http://127.0.0.1:8010'
+VUE_APP_BASE_API = 'http://192.168.200.100:8010'
# 如果接口是 http 形式, wss 需要改为 ws
-VUE_APP_WS_API = 'ws://127.0.0.1:8010'
+VUE_APP_WS_API = 'ws://192.168.200.100:8010'
diff --git a/acs/nladmin-ui/src/views/acs/instruction/index.vue b/acs/nladmin-ui/src/views/acs/instruction/index.vue
index 7d5c0ed..89aa7e6 100644
--- a/acs/nladmin-ui/src/views/acs/instruction/index.vue
+++ b/acs/nladmin-ui/src/views/acs/instruction/index.vue
@@ -109,8 +109,12 @@
-
-
+
+
+ {{ dict.label.task_type[scope.row.instruction_type] }}
+
+
+
@@ -133,13 +137,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -216,7 +220,7 @@ const defaultForm = {
update_time: null
}
export default {
- dicts: ['task_status'],
+ dicts: ['task_status', 'task_type'],
name: 'Instruction',
components: { crudOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],