From d65263b620e635967a3736241f4dd7c46524aa7d Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Wed, 4 Sep 2024 16:18:26 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=B6=E5=AF=B9=E5=B1=82=E6=95=B0=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/service/impl/TaskServiceImpl.java | 7 ++++++ .../resources/language/task/task.properties | 25 +++++++++++-------- .../language/task/task_en_US.properties | 1 + .../language/task/task_in_ID.properties | 1 + .../language/task/task_zh_CN.properties | 23 +++++++++-------- acs2/nladmin-ui/src/views/acs/task/index.vue | 20 +++++++-------- 6 files changed, 45 insertions(+), 32 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 57e522be7..3612f0e6c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -1252,6 +1252,13 @@ public class TaskServiceImpl extends CommonServiceImpl impleme String from_z = null; String to_y = null; String to_z = null; + //校验排列层为空 + if (task.getTask_type().equals(TaskTypeEnum.AGV_Task.getIndex())){ + if (StrUtil.isEmpty(task.getTo_y()) || StrUtil.isEmpty(task.getTo_z())|| StrUtil.isEmpty(task.getFrom_y()) || StrUtil.isEmpty(task.getFrom_z())){ + throw new BadRequestException(LangProcess.msg("point_null")); + } + + } CommonFinalParam commonFinalParam = new CommonFinalParam(); if (StrUtil.contains(start_point_code, commonFinalParam.getBARRE()) && StrUtil.count(start_point_code, commonFinalParam.getBARRE()) == 2) { String[] start_point = start_point_code.split(commonFinalParam.getBARRE()); diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties index 917cf4419..619e2afa6 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties @@ -1,14 +1,17 @@ -task_checkExist={0}任务已存在 -task_insHas=指令已存在 -task_insRun=有指令未完成 -task_isNull={0}查询信息不存在 -starting_point_isNull=请选择起点 -endpoint_layer=货位信息终点需要包含层信息 -endpoint_column=货位信息终点需要包含列信息 -start_point_layer=货位信息起点需要包含层信息 -start_point_column=货位信息起点需要包含列信息 -an_endpoint=只能选择一个终点 -material_information=请填写物料信息 +task_checkExist={0}\u4EFB\u52A1\u5DF2\u5B58\u5728 +task_insHas=\u6307\u4EE4\u5DF2\u5B58\u5728 +task_insRun=\u6709\u6307\u4EE4\u672A\u5B8C\u6210 +task_isNull={0}\u67E5\u8BE2\u4FE1\u606F\u4E0D\u5B58\u5728 +starting_point_isNull=\u8BF7\u9009\u62E9\u8D77\u70B9 +endpoint_layer=\u8D27\u4F4D\u4FE1\u606F\u7EC8\u70B9\u9700\u8981\u5305\u542B\u5C42\u4FE1\u606F +endpoint_column=\u8D27\u4F4D\u4FE1\u606F\u7EC8\u70B9\u9700\u8981\u5305\u542B\u5217\u4FE1\u606F +start_point_layer=\u8D27\u4F4D\u4FE1\u606F\u8D77\u70B9\u9700\u8981\u5305\u542B\u5C42\u4FE1\u606F +start_point_column=\u8D27\u4F4D\u4FE1\u606F\u8D77\u70B9\u9700\u8981\u5305\u542B\u5217\u4FE1\u606F +an_endpoint=\u53EA\u80FD\u9009\u62E9\u4E00\u4E2A\u7EC8\u70B9 +material_information=\u8BF7\u586B\u5199\u7269\u6599\u4FE1\u606F +point_null= \u6392\u5217\u5C42\u4E0D\u80FD\u4E3A\u7A7A + + diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties index bf16cb260..896bd0ee0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties @@ -9,3 +9,4 @@ start_point_layer=The starting point of the storage location information needs t start_point_column=The starting point of the storage location information needs to contain column information an_endpoint=Only one endpoint can be selected material_information=Please fill in the material information! +point_null= The array layer cannot be empty diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties index 5ba89796d..a220a8b38 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties @@ -9,3 +9,4 @@ start_point_layer=Titik awal perlu mencakup informasi lantai. start_point_column=Titik awal perlu mencakup informasi kolom. an_endpoint=Hanya satu tujuan yang dapat dipilih. material_information=Silakan isi informasi material! +point_null= Deretan lapisan tidak boleh kosong diff --git a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_zh_CN.properties b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_zh_CN.properties index c71cc643f..4ba4b3bda 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_zh_CN.properties +++ b/acs2/nladmin-system/nlsso-server/src/main/resources/language/task/task_zh_CN.properties @@ -1,11 +1,12 @@ -task_checkExist={0}任务已存在 -task_insHas=指令已存在 -task_insRun=有指令未完成 -task_isNull={0}查询信息不存在 -starting_point_isNull=请选择起点 -endpoint_layer=货位信息终点需要包含层信息 -endpoint_column=货位信息终点需要包含列信息 -start_point_layer=货位信息起点需要包含层信息 -start_point_column=货位信息起点需要包含列信息 -an_endpoint=只能选择一个终点 -material_information=请填写物料信息 +task_checkExist={0}\u4EFB\u52A1\u5DF2\u5B58\u5728 +task_insHas=\u6307\u4EE4\u5DF2\u5B58\u5728 +task_insRun=\u6709\u6307\u4EE4\u672A\u5B8C\u6210 +task_isNull={0}\u67E5\u8BE2\u4FE1\u606F\u4E0D\u5B58\u5728 +starting_point_isNull=\u8BF7\u9009\u62E9\u8D77\u70B9 +endpoint_layer=\u8D27\u4F4D\u4FE1\u606F\u7EC8\u70B9\u9700\u8981\u5305\u542B\u5C42\u4FE1\u606F +endpoint_column=\u8D27\u4F4D\u4FE1\u606F\u7EC8\u70B9\u9700\u8981\u5305\u542B\u5217\u4FE1\u606F +start_point_layer=\u8D27\u4F4D\u4FE1\u606F\u8D77\u70B9\u9700\u8981\u5305\u542B\u5C42\u4FE1\u606F +start_point_column=\u8D27\u4F4D\u4FE1\u606F\u8D77\u70B9\u9700\u8981\u5305\u542B\u5217\u4FE1\u606F +an_endpoint=\u53EA\u80FD\u9009\u62E9\u4E00\u4E2A\u7EC8\u70B9 +material_information=\u8BF7\u586B\u5199\u7269\u6599\u4FE1\u606F +point_null= \u6392\u5217\u5C42\u4E0D\u80FD\u4E3A\u7A7A diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue index 4dfdd330a..2615c7fd2 100644 --- a/acs2/nladmin-ui/src/views/acs/task/index.vue +++ b/acs2/nladmin-ui/src/views/acs/task/index.vue @@ -303,8 +303,8 @@ v-model="form.to_y" style="width: 370px;" filterable + clearable :placeholder="$t('task.select.Placeholder')" - @change="isDisabled=false" >