add:新增下发任务时对层数进行校验

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<TaskMapper, Task> 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());

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
+
+
 
 
 

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

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

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

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"
                 >
                   <el-option
                     v-for="item in toYList"
@@ -319,8 +319,8 @@
                   v-model="form.to_z"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
-                  @change="isDisabled=false"
                 >
                   <el-option
                     v-for="item in toZList"
@@ -358,8 +358,8 @@
                   v-model="form.from_y2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
-                  @change="isDisabled=false"
                 >
                   <el-option
                     v-for="item in fromYList"
@@ -374,8 +374,8 @@
                   v-model="form.from_z2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
-                  @change="isDisabled=false"
                 >
                   <el-option
                     v-for="item in fromZList"
@@ -406,8 +406,8 @@
                   v-model="form.to_y2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
-                  @change="isDisabled=false"
                 >
                   <el-option
                     v-for="item in toYList"
@@ -422,8 +422,8 @@
                   v-model="form.to_z2"
                   style="width: 370px;"
                   filterable
+                  clearable
                   :placeholder="$t('task.select.Placeholder')"
-                  @change="isDisabled=false"
                 >
                   <el-option
                     v-for="item in toZList"
@@ -787,16 +787,16 @@ export default {
           { required: true, message: '终点不能为空', trigger: 'change' }
         ],
         from_y: [
-          { validator: checkFromY, trigger: 'change' }
+          { required: true, message: 'y 不能为空', trigger: 'change' }
         ],
         from_z: [
-          { validator: checkFromZ, trigger: 'change' }
+          { required: true, message: 'Z 不能为空', trigger: 'change' }
         ],
         to_y: [
-          { validator: checkToY, trigger: 'change' }
+          { required: true, message: 'y 不能为空', trigger: 'change' }
         ],
         to_z: [
-          { validator: checkToZ, trigger: 'change' }
+          { required: true, message: 'Z 不能为空', trigger: 'change' }
         ]
       }
     }