diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-24.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-24.0.log new file mode 100644 index 0000000..e69de29 diff --git a/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-28.0.log b/acs/nladmin-system/logPath_IS_UNDEFINED/XgAgvDeviceDriver/DEVICECODE_IS_UNDEFINED/2023-11-28.0.log new file mode 100644 index 0000000..e69de29 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java index 82cd672..a5bf1fd 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_stacker/StandardStackerDeviceDriver.java @@ -34,6 +34,7 @@ import org.nl.config.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; +import java.util.regex.Pattern; /** * 单工位堆垛机驱动 @@ -439,8 +440,10 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme } } if (StrUtil.equals(nextDevice.getDevice_type(), DeviceType.storage.name())) { + String pattern = "\\d+"; + Pattern compile = Pattern.compile(pattern); map.put("to_y", inst.getTo_z()); - if (inst.getTo_x().length() > 1) { + if (inst.getTo_x().length() > 1 && !compile.matcher(inst.getTo_x()).matches()) { String substring = inst.getTo_x().substring(1); map.put("to_z", substring); } else { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 657b326..2f045f6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -658,7 +658,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme .getShortPathLines(dto.getStart_device_code(), dto.getNext_device_code(), plan_code) .size() == 0) { - throw new Exception(dto.getStart_point_code() + "->" + dto.getNext_point_code() + "路由不通!"); + throw new BadRequestException( dto.getStart_point_code() + "->" + dto.getNext_point_code() + " " +LangProcess.msg("route_isNull")); } String createTaskCheck = paramService.findByCode(AcsConfig.CREATETASKCHECK).getValue(); DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml b/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml index 160cec6..432c034 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml @@ -9,10 +9,10 @@ spring: db-type: com.alibaba.druid.pool.DruidDataSource 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:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_two_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 username: ${DB_USER:root} # password: ${DB_PWD:Root.123456} - password: ${DB_PWD:root} + password: ${DB_PWD:p@ssw0rd} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/acs/nladmin-ui/src/i18n/langs/chinese.js b/acs/nladmin-ui/src/i18n/langs/chinese.js index e320995..8aa2aad 100644 --- a/acs/nladmin-ui/src/i18n/langs/chinese.js +++ b/acs/nladmin-ui/src/i18n/langs/chinese.js @@ -3,11 +3,13 @@ import zh from './zh-CN' import menu from './menu/zh' import param from './param/zh' import instruction from './instruction/zh' +import task from './task/zh' export default { ...zhLocale, ...zh, ...menu, ...param, - ...instruction + ...instruction, + ...task } diff --git a/acs/nladmin-ui/src/i18n/langs/en.js b/acs/nladmin-ui/src/i18n/langs/en.js index 3f67778..d8a71e4 100644 --- a/acs/nladmin-ui/src/i18n/langs/en.js +++ b/acs/nladmin-ui/src/i18n/langs/en.js @@ -37,6 +37,7 @@ export default { 'Create': 'Create', 'Update': 'Update', 'Delete': 'Delete', + 'Synchronize': 'Synchronize', 'Export': 'Export', 'Editors': 'Editor', 'SelectAll': 'SelectAll', diff --git a/acs/nladmin-ui/src/i18n/langs/english.js b/acs/nladmin-ui/src/i18n/langs/english.js index c207aef..298e757 100644 --- a/acs/nladmin-ui/src/i18n/langs/english.js +++ b/acs/nladmin-ui/src/i18n/langs/english.js @@ -3,11 +3,13 @@ import en from './en' import menu from './menu/en' import param from './param/en' import instruction from './instruction/en' +import task from './task/en' export default { ...enLocale, ...en, ...menu, ...param, - ...instruction + ...instruction, + ...task } diff --git a/acs/nladmin-ui/src/i18n/langs/in.js b/acs/nladmin-ui/src/i18n/langs/in.js index ee9383a..e63fab5 100644 --- a/acs/nladmin-ui/src/i18n/langs/in.js +++ b/acs/nladmin-ui/src/i18n/langs/in.js @@ -37,6 +37,7 @@ export default { 'Create': 'Buat', 'Update': 'Kemaskini', 'Delete': 'Hapus', + 'Synchronize': 'Sinkronisasi', 'Export': 'Ekspor', 'Editors': 'Editor', 'SelectAll': 'Pilih Semua', diff --git a/acs/nladmin-ui/src/i18n/langs/indonesian.js b/acs/nladmin-ui/src/i18n/langs/indonesian.js index c621a3a..454fbfd 100644 --- a/acs/nladmin-ui/src/i18n/langs/indonesian.js +++ b/acs/nladmin-ui/src/i18n/langs/indonesian.js @@ -3,11 +3,13 @@ import id from './in' import menu from './menu/in' import param from './param/in' import instruction from './instruction/in' +import task from './task/in' export default { ...idLocale, ...id, ...menu, ...param, - ...instruction + ...instruction, + ...task } diff --git a/acs/nladmin-ui/src/i18n/langs/task/en.js b/acs/nladmin-ui/src/i18n/langs/task/en.js new file mode 100644 index 0000000..1702cf5 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/task/en.js @@ -0,0 +1,41 @@ +export default { + 'task': { + 'txt_box': { + 'Enter_task_number': 'Enter task number', + 'Vehicle_registration_number': 'Vehicle registration number', + 'Material_type': 'Material type', + 'Task_status': 'Task status', + 'Origin_or_destination': 'Origin or destination', + 'Task_type': 'Task type', + 'Warehouse_task_type': 'Warehouse task type', + 'AGV_system': 'AGV system', + 'Routing_scheme': 'Routing scheme', + 'Priority': 'Priority', + 'Vehicle_number': 'Vehicle number', + 'Task_code': 'Task_code', + 'Task': 'Task' + }, + 'select': { + 'Placeholder': 'Select', + 'Start_point': 'Start point', + 'Starting_column': 'Starting column', + 'Starting_layer': 'Starting layer', + 'Destination': 'Destination', + 'Ending_column': 'Ending column', + 'Ending_layer': 'Ending layer', + 'Description': 'Description', + 'Cancel': 'Cancel', + 'Confirm': 'Confirm', + 'Ready': 'Ready', + 'In_progress': 'In progress', + 'Completed': 'Completed', + 'Pickup_point': 'Pickup point', + 'Delivery_point': 'Delivery point', + 'Remark': 'Remark', + 'Creator': 'Creator', + 'Create_time': 'Creation time', + 'Operation': 'Operation', + 'Create_command': 'Create command' + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/task/in.js b/acs/nladmin-ui/src/i18n/langs/task/in.js new file mode 100644 index 0000000..2878e0b --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/task/in.js @@ -0,0 +1,41 @@ +export default { + 'task': { + 'txt_box': { + 'Enter_task_number': 'Masukkan nomor tugas', + 'Vehicle_registration_number': 'Nomor Registrasi Kendaraan', + 'Material_type': 'Tipe material', + 'Task_status': 'Status tugas', + 'Origin_or_destination': 'Asal atau tujuan', + 'Task_type': 'Jenis tugas', + 'Warehouse_task_type': 'Jenis tugas gudang', + 'AGV_system': 'Sistem AGV', + 'Routing_scheme': 'Skema routing', + 'Priority': 'Prioritas', + 'Vehicle_number': 'Nomor kendaraan', + 'Task_code': 'Nomor tugas', + 'Task': 'Tugas' + }, + 'select': { + 'Placeholder': 'Pilih', + 'Start_point': 'Titik awal', + 'Starting_column': 'Kolom awal', + 'Starting_layer': 'Lapisan awal', + 'Destination': 'Tujuan', + 'Ending_column': 'Kolom akhir', + 'Ending_layer': 'Lapisan akhir', + 'Description': 'Deskripsi', + 'Cancel': 'Batalkan', + 'Confirm': 'Konfirmasi', + 'Ready': 'Siap', + 'In_progress': 'Sedang berlangsung', + 'Completed': 'Selesai', + 'Pickup_point': 'Titik pengambilan', + 'Delivery_point': 'Titik pengiriman', + 'Remark': 'Catatan', + 'Creator': 'Pencipta', + 'Create_time': 'Waktu penciptaan', + 'Operation': 'Operasi', + 'Create_command': 'Perintah membuat' + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/task/zh.js b/acs/nladmin-ui/src/i18n/langs/task/zh.js new file mode 100644 index 0000000..5a0f247 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/task/zh.js @@ -0,0 +1,41 @@ +export default { + 'task': { + 'txt_box': { + 'Enter_task_number': '输入任务号', + 'Vehicle_registration_number': '输入载具号', + 'Material_type': '物料类型', + 'Task_status': '任务状态', + 'Origin_or_destination': '输入起点或终点', + 'Task_type': '任务类型', + 'Warehouse_task_type': '立库任务类型', + 'AGV_system': 'agv系统', + 'Routing_scheme': '路由方案', + 'Priority': '优先级', + 'Vehicle_number': '载具号', + 'Task_code': '任务号', + 'Task': '任务' + }, + 'select': { + 'Placeholder': '请选择', + 'Start_point': '起点', + 'Starting_column': '起点-列', + 'Starting_layer': '起点-层', + 'Destination': '终点', + 'Ending_column': '终点-列', + 'Ending_layer': '终点-层', + 'Description': '描述信息', + 'Cancel': '取消', + 'Confirm': '确认', + 'Ready': '就绪', + 'In_progress': '执行中', + 'Completed': '完成', + 'Pickup_point': '取货点', + 'Delivery_point': '放货点', + 'Remark': '备注', + 'Creator': '创建者', + 'Create_time': '创建时间', + 'Operation': '操作', + 'Create_command': '创建指令' + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/zh-CN.js b/acs/nladmin-ui/src/i18n/langs/zh-CN.js index c1564b5..7b0a00d 100644 --- a/acs/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/acs/nladmin-ui/src/i18n/langs/zh-CN.js @@ -37,6 +37,7 @@ export default { 'Create': '新增', 'Update': '修改', 'Delete': '删除', + 'Synchronize': '同步', 'Export': '导出', 'Editors': '编辑', 'SelectAll': '全选', diff --git a/acs/nladmin-ui/src/views/acs/device/config.vue b/acs/nladmin-ui/src/views/acs/device/config.vue index ce9c7a6..17dc19e 100644 --- a/acs/nladmin-ui/src/views/acs/device/config.vue +++ b/acs/nladmin-ui/src/views/acs/device/config.vue @@ -88,12 +88,19 @@ import standard_stacker from '@/views/acs/device/driver/standard_stacker' import siemens_conveyor_labeling from '@/views/acs/device/driver/siemens_conveyor_labeling' import siemens_conveyor from '@/views/acs/device/driver/siemens_conveyor' import belt_conveyor from '@/views/acs/device/driver/belt_conveyor' +import lamp_three_color from '@/views/acs/device/driver/lamp_three_color' +import box_palletizing_manipulator from '@/views/acs/device/driver/box_palletizing_manipulator' +import hongxiang_conveyor from '@/views/acs/device/driver/hongxiang_conveyor' +import hongxiang_device from '@/views/acs/device/driver/hongxiang_device' +import oven_manipulator from '@/views/acs/device/driver/oven_manipulator' +import plug_pull_device_site from '@/views/acs/device/driver/plug_pull_device_site' +import slit_two_manipulator from '@/views/acs/device/driver/slit_two_manipulator' // import empty_vehicle_stacking_position from '@/views/acs/device/driver/empty_vehicle_stacking_position' import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one' import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two' import xg_agv from '@/views/acs/device/driver/agv/xg_agv' import led_screen from './driver/led_screen' -// import standard_station from '@/views/acs/device/driver/standard_station' +import standard_station from '@/views/acs/device/driver/standard_station' export default { name: 'DeviceConfig', @@ -117,8 +124,16 @@ export default { siemens_conveyor_labeling, siemens_conveyor, belt_conveyor, - double_station_stacker - // standard_station + double_station_stacker, + lamp_three_color, + box_palletizing_manipulator, + hongxiang_conveyor, + hongxiang_device, + standard_station, + oven_manipulator, + plug_pull_device_site, + slit_two_manipulator + }, dicts: ['device_type'], mixins: [crud], diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue index 523dfea..daecbac 100644 --- a/acs/nladmin-ui/src/views/acs/task/index.vue +++ b/acs/nladmin-ui/src/views/acs/task/index.vue @@ -8,7 +8,7 @@ v-model="query.task_code" size="small" clearable - placeholder="输入任务号" + :placeholder="$t('task.txt_box.Enter_task_number')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -17,8 +17,8 @@ v-model="query.vehicle_code" size="small" clearable - placeholder="输入载具号" - style="width: 200px;" + :placeholder="$t('task.txt_box.Vehicle_registration_number')" + style="width: 225px;" class="filter-item" @keyup.enter.native="crud.toQuery" /> @@ -27,7 +27,7 @@ clearable filterable size="small" - placeholder="物料类型" + :placeholder="$t('task.txt_box.Material_type')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -39,7 +39,7 @@ clearable filterable size="small" - placeholder="任务状态" + :placeholder="$t('task.txt_box.Task_status')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -50,7 +50,7 @@ v-model="query.point_code" size="small" clearable - placeholder="输入起点或终点" + :placeholder="$t('task.txt_box.Origin_or_destination')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -60,7 +60,7 @@ clearable filterable size="small" - placeholder="任务类型" + :placeholder="$t('task.txt_box.Task_type')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -78,7 +78,7 @@ icon="el-icon-plus" @click="formDia=true" > - 新增 + {{ $t('common.Create') }} - 同步 + {{ $t('common.Synchronize') }} - + - + - + - + - + - + @@ -179,12 +179,12 @@ /> - + - + - + - + - + - + --> - + - + - + - - + + - - + + - - + + - + @@ -355,19 +355,19 @@ - - - - + + + +