diff --git a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index c23e0658..21c75959 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -1327,7 +1327,9 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
             if (putDevice != null) {
                 if (startDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                     hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) startDevice.getDeviceDriver();
-                    if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
+                    if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) {
+                        throw new BadRequestException("缓存线已存在任务,稍后下发!");
+                    } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
                         //下发电气单出
                         to_task_type = "4";
                     }
@@ -1340,11 +1342,12 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 }
                 if (putDevice.getDeviceDriver() instanceof HailiangAutoCacheLineDeviceDriver) {
                     hailiangAutoCacheLineDeviceDriver = (HailiangAutoCacheLineDeviceDriver) putDevice.getDeviceDriver();
-                    if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
+                    if (hailiangAutoCacheLineDeviceDriver.getTask() != 0) {
+                        throw new BadRequestException("缓存线已存在任务,稍后下发!");
+                    } else if (tasksByLinNum.size() == 1 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
                         //下发电气单入
                         to_task_type = "2";
-                    }
-                    if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
+                    } else if (tasksByLinNum.size() == 2 && hailiangAutoCacheLineDeviceDriver.getTask() == 0) {
                         //下发电气双入
                         to_task_type = "3";
                     }
diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java
index 47dc5a9f..3f1a1387 100644
--- a/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java
+++ b/wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/ParamServiceImpl.java
@@ -73,7 +73,6 @@ public class ParamServiceImpl implements ParamService {
             return null;
         }
         final ParamDto obj = json.toJavaObject(ParamDto.class);
-        ;
         return obj;
     }
 
diff --git a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
index 5bf41e35..0795709e 100644
--- a/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
+++ b/wcs/nladmin-ui/src/views/system/monitor/device/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="overflow: hidden">
     <el-row>
-      <div id="container" className="container" style="min-height: 100%"/>
+      <div id="container" className="container" style="min-height: 100%" />
     </el-row>
     <!--点击设备显示信息-->
     <el-dialog
@@ -33,7 +33,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
         <el-form-item label="设备状态" label-width="80px">
@@ -54,7 +54,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="设备状态" label-width="80px">
           <el-radio-group v-model="form.hasGoodStatus">
@@ -64,7 +64,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="物料编码" prop="material_type" label-width="80px">
-          <el-input v-model="form.material_type"/>
+          <el-input v-model="form.material_type" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -77,7 +77,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible4" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="禁用机械手" prop="is_disable" label-width="120px">
           <el-radio-group v-model="form.is_disable">
@@ -101,7 +101,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible5" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="请求标记" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -119,7 +119,7 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible6" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="120px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
         <el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
           <el-radio-group v-model="form.requireSucess">
@@ -144,11 +144,11 @@
     <el-dialog title="设备设置" :visible.sync="dialogFormVisible1" width="35%">
       <el-form :model="form" size="small">
         <el-form-item label="设备编号" prop="device_code" label-width="80px">
-          <el-input v-model="form.device_code" :disabled="true"/>
+          <el-input v-model="form.device_code" :disabled="true" />
         </el-form-item>
 
         <el-form-item label="条码" label-width="80px">
-          <el-input v-model="form.barcode" :disabled="false"/>
+          <el-input v-model="form.barcode" :disabled="false" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">