diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java index 3a5609c..98fc27e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/second_floor_area/CallEmpReelTask.java @@ -63,7 +63,7 @@ public class CallEmpReelTask extends AbstractTask { SchBaseTask schBaseTask = taskService.getOne(new LambdaUpdateWrapper() .eq(SchBaseTask::getTask_code, task_code), false); if (schBaseTask == null) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update1")); + throw new BadRequestException("CallEmpReelTask任务更新接口任务号为空"); } // 执行中 if (TaskStatus.EXECUTING.getCode().equals(status.getCode())) { @@ -78,7 +78,7 @@ public class CallEmpReelTask extends AbstractTask { // 取消 if (status.getCode().equals(IOSEnum.IS_NOTANDYES.code("否"))) { if (Integer.parseInt(schBaseTask.getTask_status()) > Integer.parseInt(TaskStatus.ISSUE.getCode())) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_update2")); + throw new BadRequestException("CallEmpReelTask任务已执行不能取消"); } // 更新任务表删除字段 schBaseTask.setIs_delete(true); @@ -90,22 +90,22 @@ public class CallEmpReelTask extends AbstractTask { @Override public void createCompletion(SchBaseTask task) { - Assert.notNull(task, LangProcess.msg("CallEmpReelTask_createTaskTip1")); + Assert.notNull(task, "请求参数不能为空"); String taskType = task.getTask_type(); if (StrUtil.isBlank(taskType)) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip2")); + throw new BadRequestException("业务类型不能为空"); } String vehicleCode = task.getVehicle_code(); if (StrUtil.isBlank(vehicleCode)) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip3")); + throw new BadRequestException("载具号不能为空"); } String pointCode1 = task.getPoint_code1(); if (StrUtil.isBlank(pointCode1)) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip4")); + throw new BadRequestException("起点不能为空"); } String pointCode2 = task.getPoint_code2(); if (StrUtil.isBlank(pointCode2)) { - throw new BadRequestException(LangProcess.msg("CallEmpReelTask_createTaskTip5")); + throw new BadRequestException("下一点不能为空"); } //是否立即下发 boolean isSend = !StrUtil.isNotBlank(task.getIs_send()) || BooleanUtil.toBoolean(task.getIs_send()); diff --git a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue index 0f029f5..c7d6281 100644 --- a/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue +++ b/lms/nladmin-ui/src/components/Crud/CRUD.operation.vue @@ -190,7 +190,7 @@ export default { this.tableColumns = columns }, toDelete(datas) { - this.$confirm(this.$t('common.Tip1') + ` ${datas.length} ` + this.$t('common.Tip2'), this.$t('common.Tips'), { + this.$confirm(this.$t('common.Tip1', { count: datas.length }), this.$t('common.Tips'), { confirmButtonText: this.$t('common.Confirm'), cancelButtonText: this.$t('common.Cancel'), type: 'warning' diff --git a/lms/nladmin-ui/src/i18n/langs/chinese.js b/lms/nladmin-ui/src/i18n/langs/chinese.js index c8226c7..5900693 100644 --- a/lms/nladmin-ui/src/i18n/langs/chinese.js +++ b/lms/nladmin-ui/src/i18n/langs/chinese.js @@ -22,6 +22,10 @@ import taskConfig from './task/config/zh' import task from './task/zh' import point from './point/zh' import region from './region/zh' +import rawfoil from './workorder/rawfoil/zh' +import sbpointivt from './ivt/sbPointIvt/zh' +import coolregion from './ivt/cool/zh' +import hot from './ivt/hot/zh' export default { ...zhLocale, @@ -47,5 +51,9 @@ export default { ...taskConfig, ...task, ...point, - ...region + ...region, + ...rawfoil, + ...sbpointivt, + ...coolregion, + ...hot } diff --git a/lms/nladmin-ui/src/i18n/langs/dept/en.js b/lms/nladmin-ui/src/i18n/langs/dept/en.js index 5952974..2adafd0 100644 --- a/lms/nladmin-ui/src/i18n/langs/dept/en.js +++ b/lms/nladmin-ui/src/i18n/langs/dept/en.js @@ -23,8 +23,7 @@ export default { 'msg': { 'tip1': 'Are you sure to delete it? If there are lower-level nodes, delete them together. This operation cannot be undone!', 'tip2': 'The upper department cannot be empty', - 'tip3.1': 'This operation will', - 'tip3.2': 'department, Do you want to continue?' + 'tip3': 'This operation will {display_name} {name} department, Do you want to continue?' }, 'rules': { 'r1': 'Please enter name', diff --git a/lms/nladmin-ui/src/i18n/langs/dept/in.js b/lms/nladmin-ui/src/i18n/langs/dept/in.js index f26deee..4726647 100644 --- a/lms/nladmin-ui/src/i18n/langs/dept/in.js +++ b/lms/nladmin-ui/src/i18n/langs/dept/in.js @@ -23,8 +23,7 @@ export default { 'msg': { 'tip1': 'Apakah Anda yakin untuk menghapus? Jika ada node bawahan, node tersebut juga akan dihapus. Operasi ini tidak dapat dibatalkan!', 'tip2': 'Departemen induk tidak boleh kosong', - 'tip3.1': 'Operasi ini akan terjadi', - 'tip3.2': 'departemen, Apakah akan melanjutkan?' + 'tip3': 'Operasi ini untuk departemen {display_name} {name}, apakah Anda ingin melanjutkan?' }, 'rules': { 'r1': 'Silakan masukkan nama', diff --git a/lms/nladmin-ui/src/i18n/langs/dept/zh.js b/lms/nladmin-ui/src/i18n/langs/dept/zh.js index 9c59fe6..1dd6fdb 100644 --- a/lms/nladmin-ui/src/i18n/langs/dept/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/dept/zh.js @@ -23,8 +23,7 @@ export default { 'msg': { 'tip1': '确定删除吗,如果存在下级节点则一并删除,此操作不能撤销!', 'tip2': '上级部门不能为空', - 'tip3.1': '此操作将', - 'tip3.2': '部门, 是否继续?' + 'tip3': '此操作将{display_name} {name} 部门, 是否继续?' }, 'rules': { 'r1': '请输入名称', diff --git a/lms/nladmin-ui/src/i18n/langs/en.js b/lms/nladmin-ui/src/i18n/langs/en.js index 6385d3d..334a69f 100644 --- a/lms/nladmin-ui/src/i18n/langs/en.js +++ b/lms/nladmin-ui/src/i18n/langs/en.js @@ -72,8 +72,7 @@ export default { 'browses': 'browse', 'fz': 'Full screen zoom', 'Tips': 'Tips', - 'Tip1': 'Confirm deletion of selected', - 'Tip2': 'Data?', + 'Tip1': 'Confirm to delete the selected {count} pieces of data?', 'Tip3': 'User name not used as login', 'Tip4': 'Mobile phone number cannot be duplicate', 'Tip5': 'Please enter a phone number', @@ -89,7 +88,8 @@ export default { 'Tip15': 'Please enter an icon name', 'Tip16': 'NOT NULL', 'Tip17': 'Please enter what you are searching for', - 'loading': 'loading...' + 'loading': 'loading...', + 'Tip18': 'select date time' }, 'WorkOrder': { 'form': { diff --git a/lms/nladmin-ui/src/i18n/langs/english.js b/lms/nladmin-ui/src/i18n/langs/english.js index d07fa88..2c949a9 100644 --- a/lms/nladmin-ui/src/i18n/langs/english.js +++ b/lms/nladmin-ui/src/i18n/langs/english.js @@ -22,6 +22,10 @@ import taskConfig from './task/config/en' import task from './task/en' import point from './point/en' import region from './region/en' +import rawfoil from './workorder/rawfoil/en' +import sbpointivt from './ivt/sbPointIvt/en' +import coolregion from './ivt/cool/en' +import hot from './ivt/hot/en' export default { ...enLocale, @@ -47,5 +51,9 @@ export default { ...taskConfig, ...task, ...point, - ...region + ...region, + ...rawfoil, + ...sbpointivt, + ...coolregion, + ...hot } diff --git a/lms/nladmin-ui/src/i18n/langs/in.js b/lms/nladmin-ui/src/i18n/langs/in.js index f620b4a..b992373 100644 --- a/lms/nladmin-ui/src/i18n/langs/in.js +++ b/lms/nladmin-ui/src/i18n/langs/in.js @@ -51,7 +51,7 @@ export default { 'Fail': 'gagal', 'Please_select': 'Silakan pilih', 'Operation_success': 'Operasi berhasil', - 'Operate': 'operasi', + 'Operate': 'Operasi', 'Refresh': 'Segar', 'Closes': 'Tutup', 'Closes_l': 'Tutup Sisi Kiri', @@ -72,8 +72,7 @@ export default { 'browses': 'melayar', 'fz': 'Zum layar penuh', 'Tips': 'Prompt', - 'Tip1': 'Konfirmasi Penghapusan Yang Dipilih', - 'Tip2': 'Data?', + 'Tip1': 'Konfirmasikan untuk menghapus {count} data yang dipilih?', 'Tip3': 'Nama pengguna tidak digunakan sebagai daftar masuk', 'Tip4': 'Nomor telepon ponsel tidak dapat duplikasi', 'Tip5': 'Silakan masukkan nomor telepon', @@ -89,7 +88,8 @@ export default { 'Tip15': 'Silakan masukkan nama ikon', 'Tip16': 'TIDAK NULL', 'Tip17': 'Silakan masukkan apa yang Anda cari', - 'loading': 'Memuatkan Data...' + 'loading': 'Memuatkan Data...', + 'Tip18': 'pilih tanggal waktu' }, 'WorkOrder': { 'form': { diff --git a/lms/nladmin-ui/src/i18n/langs/indonesian.js b/lms/nladmin-ui/src/i18n/langs/indonesian.js index 9f44e10..782bd55 100644 --- a/lms/nladmin-ui/src/i18n/langs/indonesian.js +++ b/lms/nladmin-ui/src/i18n/langs/indonesian.js @@ -22,6 +22,10 @@ import taskConfig from './task/config/in' import task from './task/in' import point from './point/in' import region from './region/in' +import rawfoil from './workorder/rawfoil/in' +import sbpointivt from './ivt/sbPointIvt/in' +import coolregion from './ivt/cool/in' +import hot from './ivt/hot/in' export default { ...idLocale, @@ -47,5 +51,9 @@ export default { ...taskConfig, ...task, ...point, - ...region + ...region, + ...rawfoil, + ...sbpointivt, + ...coolregion, + ...hot } diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/cool/en.js b/lms/nladmin-ui/src/i18n/langs/ivt/cool/en.js new file mode 100644 index 0000000..0213b74 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/cool/en.js @@ -0,0 +1,79 @@ +export default { + 'CoolRegion': { + 'pan1': { + 'title': 'Cooling Zone Inventory', + 'table': { + 'point_code': 'Point Code', + 'cool_ivt_status': 'Cool Ivt Status', + 'full_point_code': 'Full Point', + 'full_point_status': 'Full Status', + 'container_name': 'Container Name', + 'empty_point_code': 'Empty Point', + 'empty_point_status': 'Empty Status', + 'empty_vehicle_code': 'Empty Vehicle Code', + 'ivt_qty': 'Inventory Qty', + 'qty_unit_name': 'Unit', + 'instorage_time': 'Instorage Time', + 'product_area': 'Production Area', + 'point_location': 'Position', + 'is_used': 'Enable', + 'remark': 'Remark', + 'update_time': 'Update Time' + }, + 'dialog': { + 'point_code': 'point code', + 'cool_ivt_status': 'cool ivt status', + 'full_point_status': 'full point status', + 'container_name': 'container name', + 'empty_point_status': 'empty status', + 'empty_vehicle_code': 'empty vehicle code', + 'product_area': 'production area', + 'point_location': 'position', + 'is_used': 'enable' + }, + 'search': { + 'createTime': 'instorage time', + 'button_1': 'Return MES', + 'button_2': 'In Cooling return' + }, + 'msg': { + 'm1': 'Enter the point code', + 'm2': 'Enter the master volume ID', + 'm3': 'Please select a point to send back!' + }, + 'rules': { + 'r1': 'The full axis status cannot be empty', + 'r2': 'The empty axis status cannot be empty', + 'r3': 'The inventory status cannot be empty' + } + }, + 'pan2': { + 'title': 'Cooling Zone Access Record', + 'table': { + 'bill_code': 'Bill Code', + 'io_type': 'Io Type', + 'qty': 'Qty', + 'pcsn': 'Pcsn', + 'start_point_code': 'Start Point', + 'end_point_code': 'End Point', + 'create_name': 'Create Name', + 'create_time': 'Create Time', + 'confirm_optname': 'Confirm Name', + 'confirm_time': 'Confirm Time' + }, + 'search': { + 'start_point_code': 'start point code', + 'end_point_code': 'end point code', + 'pcsn': 'pcsn', + 'vehicle_code': 'vehicle code', + 'createTime': 'create time' + }, + 'msg': { + 'm1': 'Enter the starting point code', + 'm2': 'Enter the end point code', + 'm3': 'Input batch', + 'm4': 'Enter vehicle number' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/cool/in.js b/lms/nladmin-ui/src/i18n/langs/ivt/cool/in.js new file mode 100644 index 0000000..ab81123 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/cool/in.js @@ -0,0 +1,79 @@ +export default { + 'CoolRegion': { + 'pan1': { + 'title': 'Inventarisasi Zona Pendinginan', + 'table': { + 'point_code': 'Kode Titik', + 'cool_ivt_status': 'Status Ivt Keren', + 'full_point_code': 'Titik Penuh', + 'full_point_status': 'Status Penuh', + 'container_name': 'Nama Kontainer', + 'empty_point_code': 'Titik Kosong', + 'empty_point_status': 'Status Kosong', + 'empty_vehicle_code': 'Kode Kendaraan Kosong', + 'ivt_qty': 'Jumlah Persediaan', + 'qty_unit_name': 'Satuan', + 'instorage_time': 'Waktu Penyimpanan', + 'product_area': 'Area Produksi', + 'point_location': 'Posisi', + 'is_used': 'Aktifkan', + 'remark': 'Komentar', + 'update_time': 'Waktu Pembaruan' + }, + 'dialog': { + 'point_code': 'kode titik', + 'cool_ivt_status': 'status ivt keren', + 'full_point_status': 'titik penuh', + 'container_name': 'nama kontainer', + 'empty_point_status': 'status kosong', + 'empty_vehicle_code': 'kode kendaraan kosong', + 'product_area': 'area produksi', + 'point_location': 'posisi', + 'is_used': 'aktifkan' + }, + 'search': { + 'createTime': 'waktu penyimpanan', + 'button_1': 'Kembalikan MES', + 'button_2': 'Dalam Pendinginan kembali' + }, + 'msg': { + 'm1': 'Masukkan kode poin', + 'm2': 'Masukkan ID volume master', + 'm3': 'Silakan pilih titik untuk dikirim kembali!' + }, + 'rules': { + 'r1': 'Status sumbu penuh tidak boleh kosong', + 'r2': 'Status sumbu kosong tidak boleh kosong', + 'r3': 'Status inventaris tidak boleh kosong' + } + }, + 'pan2': { + 'title': 'Catatan Akses Zona Pendinginan', + 'table': { + 'bill_code': 'Kode Tagihan', + 'io_type': 'Jenis Io', + 'qty': 'Jumlah', + 'pcsn': 'pcsn', + 'start_point_code': 'Titik Awal', + 'end_point_code': 'Titik Akhir', + 'create_name': 'Buat Nama', + 'create_time': 'Buat Waktu', + 'confirm_optname': 'Konfirmasi Nama', + 'confirm_time': 'Konfirmasi Waktu' + }, + 'search': { + 'start_point_code': 'kode titik awal', + 'end_point_code': 'kode titik akhir', + 'pcsn': 'pcsn', + 'vehicle_code': 'kode kendaraan', + 'createTime': 'buat waktu' + }, + 'msg': { + 'm1': 'Masukkan kode titik awal', + 'm2': 'Masukkan kode titik akhir', + 'm3': 'Masukan kumpulan', + 'm4': 'Masukkan nomor kendaraan' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/cool/zh.js b/lms/nladmin-ui/src/i18n/langs/ivt/cool/zh.js new file mode 100644 index 0000000..a9f46a8 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/cool/zh.js @@ -0,0 +1,79 @@ +export default { + 'CoolRegion': { + 'pan1': { + 'title': '冷却区库存', + 'table': { + 'point_code': '点位编码', + 'cool_ivt_status': '库存状态', + 'full_point_code': '满轴位', + 'full_point_status': '满轴位状态', + 'container_name': '母卷号', + 'empty_point_code': '空轴位', + 'empty_point_status': '空轴位状态', + 'empty_vehicle_code': '空轴编号', + 'ivt_qty': '库存数', + 'qty_unit_name': '计量单位', + 'instorage_time': '入库时间', + 'product_area': '生产区域', + 'point_location': '位置', + 'is_used': '是否启用', + 'remark': '备注', + 'update_time': '修改时间' + }, + 'dialog': { + 'point_code': '点位编码', + 'cool_ivt_status': '库存状态', + 'full_point_status': '满轴位状态', + 'container_name': '母卷号', + 'empty_point_status': '空轴位状态', + 'empty_vehicle_code': '空轴编号', + 'product_area': '生产区域', + 'point_location': '位置', + 'is_used': '是否启用' + }, + 'search': { + 'createTime': '入库时间', + 'button_1': '回传MES', + 'button_2': '入冷却回传' + }, + 'msg': { + 'm1': '输入点位编码', + 'm2': '输入母卷号', + 'm3': '请选择一个点位进行回传!' + }, + 'rules': { + 'r1': '满轴位状态不能为空', + 'r2': '空轴位状态不能为空', + 'r3': '库存状态不能为空' + } + }, + 'pan2': { + 'title': '冷却区出入记录', + 'table': { + 'bill_code': '单据编码', + 'io_type': '出入类型', + 'qty': '数量', + 'pcsn': '批次', + 'start_point_code': '起始点位', + 'end_point_code': '终点点位', + 'create_name': '创建人', + 'create_time': '创建时间', + 'confirm_optname': '确认人', + 'confirm_time': '确认时间' + }, + 'search': { + 'start_point_code': '起点点位编码', + 'end_point_code': '终点点位编码', + 'pcsn': '批次号', + 'vehicle_code': '载具编码', + 'createTime': '创建时间' + }, + 'msg': { + 'm1': '输入起点点位编码', + 'm2': '输入终点点位编码', + 'm3': '输入批次', + 'm4': '输入载具号' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/hot/en.js b/lms/nladmin-ui/src/i18n/langs/ivt/hot/en.js new file mode 100644 index 0000000..067a1d2 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/hot/en.js @@ -0,0 +1,71 @@ +export default { + 'Hot': { + 'pan1': { + 'title': 'Stock Inquiry', + 'table': { + 'point_code': 'Point Code', + 'point_status': 'Point Status', + 'container_name': 'Container Name', + 'ivt_qty': 'Ivt Qty', + 'instorage_time': 'Instorage Time', + 'product_area': 'Product Area', + 'temperature': 'Temperature', + 'last_time': 'Countdown', + 'group_name': 'Group', + 'ext_code': 'Ext Code', + 'point_location': 'Position', + 'is_used': 'Enabled', + 'remark': 'Remark', + 'update_time': 'Update Time' + }, + 'dialog': { + 'point_code': 'point code', + 'product_area': 'product area', + 'point_status': 'point status', + 'container_name': 'container name', + 'temperature': 'temperature', + 'is_used': 'enabled', + 'point_location': 'position', + 'instorage_time': 'instorage time' + }, + 'search': { + 'p1': 'Enter the point code', + 'button_1': 'Return MES' + }, + 'msg': { + 'm1': 'Point codes cannot be empty', + 'm2': 'The point status cannot be empty', + 'm3': 'Please select a point to send back!' + } + }, + 'pan2': { + 'title': 'Oven Task', + 'table': { + 'bill_code': 'Bill Code', + 'container_name': 'Container Name', + 'start_point_code': 'Start Point', + 'end_point_code': 'End Point', + 'temperature': 'Temperature', + 'oven_time': 'Oven Time', + 'task_code': 'Task Code', + 'create_name': 'Create Name', + 'create_time': 'Create Time', + 'confirm_optname': 'Confirm Name', + 'confirm_time': 'Confirm Time' + }, + 'dialog': { + 'bill_code': 'bill code', + 'task_code': 'task code', + 'start_point_code': 'start point', + 'end_point_code': 'end point', + 'container_name': 'container name', + 'create_time': 'create time' + }, + 'statusDtlList': { + 'build': 'build', + 'running': 'running', + 'confirm': 'confirm' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/hot/in.js b/lms/nladmin-ui/src/i18n/langs/ivt/hot/in.js new file mode 100644 index 0000000..6bafebd --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/hot/in.js @@ -0,0 +1,71 @@ +export default { + 'Hot': { + 'pan1': { + 'title': 'Pertanyaan Stok', + 'table': { + 'point_code': 'Kode Titik', + 'point_status': 'Status Poin', + 'container_name': 'Nama Kontainer', + 'ivt_qty': 'Ivt_qty', + 'instorage_time': 'Waktu Penyimpanan', + 'product_area': 'Area Produk', + 'temperature': 'Suhu', + 'last_time': 'Hitung mundur', + 'group_name': 'Grup', + 'ext_code': 'Kode Ekst', + 'point_location': 'Posisi', + 'is_used': 'Diaktifkan', + 'remark': 'Komentar', + 'update_time': 'Waktu Pembaruan' + }, + 'dialog': { + 'point_code': 'kode titik', + 'product_area': 'area produk', + 'point_status': 'status poin', + 'container_name': 'nama kontainer', + 'temperature': 'suhu', + 'is_used': 'diaktifkan', + 'point_location': 'posisi', + 'instorage_time': 'waktu penyimpanan' + }, + 'search': { + 'p1': 'Masukkan kode poin', + 'button_1': 'Kembalikan MES' + }, + 'msg': { + 'm1': 'Kode poin tidak boleh kosong', + 'm2': 'Status poin tidak boleh kosong', + 'm3': 'Silakan pilih titik untuk dikirim kembali!' + } + }, + 'pan2': { + 'title': 'Tugas Oven', + 'table': { + 'bill_code': 'Kode Tagihan', + 'container_name': 'Nama Kontainer', + 'start_point_code': 'Titik Awal', + 'end_point_code': 'Titik Akhir', + 'temperature': 'Suhu', + 'oven_time': 'Waktu Oven', + 'task_code': 'Kode Tugas', + 'create_name': 'Buat Nama', + 'create_time': 'Buat Waktu', + 'confirm_optname': 'Konfirmasi Nama', + 'confirm_time': 'Konfirmasi Waktu' + }, + 'dialog': { + 'bill_code': 'kode tagihan', + 'task_code': 'kode tugas', + 'start_point_code': 'titik awal', + 'end_point_code': 'titik akhir', + 'container_name': 'nama kontainer', + 'create_time': 'buat waktu' + }, + 'statusDtlList': { + 'build': 'membangun', + 'running': 'berlari', + 'confirm': 'mengonfirmasi' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/hot/zh.js b/lms/nladmin-ui/src/i18n/langs/ivt/hot/zh.js new file mode 100644 index 0000000..1c07f44 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/hot/zh.js @@ -0,0 +1,71 @@ +export default { + 'Hot': { + 'pan1': { + 'title': '烘烤区点位库存', + 'table': { + 'point_code': '点位编码', + 'point_status': '点位状态', + 'container_name': '母卷号', + 'ivt_qty': '库存数', + 'instorage_time': '入箱时间', + 'product_area': '生产区域', + 'temperature': '温度', + 'last_time': '倒计时', + 'group_name': '组别', + 'ext_code': '外部编码', + 'point_location': '位置', + 'is_used': '是否启用', + 'remark': '备注', + 'update_time': '修改时间' + }, + 'dialog': { + 'point_code': '点位编码', + 'product_area': '生产区域', + 'point_status': '点位状态', + 'container_name': '母卷号', + 'temperature': '温度', + 'is_used': '是否启用', + 'point_location': '生产位置', + 'instorage_time': '入箱时间' + }, + 'search': { + 'p1': '输入点位编码', + 'button_1': '回传MES' + }, + 'msg': { + 'm1': '点位编码不能为空', + 'm2': '点位状态不能为空', + 'm3': '请选择一个点位进行回传!' + } + }, + 'pan2': { + 'title': '烘箱任务', + 'table': { + 'bill_code': '单据编码', + 'container_name': '母卷号', + 'start_point_code': '起始点位', + 'end_point_code': '终点点位', + 'temperature': '烤箱温度', + 'oven_time': '烘烤时间', + 'task_code': '任务编码', + 'create_name': '创建人', + 'create_time': '创建时间', + 'confirm_optname': '确认人', + 'confirm_time': '确认时间' + }, + 'dialog': { + 'bill_code': '单据编码', + 'task_code': '任务编码', + 'start_point_code': '起点编码', + 'end_point_code': '终点编码', + 'container_name': '母卷号', + 'create_time': '创建时间' + }, + 'statusDtlList': { + 'build': '生成', + 'running': '执行中', + 'confirm': '确认' + } + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/en.js b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/en.js new file mode 100644 index 0000000..aa477d7 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/en.js @@ -0,0 +1,33 @@ +export default { + 'SbPointIvt': { + 'title': 'Raw Foil Point Inventory', + 'table': { + 'point_code': 'Point Code', + 'vehicle_code': 'Vehicle Code', + 'product_area': 'Production Area', + 'point_location': 'Position', + 'ext_code': 'Ext Code', + 'remark': 'Remark', + 'is_used': 'Enable', + 'mes_used': 'MES Enable', + 'update_time': 'Update Time' + }, + 'dialog': { + 'point_code': 'point code', + 'vehicle_code': 'vehicle code', + 'product_area': 'production area', + 'point_location': 'position', + 'ext_code': 'ext code', + 'is_used': 'enable', + 'mes_used': 'mes enable' + }, + 'rules': { + 'r1': 'Point codes cannot be empty', + 'r2': 'The point status cannot be empty', + 'r3': 'Enable or not The value cannot be empty' + }, + 'msg': { + 'm1': 'Enter the point code' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/in.js b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/in.js new file mode 100644 index 0000000..c1888cd --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/in.js @@ -0,0 +1,33 @@ +export default { + 'SbPointIvt': { + 'title': 'Persediaan Titik Foil Mentah', + 'table': { + 'point_code': 'Kode Titik', + 'vehicle_code': 'Kode Kendaraan', + 'product_area': 'Area Produksi', + 'point_location': 'Posisi', + 'ext_code': 'Kode Ekst', + 'remark': 'Komentar', + 'is_used': 'Aktifkan', + 'mes_used': 'MES Aktif', + 'update_time': 'Waktu Pembaruan' + }, + 'dialog': { + 'point_code': 'kode titik', + 'vehicle_code': 'kode kendaraan', + 'product_area': 'area produksi', + 'point_location': 'posisi', + 'ext_code': 'kode ekst', + 'is_used': 'aktifkan', + 'mes_used': 'mes aktif' + }, + 'rules': { + 'r1': 'Kode poin tidak boleh kosong', + 'r2': 'Status poin tidak boleh kosong', + 'r3': 'Aktifkan atau tidak Nilainya tidak boleh kosong' + }, + 'msg': { + 'm1': 'Masukkan kode poin' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/zh.js b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/zh.js new file mode 100644 index 0000000..e9c3efa --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/ivt/sbPointIvt/zh.js @@ -0,0 +1,33 @@ +export default { + 'SbPointIvt': { + 'title': '生箔点位库存', + 'table': { + 'point_code': '点位编码', + 'vehicle_code': '载具编码', + 'product_area': '生产区域', + 'point_location': '位置', + 'ext_code': '外部编码', + 'remark': '备注', + 'is_used': '是否启用', + 'mes_used': 'MES启用', + 'update_time': '修改时间' + }, + 'dialog': { + 'point_code': '点位编码', + 'vehicle_code': '载具编码', + 'product_area': '生产区域', + 'point_location': '位置', + 'ext_code': '外部编码', + 'is_used': '是否启用', + 'mes_used': 'MES启用' + }, + 'rules': { + 'r1': '点位编码不能为空', + 'r2': '点位状态不能为空', + 'r3': '是否启用不能为空' + }, + 'msg': { + 'm1': '输入点位编码' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/online/en.js b/lms/nladmin-ui/src/i18n/langs/online/en.js index 2461174..46bad0a 100644 --- a/lms/nladmin-ui/src/i18n/langs/online/en.js +++ b/lms/nladmin-ui/src/i18n/langs/online/en.js @@ -14,8 +14,7 @@ export default { 'msg': { 'm1': 'Are you sure you want to force logout on this use?', 'm2': 'Successful forced withdrawal!', - 'm3_1': 'Confirm the forcibly unselected', - 'm3_2': 'users?', + 'm3': 'Confirm to force-exit the selected {count} users?', 'm4': 'Fuzzy Search' } } diff --git a/lms/nladmin-ui/src/i18n/langs/online/in.js b/lms/nladmin-ui/src/i18n/langs/online/in.js index 0352a7e..f8ffe11 100644 --- a/lms/nladmin-ui/src/i18n/langs/online/in.js +++ b/lms/nladmin-ui/src/i18n/langs/online/in.js @@ -14,8 +14,7 @@ export default { 'msg': { 'm1': 'Apakah Anda yakin ingin memaksa logout pada penggunaan ini?', 'm2': 'Penarikan paksa yang berhasil!', - 'm3_1': 'Konfirmasikan yang tidak dipilih secara paksa', - 'm3_2': 'pengguna?', + 'm3': 'Konfirmasikan untuk keluar paksa dari {count} pengguna yang dipilih?', 'm4': 'Pencarian Kabur' } } diff --git a/lms/nladmin-ui/src/i18n/langs/online/zh.js b/lms/nladmin-ui/src/i18n/langs/online/zh.js index 1b88733..463dc6e 100644 --- a/lms/nladmin-ui/src/i18n/langs/online/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/online/zh.js @@ -14,8 +14,7 @@ export default { 'msg': { 'm1': '确定强制退出该用户吗?', 'm2': '强退成功!', - 'm3_1': '确认强退选中的', - 'm3_2': '个用户?', + 'm3': '确认强退选中的{count}个用户?', 'm4': '模糊搜索' } } diff --git a/lms/nladmin-ui/src/i18n/langs/user/en.js b/lms/nladmin-ui/src/i18n/langs/user/en.js index 4665da7..6cb1b35 100644 --- a/lms/nladmin-ui/src/i18n/langs/user/en.js +++ b/lms/nladmin-ui/src/i18n/langs/user/en.js @@ -52,10 +52,8 @@ export default { 'msg': { 'm1': 'Confirm reset the password?', 'm2': 'Password reset succeeded. Password :123456', - 'm3_1': 'This operation will ', - 'm3_2': 'Account:', - 'm3_3': '. Do you want to continue?', - 'm3_4': ' Already ' + 'm3': 'This operation will change {display_name} account: {username}. Do you want to continue?', + 'm4': 'Account: {username} has been {display_name}' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/user/in.js b/lms/nladmin-ui/src/i18n/langs/user/in.js index 4e7d427..7235a77 100644 --- a/lms/nladmin-ui/src/i18n/langs/user/in.js +++ b/lms/nladmin-ui/src/i18n/langs/user/in.js @@ -52,10 +52,8 @@ export default { 'msg': { 'm1': 'Konfirmasikan setel ulang kata sandi?', 'm2': 'Penyetelan ulang kata sandi berhasil. Kata sandi :123456', - 'm3_1': 'Operasi ini akan terjadi', - 'm3_2': 'Akun:', - 'm3_3': ', Apakah Anda ingin melanjutkan?', - 'm3_4': ' Sudah ' + 'm3': 'Operasi ini akan mengubah akun {display_name}: {username}.', + 'm4': 'Akun: {username} telah menjadi {display_name}' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/user/zh.js b/lms/nladmin-ui/src/i18n/langs/user/zh.js index 9404df3..5713162 100644 --- a/lms/nladmin-ui/src/i18n/langs/user/zh.js +++ b/lms/nladmin-ui/src/i18n/langs/user/zh.js @@ -52,10 +52,8 @@ export default { 'msg': { 'm1': '确认重置密码?', 'm2': '密码重置成功,密码:123456', - 'm3_1': '此操作将', - 'm3_2': '账号:', - 'm3_3': ', 是否继续?', - 'm3_4': '已' + 'm3': '此操作将{display_name}账号:{username},是否继续?', + 'm4': '账号:{username}已{display_name}' } } } diff --git a/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/en.js b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/en.js new file mode 100644 index 0000000..843ebff --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/en.js @@ -0,0 +1,55 @@ +export default { + 'RawFoil': { + 'title': 'Raw Foil Order', + 'table': { + 'mfg_order_name': 'Work No', + 'status': 'Status', + 'container_name': 'Container No', + 'point_code2': 'Point Code', + 'resource_name': 'Machine Code', + 'product_name': 'Product Code', + 'theory_height': 'Theory Length', + 'realstart_time': 'Start Time', + 'realend_time': 'End Time', + 'productin_qty': 'Weight', + 'agvno': 'AGV No', + 'product_area': 'Product Area', + 'is_baking': 'Baking', + 'is_instor': 'Instor', + 'update_time': 'Update Time' + }, + 'dialog': { + 'container_name': 'container no', + 'resource_name': 'machine code', + 'mfg_order_name': 'work no', + 'product_name': 'product code', + 'description': 'product name', + 'theory_height': 'theory length', + 'eqp_velocity': 'production rate', + 'up_coiler_date': 'up coiler date', + 'productin_qty': 'weight', + 'agvno': 'agv no', + 'remark': 'remark', + 'is_reload_send': 'reload send', + 'weight': 'Weighting' + }, + 'search': { + 'product_area': 'product area', + 'status': 'status', + 'createTime': 'order date', + 'button_end': 'forced close', + 'button_weight': 'weigh' + }, + 'msg': { + 'm1': 'You cannot force an end to a completed work order', + 'm2': 'The master volume number cannot be empty', + 'm3': 'The machine code cannot be empty', + 'm4': 'The production ticket cannot be empty', + 'm5': 'The product code cannot be empty', + 'm6': 'The product name cannot be empty', + 'm7': 'The theoretical length cannot be empty', + 'm8': 'The production speed of the device cannot be empty', + 'm9': 'The roll up start time cannot be empty' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/in.js b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/in.js new file mode 100644 index 0000000..2d57df5 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/in.js @@ -0,0 +1,48 @@ +export default { + 'RawFoil': { + 'title': 'Pesanan Foil Mentah', + 'table': { + 'mfg_order_name': 'Tidak Ada Pekerjaan', + 'status': 'Status', + 'container_name': 'Nomor Kontainer', + 'point_code2': 'Kode Titik', + 'resource_name': 'Kode Mesin', + 'product_name': 'Kode Produk', + 'theory_height': 'Panjang Teori', + 'realstart_time': 'Waktu Mulai', + 'realend_time': 'Waktu Berakhir', + 'productin_qty': 'Berat', + 'agvno': 'AGV Tidak', + 'product_area': 'Area Produk', + 'is_baking': 'Memanggang', + 'is_instor': 'Instor', + 'update_time': 'Waktu Pembaruan' + }, + 'dialog': { + 'container_name': 'no container', + 'resource_name': 'kode mesin', + 'mfg_order_name': 'tidak ada pekerjaan', + 'product_name': 'kode produk', + 'description': 'nama produk', + 'theory_height': 'panjang teori', + 'eqp_velocity': 'tingkat produksi', + 'up_coiler_date': 'tanggal up coiler', + 'productin_qty': 'berat', + 'agvno': 'agv tidak', + 'remark': 'komentar', + 'is_reload_send': 'muat ulang pengiriman', + 'weight': 'Pembobotan' + }, + 'msg': { + 'm1': 'Anda tidak dapat memaksa diakhirinya perintah kerja yang sudah selesai', + 'm2': 'Nomor volume master tidak boleh kosong', + 'm3': 'Kode mesin tidak boleh kosong', + 'm4': 'Tiket produksi tidak boleh kosong', + 'm5': 'Kode produk tidak boleh kosong', + 'm6': 'Nama produk tidak boleh kosong', + 'm7': 'Panjang teoritis tidak boleh kosong', + 'm8': 'Kecepatan produksi perangkat tidak boleh kosong', + 'm9': 'Waktu mulai roll up tidak boleh kosong' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/zh.js b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/zh.js new file mode 100644 index 0000000..29cf506 --- /dev/null +++ b/lms/nladmin-ui/src/i18n/langs/workorder/rawfoil/zh.js @@ -0,0 +1,55 @@ +export default { + 'RawFoil': { + 'title': '生箔工序工单', + 'table': { + 'mfg_order_name': '工单号', + 'status': '工单状态', + 'container_name': '母卷号', + 'point_code2': '点位编码', + 'resource_name': '机台编码', + 'product_name': '产品编码', + 'theory_height': '理论长度', + 'realstart_time': '开始时间', + 'realend_time': '结束时间', + 'productin_qty': '重量', + 'agvno': '车号', + 'product_area': '生产区域', + 'is_baking': '请求烘烤', + 'is_instor': '请求入半成品库', + 'update_time': '更新时间' + }, + 'dialog': { + 'container_name': '母卷号', + 'resource_name': '机台编码', + 'mfg_order_name': '生产工单', + 'product_name': '产品编码', + 'description': '产品名称', + 'theory_height': '理论长度', + 'eqp_velocity': '设备生产速度', + 'up_coiler_date': '上卷开始时间', + 'productin_qty': '重量', + 'agvno': '车号', + 'remark': '备注', + 'is_reload_send': '是否重新更新', + 'weight': '称重' + }, + 'search': { + 'product_area': '生产区域', + 'status': '工单状态', + 'createTime': '工单日期', + 'button_end': '强制结束', + 'button_weight': '称重' + }, + 'msg': { + 'm1': '不能对完成状态的工单强制结束', + 'm2': '母卷号不能为空', + 'm3': '机台编码不能为空', + 'm4': '生产工单不能为空', + 'm5': '产品编码不能为空', + 'm6': '产品名称不能为空', + 'm7': '理论长度不能为空', + 'm8': '设备生产速度不能为空', + 'm9': '上卷开始时间不能为空' + } + } +} diff --git a/lms/nladmin-ui/src/i18n/langs/zh-CN.js b/lms/nladmin-ui/src/i18n/langs/zh-CN.js index 9e36a23..159ecec 100644 --- a/lms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/lms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -72,8 +72,7 @@ export default { 'browses': '浏览', 'fz': '全屏缩放', 'Tips': '提示', - 'Tip1': '确认删除选中的', - 'Tip2': '条数据?', + 'Tip1': '确认删除选中的{count}条数据?', 'Tip3': '用户姓名不作为登录使用', 'Tip4': '手机号码不能重复', 'Tip5': '请输入电话号码', @@ -89,7 +88,8 @@ export default { 'Tip15': '请输入图标名称', 'Tip16': '不能为空', 'Tip17': '请输入你要搜索的内容', - 'loading': '数据加载中...' + 'loading': '数据加载中...', + 'Tip18': '选择日期时间' }, 'WorkOrder': { 'form': { diff --git a/lms/nladmin-ui/src/views/monitor/online/index.vue b/lms/nladmin-ui/src/views/monitor/online/index.vue index 325ee35..4b29f04 100644 --- a/lms/nladmin-ui/src/views/monitor/online/index.vue +++ b/lms/nladmin-ui/src/views/monitor/online/index.vue @@ -89,7 +89,7 @@ export default { }, methods: { doDelete(datas) { - this.$confirm(i18n.t('Online.m3_1') + `${datas.length}` + i18n.t('Online.m3_1'), i18n.t('common.Tips'), { + this.$confirm(i18n.t('Online.msg.m3', { count: datas.length }), i18n.t('common.Tips'), { confirmButtonText: i18n.t('common.Confirm'), cancelButtonText: i18n.t('common.Cancel'), type: 'warning' diff --git a/lms/nladmin-ui/src/views/system/dept/index.vue b/lms/nladmin-ui/src/views/system/dept/index.vue index 99a55fd..1493e36 100644 --- a/lms/nladmin-ui/src/views/system/dept/index.vue +++ b/lms/nladmin-ui/src/views/system/dept/index.vue @@ -289,7 +289,7 @@ export default { const satus = this.enabledTypeOptions.find(item => { return item.key == data.is_used }) - this.$confirm(i18n.t('Dept.msg.tip3.1') + ' "' + satus.display_name + '" ' + data.name + i18n.t('Dept.msg.tip3.2'), i18n.t('common.Tips'), { + this.$confirm(i18n.t('Dept.msg.tip3', { display_name: satus.display_name, name: data.name }), i18n.t('common.Tips'), { confirmButtonText: i18n.t('common.Confirm'), cancelButtonText: i18n.t('common.Cancel'), type: 'warning' diff --git a/lms/nladmin-ui/src/views/system/redis/index.vue b/lms/nladmin-ui/src/views/system/redis/index.vue index cdf5638..28c369a 100644 --- a/lms/nladmin-ui/src/views/system/redis/index.vue +++ b/lms/nladmin-ui/src/views/system/redis/index.vue @@ -231,7 +231,7 @@ export default { this.delBtlStatu = val.length == 0 }, batchDel() { - this.$confirm(i18n.t('common.Tip1') + this.multipleSelection.length + i18n.t('common.Tip2'), i18n.t('common.Tips'), { + this.$confirm(i18n.t('common.Tip1', { count: this.multipleSelection.length }), i18n.t('common.Tips'), { confirmButtonText: i18n.t('common.Confirm'), cancelButtonText: i18n.t('common.Cancel'), type: 'warning' diff --git a/lms/nladmin-ui/src/views/system/user/index.vue b/lms/nladmin-ui/src/views/system/user/index.vue index e5d0e95..b95ac79 100644 --- a/lms/nladmin-ui/src/views/system/user/index.vue +++ b/lms/nladmin-ui/src/views/system/user/index.vue @@ -610,7 +610,7 @@ export default { // 改变状态 changeEnabled(row) { const satus = this.enabledTypeOptions.find(item => { return item.key !== row.is_used }) - this.$confirm(i18n.t('User.msg.m3_1') + satus.display_name + i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_3'), i18n.t('common.Tips'), { + this.$confirm(i18n.t('User.msg.m3', {display_name: satus.display_name, username: row.username}), i18n.t('common.Tips'), { confirmButtonText: i18n.t('common.Confirm'), cancelButtonText: i18n.t('common.Cancel'), type: 'warning' @@ -618,7 +618,7 @@ export default { row.is_used = satus.key crudUser.edit(row).then(res => { this.crud.toQuery() - this.crud.notify(i18n.t('User.msg.m3_2') + row.username + i18n.t('User.msg.m3_4') + satus.display_name) + this.crud.notify(i18n.t('User.msg.m4', { display_name: satus.display_name, username: row.username })) }) }) }, diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue index 381f5a4..edbf1ca 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/Dialog.vue @@ -1,6 +1,6 @@ diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue index ca6f474..660f795 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue @@ -8,56 +8,55 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="90px" label-suffix=":" > - + - + - + - + - + @@ -140,13 +139,25 @@ - - + + - + - - - - - - - - + + + + + + + + - - - + + + - + @@ -175,14 +186,14 @@ /> - + - + @@ -193,10 +204,10 @@ /> - + - + - + - + - - + + - - + + - - - + + + - - - - - + + + + + - + - + - - - + + +