root/weiSuWei
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 新需求

Browse Source
This commit is contained in:
gengby
2023-04-25 11:09:31 +08:00
parent e66b84aa6c
commit 74fd132efd
4 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -8,11 +8,11 @@ spring:
druid: druid:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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 # 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} username: ${DB_USER:root}
# password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:P@ssw0rd}
password: ${DB_PWD:Root.123456} password: ${DB_PWD:password}
# password: ${DB_PWD:123456} # password: ${DB_PWD:123456}
# 初始连接数 # 初始连接数
initial-size: 5 initial-size: 5

7
qd/src/views/acs/instruction/index.vue
View File

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

78
qd/src/views/acs/task/index.vue
View File

@@ -32,7 +32,7 @@
style="width: 190px" style="width: 190px"
@change="crud.toQuery" @change="crud.toQuery"
> >
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" /> <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value"/>
</el-select> </el-select>
<el-select <el-select
v-model="query.status" v-model="query.status"
@@ -44,7 +44,7 @@
style="width: 190px" style="width: 190px"
@change="crud.toQuery" @change="crud.toQuery"
> >
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" /> <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value"/>
</el-select> </el-select>
<el-input <el-input
v-model="query.point_code" v-model="query.point_code"
@@ -90,10 +90,12 @@
</el-button> </el-button>
</crudOperation> </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 ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="任务标识" prop="task_id"> <el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;" /> <el-input v-model="form.task_id" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="物料类型"> <el-form-item label="物料类型">
<el-select <el-select
@@ -234,13 +236,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="优先级"> <el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" /> <el-input v-model="form.priority" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="载具号"> <el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" /> <el-input v-model="form.vehicle_code" style="width: 370px;"/>
</el-form-item> </el-form-item>
<el-form-item label="描述信息" prop="description"> <el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" /> <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -249,17 +251,24 @@
</div> </div>
</el-dialog> </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%;"
<el-table-column type="selection" width="25" /> @selection-change="crud.selectionChangeHandler"
<el-table-column v-if="false" prop="task_id" label="任务标识" /> >
<el-table-column prop="task_code" label="任务号" /> <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_name" label="任务类型"/> <el-table-column prop="task_type_name" label="任务类型"/>
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.task_type==='0' ">普通任务</span>--> <!-- <span v-if="scope.row.task_type==='0' ">普通任务</span>-->
<!-- <span v-if="scope.row.task_type==='1' ">特殊任务</span>--> <!-- <span v-if="scope.row.task_type==='1' ">特殊任务</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="vehicle_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="task_status" label="任务状态"> <el-table-column prop="task_status" label="任务状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.task_status==='0' ">就绪</span> <span v-if="scope.row.task_status==='0' ">就绪</span>
@@ -268,28 +277,30 @@
<span v-if="scope.row.task_status==='4' ">暂停</span> <span v-if="scope.row.task_status==='4' ">暂停</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="priority" label="任务优先级" /> <el-table-column prop="priority" label="任务优先级"/>
<el-table-column prop="start_point_code" label="起点" /> <el-table-column prop="start_point_code" label="起点"/>
<el-table-column prop="start_parent_code" label="父起点点位" width="100" /> <el-table-column prop="start_parent_code" label="父起点点位" width="100"/>
<el-table-column prop="next_point_code" label="终点" /> <el-table-column prop="next_point_code" label="终点"/>
<el-table-column prop="next_parent_code" label="父终点点位" width="100" /> <el-table-column prop="next_parent_code" label="父终点点位" width="100"/>
<el-table-column prop="compound_task" label="复合任务"> <el-table-column prop="compound_task" label="复合任务">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.compound_task==='0' ">否</span> <span v-if="scope.row.compound_task==='0' ">否</span>
<span v-if="scope.row.compound_task==='1' ">是</span> <span v-if="scope.row.compound_task==='1' ">是</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="compound_task_data" width="200" label="复合路线" /> <el-table-column prop="compound_task_data" width="200" label="复合路线"/>
<el-table-column prop="matarial" label="物料" /> <el-table-column prop="matarial" label="物料"/>
<el-table-column prop="quantity" label="数量" /> <el-table-column prop="quantity" label="数量"/>
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注"/>
<el-table-column prop="create_by" label="创建者" /> <el-table-column prop="create_by" label="创建者"/>
<el-table-column prop="create_time" label="创建时间" width="135" /> <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"> <template slot-scope="scope">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
<i class="el-icon-menu" /> <i class="el-icon-menu"/>
</span> </span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item> <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
@@ -301,7 +312,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination/>
</div> </div>
</div> </div>
</template> </template>
@@ -338,10 +349,10 @@ const defaultForm = {
export default { export default {
name: 'Task', name: 'Task',
components: { pagination, crudOperation }, components: { pagination, crudOperation },
dicts: ['task_status', 'task_type'], dicts: ['task_status', 'task_type', 'vehicle_type'],
mixins: [presenter(), header(), form(defaultForm), crud()], mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() { cruds() {
return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask }}) return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask } })
}, },
data() { data() {
const checkFromY = (rule, value, callback) => { const checkFromY = (rule, value, callback) => {
@@ -624,6 +635,7 @@ export default {
cursor: pointer; cursor: pointer;
color: #409EFF; color: #409EFF;
} }
.el-icon-arrow-down { .el-icon-arrow-down {
font-size: 12px; font-size: 12px;
} }