更新

acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue

@@ -30,8 +30,8 @@
             v-model="plc_id"
             placeholder="无"
             clearable
-            @change="changePlc"
             filterable
+            @change="changePlc"
           >
             <el-option
               v-for="item in dataOpcPlcs"
@@ -97,6 +97,11 @@
         </el-row>
 
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="最大数量">
+              <el-input v-model="form.max_emptypalletnum" />
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="关联设备" prop="device_code">
               <el-select

acs/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue

@@ -152,6 +152,42 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="门" prop="door" label-width="100px">
+              <el-select
+                v-model="form.door"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in doors"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.key"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="楼" prop="floor" label-width="100px">
+              <el-select
+                v-model="form.floor"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in floors"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.key"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
     </el-card>
 
@@ -298,6 +334,20 @@ export default {
       plc_code: '',
       opc_id: '',
       opc_code: '',
+      doors: [{
+        key: '1',
+        label: '前门'
+      }, {
+        key: '2',
+        label: '后门'
+      }],
+      floors: [{
+        key: '1',
+        label: '1楼'
+      }, {
+        key: '2',
+        label: '2楼'
+      }],
       address: '',
       configLoading: false,
       dataOpcservers: [],

acs/nladmin-ui/src/views/acs/instruction/index.vue

@@ -109,6 +109,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
         <el-table-column prop="instruction_code" label="指令编号" />
+        <el-table-column prop="instruction_type" label="指令类型" />
         <el-table-column prop="link_num" label="关联编号" />
         <el-table-column prop="task_code" label="任务号" />
         <el-table-column prop="vehicle_code" label="载具号" />

acs/nladmin-ui/src/views/acs/task/index.vue

@@ -251,6 +251,7 @@
         <el-table-column type="selection" width="25" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务号" />
+        <el-table-column prop="task_type" label="任务类型" />
         <el-table-column prop="link_num" label="关联编号" />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="task_status" label="任务状态">
@@ -266,9 +267,9 @@
           </template>
         </el-table-column>-->
         <el-table-column prop="priority" label="任务优先级" />
-        <el-table-column prop="start_point_code" label="取货点" width="120px"/>
+        <el-table-column prop="start_point_code" label="取货点" width="120px" />
         <el-table-column prop="put_point_code" label="倒料点" />
-        <el-table-column prop="next_point_code" label="放货点" width="120px"/>
+        <el-table-column prop="next_point_code" label="放货点" width="120px" />
         <el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">
             <span v-if="scope.row.compound_task==='0' ">否</span>