rev 新需求

hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java

@@ -513,7 +513,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
                             && standardManipulatorStackingSiteDeviceDriver.getMode() != 0
                             && standardManipulatorStackingSiteDeviceDriver.move != 0
                             && ObjectUtil.isEmpty(taskserver.findByNextCode(start_device_code))
-                            && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))) {
+                        /*&& ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))*/) {
                         break;
                     } else {
                         start_device_code = "";

hd/nladmin-system/src/main/resources/config/application-dev.yml

@@ -8,11 +8,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wsw_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
 #      password: ${DB_PWD:P@ssw0rd}
-      password: ${DB_PWD:Root.123456}
+      password: ${DB_PWD:password}
 #      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5

qd/src/views/acs/instruction/index.vue

@@ -111,6 +111,11 @@
         <el-table-column prop="instruction_code" label="指令编号" />
         <el-table-column prop="task_code" label="任务号" />
         <el-table-column prop="vehicle_code" label="载具号" />
+        <el-table-column prop="vehicle_type" label="托盘类型">
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="instruction_status" label="指令状态">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
@@ -213,7 +218,7 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status'],
+  dicts: ['task_status', 'vehicle_type'],
   name: 'Instruction',
   components: { crudOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],

qd/src/views/acs/task/index.vue

@@ -90,7 +90,9 @@
         </el-button>
       </crudOperation>
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title" width="500px"
+      >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item v-if="false" label="任务标识" prop="task_id">
             <el-input v-model="form.task_id" style="width: 370px;"/>
@@ -249,7 +251,9 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler"
+      >
         <el-table-column type="selection" width="25"/>
         <el-table-column v-if="false" prop="task_id" label="任务标识"/>
         <el-table-column prop="task_code" label="任务号"/>
@@ -260,6 +264,11 @@
         <!--          </template>-->
         <!--        </el-table-column>-->
         <el-table-column prop="vehicle_code" label="载具号"/>
+        <el-table-column prop="vehicle_type" label="托盘类型">
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="task_status" label="任务状态">
           <template slot-scope="scope">
             <span v-if="scope.row.task_status==='0' ">就绪</span>
@@ -285,7 +294,9 @@
         <el-table-column prop="remark" label="备注"/>
         <el-table-column prop="create_by" label="创建者"/>
         <el-table-column prop="create_time" label="创建时间" width="135"/>
-        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="150px" align="center">
+        <el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="150px"
+                         align="center"
+        >
           <template slot-scope="scope">
             <el-dropdown trigger="click" @command="handleCommand">
               <span class="el-dropdown-link">
@@ -338,7 +349,7 @@ const defaultForm = {
 export default {
   name: 'Task',
   components: { pagination, crudOperation },
-  dicts: ['task_status', 'task_type'],
+  dicts: ['task_status', 'task_type', 'vehicle_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask } })
@@ -624,6 +635,7 @@ export default {
   cursor: pointer;
   color: #409EFF;
 }
+
 .el-icon-arrow-down {
   font-size: 12px;
 }