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 2f045f6..232f16a 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 @@ -752,7 +752,8 @@ public class TaskServiceImpl extends CommonServiceImpl impleme JSONArray array = json.getJSONArray("data"); if (array.size() == 0) { - throw new RuntimeException("请选择起点"); + throw new BadRequestException( LangProcess.msg("starting_point_isNull")); + //throw new RuntimeException("请选择起点"); } for (int i = 0; i < array.size(); i++) { JSONObject arrjo = array.getJSONObject(i); diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties index 5f0fd04..e5db703 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties @@ -2,3 +2,4 @@ task_checkExist={0}任务已存在 task_insHas=指令已存在 task_insRun=有指令未完成 task_isNull={0}查询信息不存在 +starting_point_isNull=请选择起点 diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties index 9e1a0b9..f374849 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties @@ -2,3 +2,4 @@ task_checkExist=Task {0} already exists task_insHas=Instruction already exists task_insRun=There are instructions that are not completed task_isNull={0}query is null +starting_point_isNull = Please select starting point diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties index 053832b..41041c4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties +++ b/acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties @@ -2,3 +2,4 @@ task_checkExist=Tugas {0} sudah ada task_insHas=Instruksi sudah ada task_insRun=Ada instruksi yang belum selesai task_isNull={0}Pertanyaan Tidak ada +starting_point_isNull = Silakan pilih titik awal diff --git a/acs/nladmin-ui/src/i18n/langs/chinese.js b/acs/nladmin-ui/src/i18n/langs/chinese.js index 8aa2aad..5f6e5fc 100644 --- a/acs/nladmin-ui/src/i18n/langs/chinese.js +++ b/acs/nladmin-ui/src/i18n/langs/chinese.js @@ -4,6 +4,7 @@ import menu from './menu/zh' import param from './param/zh' import instruction from './instruction/zh' import task from './task/zh' +import history from './history/zh' export default { ...zhLocale, @@ -11,5 +12,6 @@ export default { ...menu, ...param, ...instruction, - ...task + ...task, + ...history } diff --git a/acs/nladmin-ui/src/i18n/langs/english.js b/acs/nladmin-ui/src/i18n/langs/english.js index 298e757..1206f97 100644 --- a/acs/nladmin-ui/src/i18n/langs/english.js +++ b/acs/nladmin-ui/src/i18n/langs/english.js @@ -4,6 +4,7 @@ import menu from './menu/en' import param from './param/en' import instruction from './instruction/en' import task from './task/en' +import history from './history/en' export default { ...enLocale, @@ -11,5 +12,6 @@ export default { ...menu, ...param, ...instruction, - ...task + ...task, + ...history } diff --git a/acs/nladmin-ui/src/i18n/langs/history/en.js b/acs/nladmin-ui/src/i18n/langs/history/en.js new file mode 100644 index 0000000..8a73391 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/history/en.js @@ -0,0 +1,24 @@ +export default { + 'TaskRecord': { + 'table': { + 'Task_code': 'Input task number', + 'Vehicle_number': 'Input vehicle number', + 'Task_number': 'Task code(instruction code)', + 'Status': 'Status', + 'Priority': 'Task priority', + 'Starting_point_two': 'Starting point two', + 'Endpoint_two': 'Endpoint Two', + 'Material': 'Material', + 'Quantity': 'Quantity', + 'Numbering': 'Numbering', + 'Value': 'Value', + 'Input_task_instruction_number': 'Enter task number or instruction number', + 'Instruction_code': 'Instruction code', + 'Instruction_status': 'Instruction_status', + 'Update_by': 'Modifier', + 'Update_time': 'Modification time' + }, + 'rules': { + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/history/in.js b/acs/nladmin-ui/src/i18n/langs/history/in.js new file mode 100644 index 0000000..0d2f1c5 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/history/in.js @@ -0,0 +1,24 @@ +export default { + 'TaskRecord': { + 'table': { + 'Task_code': 'Input nomor tugas', + 'Vehicle_number': 'Input nomor kendaraan', + 'Task_number': 'Nomor tugas(kode instruksi)', + 'Status': 'Status', + 'Priority': 'Prioritas tugas', + 'Starting_point_two': 'Titik awalan dua', + 'Endpoint_two': 'Titik akhir dua', + 'Material': 'Bahan', + 'Quantity': 'Jumlah', + 'Numbering': 'Nomor', + 'Value': 'Nilai', + 'Input_task_instruction_number': 'Masukkan nomor tugas atau nomor instruksi', + 'Instruction_code': 'Kode instruksi', + 'Instruction_status': 'Status instruksi', + 'Update_by': 'Pengubah', + 'Update_time': 'Waktu modifikasi' + }, + 'rules': { + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/history/zh.js b/acs/nladmin-ui/src/i18n/langs/history/zh.js new file mode 100644 index 0000000..6383cf3 --- /dev/null +++ b/acs/nladmin-ui/src/i18n/langs/history/zh.js @@ -0,0 +1,24 @@ +export default { + 'TaskRecord': { + 'table': { + 'Task_code': '输入任务号', + 'Vehicle_number': '输入载具号', + 'Task_number': '任务号(指令编码)', + 'Status': '状态', + 'Priority': '任务优先级', + 'Starting_point_two': '起点2', + 'Endpoint_two': '终点2', + 'Material': '物料', + 'Quantity': '数量', + 'Numbering': '编号', + 'Value': '值', + 'Input_task_instruction_number': '输入任务号或指令号', + 'Instruction_code': '指令编码', + 'Instruction_status': '指令状态', + 'Update_by': '修改者', + 'Update_time': '修改时间' + }, + 'rules': { + } + } +} diff --git a/acs/nladmin-ui/src/i18n/langs/indonesian.js b/acs/nladmin-ui/src/i18n/langs/indonesian.js index 454fbfd..3015d91 100644 --- a/acs/nladmin-ui/src/i18n/langs/indonesian.js +++ b/acs/nladmin-ui/src/i18n/langs/indonesian.js @@ -4,6 +4,7 @@ import menu from './menu/in' import param from './param/in' import instruction from './instruction/in' import task from './task/in' +import history from './history/in' export default { ...idLocale, @@ -11,5 +12,6 @@ export default { ...menu, ...param, ...instruction, - ...task + ...task, + ...history } diff --git a/acs/nladmin-ui/src/i18n/langs/task/en.js b/acs/nladmin-ui/src/i18n/langs/task/en.js index 1702cf5..1ec5717 100644 --- a/acs/nladmin-ui/src/i18n/langs/task/en.js +++ b/acs/nladmin-ui/src/i18n/langs/task/en.js @@ -12,7 +12,7 @@ export default { 'Routing_scheme': 'Routing scheme', 'Priority': 'Priority', 'Vehicle_number': 'Vehicle number', - 'Task_code': 'Task_code', + 'Task_code': 'Task code', 'Task': 'Task' }, 'select': { diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue index 2aac4bd..93f2b91 100644 --- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -8,7 +8,7 @@ v-model="query.code" size="small" clearable - placeholder="输入任务号或指令号" + :placeholder="$t('TaskRecord.table.Input_task_instruction_number')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -17,7 +17,7 @@ v-model="query.vehicle_code" size="small" clearable - placeholder="输入载具号" + :placeholder="$t('task.txt_box.Vehicle_registration_number')" style="width: 200px;" 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" @@ -68,22 +68,22 @@ width="500px" > - + - + - + - + @@ -96,25 +96,25 @@ @selection-change="crud.selectionChangeHandler" > - - - - + + + + - - - - - - - - - + + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue index f669127..56c7a91 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -8,7 +8,7 @@ v-model="query.task_code" size="small" clearable - placeholder="输入任务号" + :placeholder="$t('TaskRecord.table.Task_code')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -19,7 +19,7 @@ value="1" size="small" clearable - placeholder="输入任务号" + :placeholder="$t('TaskRecord.table.Task_code')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -28,7 +28,7 @@ v-model="query.vehicle_code" size="small" clearable - placeholder="输入载具号" + :placeholder="$t('TaskRecord.table.Vehicle_number')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -38,7 +38,7 @@ clearable filterable size="small" - placeholder="物料类型" + :placeholder="$t('task.txt_box.Material_type')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -50,7 +50,7 @@ clearable filterable size="small" - placeholder="任务状态" + :placeholder="$t('task.txt_box.Task_status')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -61,7 +61,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" @@ -74,7 +74,7 @@ @@ -82,12 +82,12 @@ - + - + - + - + - + - + - + - + - + - + @@ -230,23 +230,23 @@ @selection-change="crud.selectionChangeHandler" > - - - + + + - - - - - - - - + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index 6bcbbb1..5b9bb70 100644 --- a/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -8,7 +8,7 @@ v-model="query.task_code" size="small" clearable - placeholder="输入任务号" + :placeholder="$t('TaskRecord.table.Task_code')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -19,7 +19,7 @@ value="1" size="small" clearable - placeholder="输入任务号" + :placeholder="$t('TaskRecord.table.Task_code')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -28,7 +28,7 @@ v-model="query.vehicle_code" size="small" clearable - placeholder="输入载具号" + :placeholder="$t('TaskRecord.table.Vehicle_number')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -38,7 +38,7 @@ clearable filterable size="small" - placeholder="物料类型" + :placeholder="$t('task.txt_box.Material_type')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -50,7 +50,7 @@ clearable filterable size="small" - placeholder="任务状态" + :placeholder="$t('task.txt_box.Task_status')" class="filter-item" style="width: 190px" @change="crud.toQuery" @@ -61,7 +61,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" @@ -87,25 +87,25 @@ @selection-change="crud.selectionChangeHandler" > - - - + + + - - - - - - - - - - + + + + + + + + + + diff --git a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue index aa6668d..c890379 100644 --- a/acs/nladmin-ui/src/views/acs/history/udwData/index.vue +++ b/acs/nladmin-ui/src/views/acs/history/udwData/index.vue @@ -19,7 +19,7 @@ v-model="query.code" size="small" clearable - placeholder="编号" + :placeholder="$t('TaskRecord.table.Numbering')" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" @@ -31,7 +31,7 @@ @@ -39,16 +39,16 @@ - + - + @@ -61,20 +61,20 @@ @selection-change="crud.selectionChangeHandler" > - - + + -