diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
index 8966cb1..6815bb3 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
@@ -1578,7 +1578,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
Iterator iterator = storageCells.iterator();
while (iterator.hasNext()) {
StorageCellDto storageCellDto = (StorageCellDto) iterator.next();
- if (storageCellDto.getAddress() == code) {
+ if ( storageCellDto!=null && storageCellDto.getAddress() == code) {
return storageCellDto.getStorage_code();
}
}
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index ef45105..11cbdf5 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -432,54 +432,18 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
for (int i = 0; i < datas.size(); i++) {
JSONObject jsonObject = datas.getJSONObject(i);
String device_code = jsonObject.getString("device_code");
- String task_code = jsonObject.getString("task_code");
- //1-允许取放； 2-允许离开
+ //1-允许取放；
String option = jsonObject.getString("option");
- Instruction inst = instructionService.findByTaskcode(task_code);
- if (ObjectUtil.isEmpty(inst)) {
- JSONObject jo = new JSONObject();
- jo.put("task_code", task_code);
- jo.put("message", "未找到对应任务");
- errArr.add(jo);
- continue;
- } else {
- String carNo = inst.getCarno();
- if (ObjectUtil.isEmpty(carNo)) {
- JSONObject jo = new JSONObject();
- jo.put("task_code", task_code);
- jo.put("message", "未找到任务对应车号");
- errArr.add(jo);
- continue;
- } else {
- Device device = deviceAppService.findDeviceByCode(carNo);
- AgvNdcTwoDeviceDriver agvNdcTwoDeviceDriver;
- if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
- agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver();
- int phase = agvNdcTwoDeviceDriver.getPhase();
- if (phase == 0x03 || phase == 0x05 || phase == 0x08) {
- StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
- Device device_k = deviceAppService.findDeviceByCode(device_code + "_K");
- Device device_m = deviceAppService.findDeviceByCode(device_code + "_M");
- if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
- standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver();
- standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
- standardOrdinarySiteDeviceDriver.setTask_code(task_code);
- }
- if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
- standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver();
- standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
- standardOrdinarySiteDeviceDriver.setTask_code(task_code);
- }
- } else {
- JSONObject jo = new JSONObject();
- jo.put("task_code", task_code);
- jo.put("message", "AGV未就绪无法设置");
- errArr.add(jo);
- continue;
- }
- }
- }
-
+ StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver;
+ Device device_k = deviceAppService.findDeviceByCode(device_code);
+ Device device_m = deviceAppService.findDeviceByCode(device_code);
+ if (device_k.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
+ standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_k.getDeviceDriver();
+ standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
+ }
+ if (device_m.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
+ standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device_m.getDeviceDriver();
+ standardOrdinarySiteDeviceDriver.setOption(Integer.parseInt(option));
}
}
}
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index d3bc6f0..e2ede5e 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -641,7 +641,6 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
if (ObjectUtil.isEmpty(route) && !(start_device_code.equals(next_device_code))) {
throw new BadRequestException(LangProcess.msg("error_isNull", "route"));
}
-
//判断是否是仙工AGV
if (shortPathsList.size() > 0 && StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE)) {
Device deviceByCode = deviceAppService.findDeviceByCode(dto.getStart_device_code());
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java
index 6047b6c..f036ed8 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java
@@ -1,6 +1,7 @@
package org.nl.hand.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
@@ -372,24 +373,26 @@ public class HandServiceImpl implements HandService {
throw new BadRequestException(LangProcess.msg("error_no_ins"));
}
JSONArray data = new JSONArray();
- for (int i = 0; i < list.size(); i++) {
- Device deviceCodeStart = deviceAppService.findDeviceByCode(list.get(i).getStart_device_code());
- Device deviceCodeEnd = deviceAppService.findDeviceByCode(list.get(i).getNext_device_code());
+ if (CollUtil.isNotEmpty(list)) {
+ for (int i = 0; i < list.size(); i++) {
+ Device deviceCodeStart = deviceAppService.findDeviceByCode(list.get(i).getStart_device_code());
+ Device deviceCodeEnd = deviceAppService.findDeviceByCode(list.get(i).getNext_device_code());
- JSONObject task = new JSONObject();
- task.put("task_uuid",list.get(i).getTask_id());
- task.put("task_no",list.get(i).getTask_code());
- task.put("start_devicecode",list.get(i).getStart_device_code());
- task.put("start_en_devicecode",deviceCodeStart.getEn_device_name());
- task.put("start_ko_devicecode",deviceCodeStart.getKo_device_name());
- task.put("next_devicecode",list.get(i).getNext_device_code());
- task.put("next_en_devicecode",deviceCodeEnd.getEn_device_name());
- task.put("next_ko_devicecode",deviceCodeEnd.getKo_device_name());
- task.put("task_status",list.get(i).getTask_status());
- task.put("priority",list.get(i).getPriority());
- task.put("create_time",list.get(i).getCreate_time());
- task.put("carrier",list.get(i).getVehicle_code());
- data.add(task);
+ JSONObject task = new JSONObject();
+ task.put("task_uuid", list.get(i).getTask_id());
+ task.put("task_no", list.get(i).getTask_code());
+ task.put("start_devicecode", list.get(i).getStart_device_code());
+ task.put("start_en_devicecode", deviceCodeStart.getEn_device_name());
+ task.put("start_ko_devicecode", deviceCodeStart.getKo_device_name());
+ task.put("next_devicecode", list.get(i).getNext_device_code());
+ task.put("next_en_devicecode", deviceCodeEnd.getEn_device_name());
+ task.put("next_ko_devicecode", deviceCodeEnd.getKo_device_name());
+ task.put("task_status", list.get(i).getTask_status());
+ task.put("priority", list.get(i).getPriority());
+ task.put("create_time", list.get(i).getCreate_time());
+ task.put("carrier", list.get(i).getVehicle_code());
+ data.add(task);
+ }
}
JSONObject resultJson = new JSONObject();
resultJson.put("message", LangProcess.msg("universal_directives_message1"));
diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
index fe9c79e..c6fb979 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
+++ b/acs2/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
@@ -10,7 +10,7 @@ spring:
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:stand_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
- url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:lzhl_two_acs2}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+ url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hanguodoushan}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: ${DB_USER:root}
# password: ${DB_PWD:Root.123456}
diff --git a/acs2/nladmin-ui/src/i18n/index.js b/acs2/nladmin-ui/src/i18n/index.js
index 22a7fe8..fe591ba 100644
--- a/acs2/nladmin-ui/src/i18n/index.js
+++ b/acs2/nladmin-ui/src/i18n/index.js
@@ -4,6 +4,7 @@ import locale from 'element-ui/lib/locale'
import zh from './langs/chinese'
import en from './langs/english'
import indonesian from './langs/indonesian'
+import Korean from './langs/Korean'
Vue.use(VueI18n)
const messages = {
en: {
@@ -14,6 +15,9 @@ const messages = {
},
in: {
...indonesian
+ },
+ ko: {
+ ...Korean
}
}
const i18n = new VueI18n({
diff --git a/acs2/nladmin-ui/src/i18n/langs/Korean.js b/acs2/nladmin-ui/src/i18n/langs/Korean.js
new file mode 100644
index 0000000..ebb0274
--- /dev/null
+++ b/acs2/nladmin-ui/src/i18n/langs/Korean.js
@@ -0,0 +1,56 @@
+import koLocale from 'element-ui/lib/locale/lang/ko'
+import ko from './ko'
+import menu from './menu/zh'
+import param from './param/zh'
+import instruction from './instruction/zh'
+import task from './task/ko'
+import history from './history/zh'
+import device from './device/zh'
+import opc from './opc/zh'
+import protocol from './protocol/zh'
+import address from './address/zh'
+import storageCell from './storageCell/zh'
+import route from './route/zh'
+import auto from './auto/zh'
+import customPolicy from './customPolicy/zh'
+import monitor from './monitor/zh'
+import timing from './timing/zh'
+import config from './config/zh'
+import user from './user/zh'
+import deviceErrorInfo from './deviceErrorInfo/zh'
+import role from './role/zh'
+import department from './department/zh'
+import dict from './dict/zh'
+import angle from './angle/zh'
+import regional from './regional/zh'
+import stage from './stage/zh'
+
+export default {
+ ...koLocale,
+ ...ko,
+ ...menu,
+ ...param,
+ ...device,
+ ...opc,
+ ...protocol,
+ ...address,
+ ...storageCell,
+ ...route,
+ ...instruction,
+ ...task,
+ ...history,
+ ...auto,
+ ...customPolicy,
+ ...monitor,
+ ...timing,
+ ...config,
+ ...deviceErrorInfo,
+ ...user,
+ ...role,
+ ...department,
+ ...dict,
+ ...angle,
+ ...regional,
+ ...stage
+}
+
diff --git a/acs2/nladmin-ui/src/i18n/langs/ko.js b/acs2/nladmin-ui/src/i18n/langs/ko.js
new file mode 100644
index 0000000..4304d5c
--- /dev/null
+++ b/acs2/nladmin-ui/src/i18n/langs/ko.js
@@ -0,0 +1,120 @@
+export default {
+ 'lang': 'Korean',
+ 'auto': {
+ 'common': {
+ 'home': 'Dashboard',
+ 'Layout_setting': 'Layout Setting',
+ 'Personal_center': 'Personal Center',
+ 'Log_out': 'Log Out',
+ 'Personal_information': 'Personal Information',
+ 'username': 'UserName',
+ 'name': 'Name',
+ 'phone': 'Phone Number',
+ 'phone2': 'Phone',
+ 'sex': 'Sex',
+ 'sex_male': 'Male',
+ 'sex_female': 'Female',
+ 'email': 'E-mail',
+ 'Security_settings': 'Security Settings',
+ 'Save_settings': 'Save Settings',
+ 'Reset_settings': 'Reset Settings',
+ 'Change_password': 'Change Password',
+ 'New_password': 'New Password',
+ 'Old_password': 'Old Password',
+ 'Verify_password': 'Verify Password',
+ 'User_information': 'User Information',
+ 'Operation_log': 'Operation Log',
+ 'action': 'Action',
+ 'IP_source': 'IP Source',
+ 'Browser': 'Browser',
+ 'Request_time': 'Request Time',
+ 'Creation_date': 'Creation Date',
+ 'account': 'Account',
+ 'password': 'Password',
+ 'verification_code': 'Code',
+ 'login_rm': 'Remember Me',
+ 'login': 'Login',
+ 'login_ing': 'Logging In...',
+ 'Create': '신규 증가',
+ 'Update': '수정',
+ 'Delete': '삭제',
+ 'Export': '내보 내기',
+ 'Editors': 'Editor',
+ 'SelectAll': 'SelectAll',
+ 'Query': '조회',
+ 'Reset': 'Reset',
+ 'Confirm': 'Confirm',
+ 'Cancel': 'Cancel',
+ 'Forced_cancellation': 'Forced_cancellation',
+ 'Initialize': 'Initialize',
+ 'Operate': 'Operate',
+ 'Refresh': 'Refresh',
+ 'Closes': 'Close',
+ 'Closes_l': 'Close Left',
+ 'Closes_r': 'Close Right',
+ 'Closes_o': 'Close Other',
+ 'Closes_a': 'Close All',
+ 'Theme_style_setting': 'Theme Style Setting',
+ 'Theme_color': 'Theme Color',
+ 'System_layout_configuration': 'System Layout Configuration',
+ 'Open': 'Open',
+ 'Fixation': 'Fixation',
+ 'Display': 'Display',
+ 'Dynamic_titles': 'Dynamic Titles',
+ 'crudTip': 'Are you sure to delete this data?',
+ 'startDate': 'StartDate',
+ 'endDate': 'EndDate',
+ 'moreMenu': 'MoreMenu',
+ 'browses': 'Browse',
+ 'fz': 'Full Screen Zoom',
+ 'Tips': 'Tips',
+ 'Tip1': 'Confirm deletion of selected',
+ 'Tip2': 'Data?',
+ 'Tip3': 'User name not used as login',
+ 'Tip4': 'Mobile phone number cannot be duplicate',
+ 'Tip5': 'Please enter a phone number',
+ 'Tip6': 'Please enter the correct 11 digit phone number',
+ 'Tip7': 'Drag and drop the excel file here or',
+ 'Tip8': 'The two passwords are different',
+ 'Tip9': 'Please enter your password again',
+ 'Tip10': 'Please enter your old password',
+ 'Tip11': 'Please enter your new password',
+ 'Tip12': '6 to 20 characters in length',
+ 'Tip13': 'Are you sure to log out and exit the system?',
+ 'Tip14': 'WebSocket connection error',
+ 'Tip15': 'Please enter an icon name',
+ 'loading': 'Loading...',
+ 'synchronous': '동기화',
+ 'determine': 'Determine',
+ 'stop': 'Stop',
+ 'firing': 'Firing',
+ 'import': 'Import',
+ 'driver_configuration': 'Driver Configuration',
+ 'create_time': 'Create Time',
+ 'update_time': 'Update Time',
+ 'create_by': 'Create People',
+ 'update_by': 'Update People',
+ 'is_on': 'Enable Or Not',
+ 'please': 'Please Select',
+ 'true': 'True',
+ 'false': 'False',
+ 'Running': 'Running',
+ 'Paused': 'Paused'
+ },
+ 'monitor': {
+ 'sys': 'System',
+ 'day': 'Running Day',
+ 'status': 'Status',
+ 'core': 'Core',
+ 'cpu': 'CPU Utilization',
+ 'memory': 'Memory Utilization',
+ 'tality': 'Tality',
+ 'used': 'Used',
+ 'leisure': 'Leisure',
+ 'exchange': 'Exchange Utilization',
+ 'disk': 'Disk Utilization',
+ 'cpu_monitoring': 'Cpu Utilization Monitoring',
+ 'memory_monitoring': 'Memory Utilization Monitoring'
+ }
+ }
+}
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/en.js b/acs2/nladmin-ui/src/i18n/langs/task/en.js
index 2a76c04..07dcf90 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/en.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/en.js
@@ -50,7 +50,10 @@ export default {
'Remark': 'Remark',
'Creator': 'Creator',
'Create_time': 'Creation Time',
+ 'update_time': 'Update Time',
+ 'update_by': 'Update People',
'Operation': 'Operation',
+ 'More': 'More',
'Create_command': 'Create Command',
'Reset': 'Reset',
'Void': 'Void',
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/ko.js b/acs2/nladmin-ui/src/i18n/langs/task/ko.js
new file mode 100644
index 0000000..81c1e62
--- /dev/null
+++ b/acs2/nladmin-ui/src/i18n/langs/task/ko.js
@@ -0,0 +1,94 @@
+export default {
+ 'task': {
+ 'txt_box': {
+ 'Enter_task_number': '작업 번호 입력',
+ 'Vehicle_registration_number': '운송번호를 입력하다',
+ 'Material_type': '재료 타입',
+ 'Task_status': '작업 상태',
+ 'Origin_or_destination': '시작점 혹은 끝점을 입력하다',
+ 'Task_type': '작업 형식2',
+ 'Action_type': 'Action Type',
+ 'ORDINARY': 'Ordinary task',
+ 'IN_STOCK': 'Pick up secondary distribution',
+ 'OUT_STOCK': 'Release cargo secondary distribution',
+ 'IN_OUT_STOCK': 'Pick and release cargo secondary distribution',
+ 'Warehouse_task_type': 'Warehouse Task Type',
+ 'AGV_system': 'agv 시스템',
+ 'Routing_scheme': 'Routing Scheme',
+ 'agv_action_type': 'agv 2차 분배 유형',
+ 'Priority': '우선 순위',
+ 'Vehicle_number': '화물운송번호',
+ 'Task_code': '임무 번호',
+ 'Task': 'Task',
+ 'start_or_end': '출발점 혹은 종점',
+ 'time': 'Time',
+ 'empty_shaft_position': 'Empty shaft position',
+ 'extension_field': 'Extension Field'
+ },
+ 'select': {
+ 'automated_warehouse_task_type': 'Automated Warehouse Task Type',
+ 'Placeholder': 'Select',
+ 'Start_point': '기점',
+ 'Start_point2': 'Start Point 2',
+ 'Starting_column': 'Starting Column',
+ 'Starting_layer': 'Starting Layer',
+ 'Destination': '종점',
+ 'Destination2': 'Destination 2',
+ 'Interaction_json': 'Interaction Fields',
+ 'Ending_column': 'Ending Column',
+ 'Ending_layer': 'Ending Layer',
+ 'Description': 'Description',
+ 'Cancel': '취소',
+ 'Confirm': '제출',
+ 'Ready': 'Ready',
+ 'In_progress': 'In Progress',
+ 'Completed': '완료',
+ 'Forced_Completed': '강제로 완료하다',
+ 'Cancel_Tasks_And_Commands': '작업과 명령 취소',
+ 'Pickup_point': '픽업 포인트',
+ 'Delivery_point': '화물 적치점',
+ 'Remark': 'Remark',
+ 'Creator': '창립자',
+ 'Create_time': '만든 시간',
+ 'update_time': '업데이트 시간',
+ 'update_by': '업데이트맨',
+ 'Operation': '조작',
+ 'More': '더 많은',
+ 'Create_command': '생성 명령',
+ 'Reset': 'Reset',
+ 'Void': 'Void',
+ 'Starting_point': 'Starting Point',
+ 'Target_point': 'Target Point',
+ 'Is_it_completed': 'Is It Completed',
+ 'error_code': 'Error Code',
+ 'start_time': 'Start Time',
+ 'finish_time': 'Completion Time',
+ 'create_type': 'Create Type',
+ 'finish_type': 'Completion Type',
+ 'retry_times': 'Retry Count',
+ 'please_enter_origin-column': 'Please Enter Origin Column!',
+ 'please_enter_origin_level': 'Please Enter Origin Level!',
+ 'please_select_destination_column': 'Please Select Destination Column!',
+ 'please_select_destination_level': 'Please Select The Destination Floor!'
+ },
+ screen: {
+ 'title': 'Lanzhou Hailiang Equipment Management Task Kanban',
+ 'task_screen': 'Task Kanban',
+ 'device': 'Current Device',
+ 'Wednesday': 'Wednesday',
+ 'year': 'Year',
+ 'month': 'Month',
+ 'day': 'Day',
+ 'task_code': 'Task Code',
+ 'inst_code': 'Inst Code',
+ 'start': 'Start',
+ 'end': 'End',
+ 'material': 'Material',
+ 'material_num': 'Material Num',
+ 'vehicle_code': 'Vehicle Code',
+ 'bar': 'Bar',
+ 'create_time': 'Create Time',
+ 'IP': 'IP'
+ }
+ }
+}
diff --git a/acs2/nladmin-ui/src/i18n/langs/task/zh.js b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
index 2c537da..860462a 100644
--- a/acs2/nladmin-ui/src/i18n/langs/task/zh.js
+++ b/acs2/nladmin-ui/src/i18n/langs/task/zh.js
@@ -50,7 +50,10 @@ export default {
'Remark': '备注',
'Creator': '创建者',
'Create_time': '创建时间',
+ 'update_time': '更新时间',
+ 'update_by': '更新者',
'Operation': '操作',
+ 'More': '更多',
'Create_command': '创建指令',
'Reset': '重置',
'Void': '作废',
diff --git a/acs2/nladmin-ui/src/layout/components/Navbar.vue b/acs2/nladmin-ui/src/layout/components/Navbar.vue
index 43d8e6e..3eeb596 100644
--- a/acs2/nladmin-ui/src/layout/components/Navbar.vue
+++ b/acs2/nladmin-ui/src/layout/components/Navbar.vue
@@ -54,6 +54,7 @@
<el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
<el-dropdown-item divided command="en">English</el-dropdown-item>
<el-dropdown-item divided command="in">Indonesian</el-dropdown-item>
+ <el-dropdown-item divided command="ko">Korean</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -132,6 +133,8 @@ export default {
this.language = '简体中文'
} else if (command === 'in') {
this.language = 'Indonesian'
+ } else if (command === 'ko') {
+ this.language = 'Korean'
}
},
toggleSideBar() {
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 355071d..ea7501d 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -187,23 +187,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item :label="$t('task.txt_box.Routing_scheme')">
- <el-select
- v-model="form.route_plan_code"
- style="width: 370px;"
- filterable
- :placeholder="$t('task.select.Placeholder')"
- default-first-option
- @change="isDisabled=false"
- >
- <el-option
- v-for="item in routeList"
- :key="item.plan_code"
- :label="item.plan_name"
- :value="item.plan_code"
- />
- </el-select>
- </el-form-item>
+
<el-form-item :label="$t('task.txt_box.agv_action_type')">
<el-select
v-model="form.agv_action_type"
@@ -320,28 +304,11 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="行架任务类型">
- <el-input v-model="form.truss_type" style="width: 370px;" @change="isDisabled=false"/>
- </el-form-item>
+
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple-light"/>
- <el-form-item :label="$t('task.select.Start_point2')" prop="start_point_code2">
- <el-select
- v-model="form.start_point_code2"
- style="width: 370px;"
- filterable
- clearable
- :placeholder="$t('task.select.Placeholder')"
- >
- <el-option
- v-for="item in deviceList"
- :key="item.device_code"
- :label="item.device_code"
- :value="item.device_code"
- />
- </el-select>
- </el-form-item>
+
<el-form-item v-show="start_flag" :label="$t('task.select.Starting_column')" prop="from_y2">
<el-select
v-model="form.from_y2"
@@ -374,22 +341,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item :label="$t('task.select.Destination2')" prop="next_point_code2">
- <el-select
- v-model="form.next_point_code2"
- style="width: 370px;"
- filterable
- clearable
- :placeholder="$t('task.select.Placeholder')"
- >
- <el-option
- v-for="item in deviceList"
- :key="item.device_code"
- :label="item.device_code"
- :value="item.device_code"
- />
- </el-select>
- </el-form-item>
+
<el-form-item v-show="end_flag" :label="$t('task.select.Ending_column')" prop="to_y2">
<el-select
v-model="form.to_y2"
@@ -429,30 +381,8 @@
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false"/>
</el-form-item>
- <el-form-item :label="$t('task.txt_box.empty_shaft_position')">
- <el-select
- v-model="form.empty_site"
- style="width: 370px;"
- filterable
- clearable
- :placeholder="$t('task.txt_box.empty_shaft_position')"
- >
- <el-option
- v-for="item in dict.empty_shaft_position"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item :label="$t('task.txt_box.extension_field')">
- <div>
- <el-button @click="openDialog">{{ $t('task.select.Placeholder') }}</el-button>
- </div>
- </el-form-item>
- <el-form-item :label="$t('task.select.Description')" prop="description">
- <el-input v-model="form.remark" style="width: 370px;" type="textarea" @change="isDisabled=false"/>
- </el-form-item>
+
+
</el-col>
</el-row>
</el-form>
@@ -528,20 +458,11 @@
/>
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
- <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
+ <span v-if="scope.row.class_type!=null && scope.row.class_type.length===2"
+ >{{ dict.label.task_type[scope.row.class_type] }}</span>
<span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
</template>
</el-table-column>
- <el-table-column prop="agv_action_type" :label="$t('task.txt_box.Action_type')"
- :min-width="flexWidth('agv_action_type',crud.data,$t('task.txt_box.Action_type'))"
- >
- <template slot-scope="scope">
- <span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
- <span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
- <span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
- <span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
- </template>
- </el-table-column>
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')"
:min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))"
@@ -562,15 +483,6 @@
<el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')"
:min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))"
/>
- <el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')"
- :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))"
- />
- <el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')"
- :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))"
- />
- <el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')"
- show-overflow-tooltip="true" width="150px"
- />
<el-table-column prop="agv_system_type" :label="$t('task.txt_box.AGV_system')" show-overflow-tooltip="true"
width="150px"
>
@@ -578,26 +490,36 @@
{{ getAgvSystemLabel(scope.row.agv_system_type) }}
</template>
</el-table-column>
- <el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
- <el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
- <el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
- <el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
- <el-table-column prop="update_by" :label="$t('Inst.table.update_by')" :min-width="flexWidth('update_by',crud.data,$t('Inst.table.update_by'))" />
- <el-table-column prop="update_time" :label="$t('Inst.table.update_time')" :min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))" />
- <el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="150px" align="center" fixed="right">
+
+
+ <el-table-column prop="create_by" :label="$t('task.select.Creator')"
+ :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))"
+ />
+ <el-table-column prop="create_time" :label="$t('task.select.Create_time')"
+ :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))"
+ />
+ <el-table-column prop="update_by" :label="$t('task.select.update_by')"
+ :min-width="flexWidth('update_by',crud.data,$t('task.select.update_by'))"
+ />
+ <el-table-column prop="update_time" :label="$t('task.select.update_time')"
+ :min-width="flexWidth('update_time',crud.data,$t('task.select.update_time'))"
+ />
+ <el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')"
+ width="150px" align="center" fixed="right"
+ >
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-finished"
@click="handleCommand(scope.$index, scope.row,'a')"
>
- {{ $t('Inst.table.Finish') }}
+ {{ $t('task.select.Completed') }}
</el-button>
<el-dropdown size="mini">
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('user.other.More') }}</el-button>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('task.select.More') }}</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-circle-close"><span @click="handleCommand(scope.$index, scope.row,'b')">
- {{ $t('auto.common.Cancel') }}</span>
+ {{ $t('task.select.Cancel') }}</span>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-folder-add"><span @click="handleCommand(scope.$index, scope.row,'c')">
{{ $t('task.select.Create_command') }}</span>