root/wms1.0
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-17 08:50:26 +08:00
parent 6f9eb90c58
commit 9deeb8b14c
59 changed files with 1175 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
wcs/nladmin-ui/src/api/acs/instruction/instruction.js
View File

@@ -32,11 +32,11 @@ export function finish(instruction_id) {
})
}
export function cancel(instruction_id) {
export function cancelByLinkNum(linkNum) {
return request({
url: 'api/instruction/cancel/' + instruction_id,
url: 'api/instruction/cancelByLinkNum/' + linkNum,
method: 'post',
data: instruction_id
data: linkNum
})
}
@@ -78,4 +78,20 @@ export function init(instruction_id) {
})
}
export default { add, edit, del, finish, cancel, forceCancel, queryUnFinish, queryByTaskId, reload, init }
export function forceCancelByLinkNum(linkNum) {
return request({
url: 'api/instruction/forceCancelByLinkNum/' + linkNum,
method: 'post',
data: linkNum
})
}
export function finishByLinkNum(linkNum) {
return request({
url: 'api/instruction/finishByLinkNum/' + linkNum,
method: 'post',
data: linkNum
})
}
export default { add, edit, del, finish, cancelByLinkNum, forceCancel, forceCancelByLinkNum, queryByTaskId, reload, init, finishByLinkNum }

8
wcs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -183,7 +183,7 @@
</template>
<script>
import crudInstruction from '@/api/acs/instruction/instruction'
import crudInstruction, { forceCancelByLinkNum } from '@/api/acs/instruction/instruction'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import { getDicts } from '@/api/system/dict'
@@ -289,7 +289,7 @@ export default {
},
// https://www.cnblogs.com/jdWu-d/p/11898666.html
finish(index, row) {
crudInstruction.finish(row.instruction_id).then(res => {
crudInstruction.finishByLinkNum(row.link_num).then(res => {
this.crud.toQuery()
this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
@@ -297,7 +297,7 @@ export default {
})
},
cancel(index, row) {
crudInstruction.cancel(row.instruction_id).then(res => {
crudInstruction.cancelByLinkNum(row.link_num).then(res => {
this.crud.toQuery()
this.crud.notify('取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
@@ -305,7 +305,7 @@ export default {
})
},
forceCancel(index, row) {
crudInstruction.forceCancel(row.instruction_id).then(res => {
crudInstruction.forceCancelByLinkNum(row.link_num).then(res => {
this.crud.toQuery()
this.crud.notify('强制取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {

192
wcs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -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">
@@ -500,7 +500,7 @@ export default {
const obj = { name: '当前温度', value: data[val] }
this.arr.push(obj)
} else if (val === 'finish') {
const obj = { name: '烘箱完成', value: data[val] }
const obj = { name: '工单完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'countdown_house') {
const obj = { name: '恒温倒计时(时)', value: data[val] }
@@ -526,8 +526,176 @@ export default {
} else if (val === 'requireSucess') {
const obj = { name: '请求成功标记', value: data[val] }
this.arr.push(obj)
} else if (val === 'applySucess') {
const obj = { name: 'applySucess', value: data[val] }
} else if (val === 'matching_barcode') {
const obj = { name: '开始匹配条码', value: data[val] }
this.arr.push(obj)
} else if (val === 'matching_barcode_fail') {
const obj = { name: '条码匹配失败', value: data[val] }
this.arr.push(obj)
} else if (val === 'task_type') {
const obj = { name: '任务类型', value: data[val] }
this.arr.push(obj)
} else if (val === 'task_finish') {
const obj = { name: '任务完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'noFeedAgvMessage') {
const obj = { name: '未反馈AGV原因', value: data[val] }
this.arr.push(obj)
} else if (val === 'prepare_ready') {
const obj = { name: '准备位就绪', value: data[val] }
this.arr.push(obj)
} else if (val === 'in_ready') {
const obj = { name: '对接位入箱就绪', value: data[val] }
this.arr.push(obj)
} else if (val === 'in_finish') {
const obj = { name: '对接位入箱完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'out_ready') {
const obj = { name: '对接位出箱就绪', value: data[val] }
this.arr.push(obj)
} else if (val === 'pause') {
const obj = { name: '暂停', value: data[val] }
this.arr.push(obj)
} else if (val === 'checking') {
const obj = { name: '盘点中', value: data[val] }
this.arr.push(obj)
} else if (val === 'check_finish') {
const obj = { name: '盘点完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'check_compel_finish') {
const obj = { name: '盘点强制完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'hoist_target_layer') {
const obj = { name: '提升机条码目的层', value: data[val] }
this.arr.push(obj)
} else if (val === 'prepare_barcode') {
const obj = { name: '准备位条码', value: data[val] }
this.arr.push(obj)
} else if (val === 'docking_barcode') {
const obj = { name: '对接位条码', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode1') {
const obj = { name: '一层条码1', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode2') {
const obj = { name: '一层条码2', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode3') {
const obj = { name: '一层条码3', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode4') {
const obj = { name: '一层条码4', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode5') {
const obj = { name: '一层条码5', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode6') {
const obj = { name: '一层条码6', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode7') {
const obj = { name: '一层条码7', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode8') {
const obj = { name: '一层条码8', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode9') {
const obj = { name: '一层条码9', value: data[val] }
this.arr.push(obj)
} else if (val === 'one_floor_barcode10') {
const obj = { name: '一层条码10', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode1') {
const obj = { name: '二层条码1', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode2') {
const obj = { name: '二层条码2', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode3') {
const obj = { name: '二层条码3', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode4') {
const obj = { name: '二层条码4', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode5') {
const obj = { name: '二层条码5', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode6') {
const obj = { name: '二层条码6', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode7') {
const obj = { name: '二层条码7', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode8') {
const obj = { name: '二层条码8', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode9') {
const obj = { name: '二层条码9', value: data[val] }
this.arr.push(obj)
} else if (val === 'two_floor_barcode10') {
const obj = { name: '二层条码10', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode1') {
const obj = { name: '三层条码1', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode2') {
const obj = { name: '三层条码2', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode3') {
const obj = { name: '三层条码3', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode4') {
const obj = { name: '三层条码4', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode5') {
const obj = { name: '三层条码5', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode6') {
const obj = { name: '三层条码6', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode7') {
const obj = { name: '三层条码7', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode8') {
const obj = { name: '三层条码8', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode9') {
const obj = { name: '三层条码9', value: data[val] }
this.arr.push(obj)
} else if (val === 'three_floor_barcode10') {
const obj = { name: '三层条码10', value: data[val] }
this.arr.push(obj)
} else if (val === 'order') {
const obj = { name: '工单号', value: data[val] }
this.arr.push(obj)
} else if (val === 'full_number') {
const obj = { name: '满料位数量', value: data[val] }
this.arr.push(obj)
} else if (val === 'storage_stock_num') {
const obj = { name: '倒料位数量', value: data[val] }
this.arr.push(obj)
} else if (val === 'now_order_prod_num') {
const obj = { name: '当前箱数量（每框实时)', value: data[val] }
this.arr.push(obj)
} else if (val === 'order_prod_allnum') {
const obj = { name: '工单生产总量', value: data[val] }
this.arr.push(obj)
} else if (val === 'now_order_prod_num') {
const obj = { name: '当前生产总量（订单实时）', value: data[val] }
this.arr.push(obj)
} else if (val === 'noApplyTaskMessage') {
const obj = { name: '未申请任务原因', value: data[val] }
this.arr.push(obj)
} else if (val === 'line_stock_num') {
const obj = { name: '线体库存数量(接料位、满料位数量和)', value: data[val] }
this.arr.push(obj)
} else if (val === 'order_compel_finish') {
const obj = { name: '工单强制完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'empty_put_finish') {
const obj = { name: '空箱位空箱补给完成', value: data[val] }
this.arr.push(obj)
} else if (val === 'agv_take_finish') {
const obj = { name: '满箱已运出满箱位', value: data[val] }
this.arr.push(obj)
}
}