|
|
|
@ -29,36 +29,55 @@ |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form :inline="true" label-position="top"> |
|
|
|
<el-form-item label="任务单号"> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.taskNo" placeholder="请输入任务单号"></el-input> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.taskNo" placeholder="请输入任务单号" clearable></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="来源类型"> |
|
|
|
<el-select v-model="queryHeaderData.sourceType" placeholder="请选择" style="width: 150px;"> |
|
|
|
<el-form-item label="任务类型"> |
|
|
|
<el-select v-model="queryHeaderData.sourceType" placeholder="请选择" style="width: 150px;" clearable> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="领料" value="ISSUE"></el-option> |
|
|
|
<el-option label="入库" value="INBOUND"></el-option> |
|
|
|
<el-option label="出库" value="OUTBOUND"></el-option> |
|
|
|
<el-option label="移库" value="TRANSFER"></el-option> |
|
|
|
<el-option label="运输栈板" value="运输栈板"></el-option> |
|
|
|
<el-option label="预约取托盘" value="预约取托盘"></el-option> |
|
|
|
<el-option label="预约运输栈板" value="预约运输栈板"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="来源单号"> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.sourceBillNo" placeholder="请输入来源单号"></el-input> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.sourceBillNo" placeholder="请输入来源单号" clearable></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="物料编码"> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.partNo" placeholder="请输入物料编码"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="AGV编码"> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.agvCode" placeholder="请输入AGV编码"></el-input> |
|
|
|
<!-- <el-form-item label="物料编码">--> |
|
|
|
<!-- <el-input style="width: 150px;" v-model="queryHeaderData.partNo" placeholder="请输入物料编码" clearable></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<!-- <el-form-item label="AGV编码">--> |
|
|
|
<!-- <el-input style="width: 150px;" v-model="queryHeaderData.agvCode" placeholder="请输入AGV编码" clearable></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
<el-form-item label="托盘编码"> |
|
|
|
<el-input style="width: 150px;" v-model="queryHeaderData.palletId" placeholder="请输入托盘编码" clearable></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="任务状态"> |
|
|
|
<el-select v-model="queryHeaderData.status" placeholder="请选择" style="width: 150px;"> |
|
|
|
<el-select v-model="queryHeaderData.status" placeholder="请选择" style="width: 150px;" clearable> |
|
|
|
<el-option label="全部" value=""></el-option> |
|
|
|
<el-option label="已创建" value="CREATED"></el-option> |
|
|
|
<el-option label="已下发WCS" value="SENT_TO_WCS"></el-option> |
|
|
|
<el-option label="执行中" value="EXECUTING"></el-option> |
|
|
|
<el-option label="失败" value="FAILED"></el-option> |
|
|
|
<el-option label="已取消" value="CANCELED"></el-option> |
|
|
|
<el-option label="已预约" value="已预约"></el-option> |
|
|
|
<el-option label="已创建" value="已创建"></el-option> |
|
|
|
<el-option label="已完成" value="已完成"></el-option> |
|
|
|
<el-option label="已取消" value="已取消"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="创建开始日期"> |
|
|
|
<el-date-picker |
|
|
|
v-model="queryHeaderData.startDate" |
|
|
|
type="date" |
|
|
|
placeholder="选择日期" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
style="width: 150px;"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="创建结束日期"> |
|
|
|
<el-date-picker |
|
|
|
v-model="queryHeaderData.endDate" |
|
|
|
type="date" |
|
|
|
placeholder="选择日期" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
style="width: 150px;"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
@ -86,9 +105,7 @@ |
|
|
|
class="detail-table"> |
|
|
|
<el-table-column prop="seqNo" label="序号" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="actionType" label="动作类型" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="fromLocation" label="起始位置" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="toLocation" label="目标位置" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="agvCode" label="AGV编码" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="toLocation" label="位置" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="status" label="状态" width="100" align="center"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="startTime" label="开始时间" width="160" align="center"> |
|
|
|
@ -101,7 +118,6 @@ |
|
|
|
{{ scope.row.completeTime | dateFormat }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="comment" label="备注" min-width="150"></el-table-column> |
|
|
|
<el-table-column prop="errorMsg" label="错误信息" min-width="200"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<span v-if="scope.row.errorMsg" style="color: red;">{{ scope.row.errorMsg }}</span> |
|
|
|
@ -112,37 +128,24 @@ |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
<el-table-column prop="taskNo" label="任务单号" width="180" align="center"></el-table-column> |
|
|
|
<el-table-column prop="sourceType" label="来源类型" width="100" align="center"> |
|
|
|
<el-table-column prop="taskNo" label="任务单号" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="sourceType" label="任务类型" width="100" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
{{ getSourceTypeText(scope.row.sourceType) }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="sourceBillNo" label="来源单号" width="150" align="center"></el-table-column> |
|
|
|
<el-table-column prop="partNo" label="物料编码" width="150" align="center"></el-table-column> |
|
|
|
<el-table-column prop="qty" label="数量" width="100" align="center"></el-table-column> |
|
|
|
<el-table-column prop="batchNo" label="批次号" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="serialNo" label="标签号" width="150" align="center"></el-table-column> |
|
|
|
<el-table-column prop="fromLocation" label="起始库位" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="toLocation" label="目标库位" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="palletId" label="托盘ID" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="agvCode" label="AGV编码" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="sourceBillNo" label="来源单号" width="120" align="center"></el-table-column> |
|
|
|
<el-table-column prop="status" label="状态" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="fromLocation" label="起始库位" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="toLocation" label="目标库位" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="toArea" label="目标区域" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="palletId" label="托盘ID" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="palletType" label="托盘类型" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="priority" label="优先级" width="80" align="center"></el-table-column> |
|
|
|
<el-table-column prop="status" label="状态" width="120" align="center"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="wmsSendTime" label="WMS发送时间" width="160" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
{{ scope.row.wmsSendTime | dateFormat }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="startTime" label="开始时间" width="160" align="center"> |
|
|
|
<el-table-column prop="wcsTaskId" label="WCS任务ID" width="100" align="center"></el-table-column> |
|
|
|
<el-table-column prop="errorCode" label="错误代码" width="120" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
{{ scope.row.startTime | dateFormat }} |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="completeTime" label="完成时间" width="160" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
{{ scope.row.completeTime | dateFormat }} |
|
|
|
<span v-if="scope.row.errorCode" style="color: red;">{{ scope.row.errorCode }}</span> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="errorMsg" label="错误信息" min-width="200"> |
|
|
|
@ -159,9 +162,9 @@ |
|
|
|
<!-- TUSK操作列 --> |
|
|
|
<el-table-column label="操作" width="150" align="center" fixed="right"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<a size="mini" type="primary" @click="adjustPriority(scope.row)" |
|
|
|
<a size="mini" type="primary" @click="adjustPriority(scope.row)" v-if="scope.row.status!='已取消'&&scope.row.status!='已完成'" |
|
|
|
>调整优先级</a> |
|
|
|
<a size="mini" type="danger" style="color: red" @click="cancelTuskTask(scope.row)" |
|
|
|
<a size="mini" type="danger" style="color: red" @click="cancelTuskTask(scope.row)" v-if="scope.row.status!='已取消'&&scope.row.status!='已完成'" |
|
|
|
>取消</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -440,9 +443,12 @@ export default { |
|
|
|
sourceBillNo: '', |
|
|
|
partNo: '', |
|
|
|
agvCode: '', |
|
|
|
palletId: '', // 托盘编码 - rqrq |
|
|
|
status: '', |
|
|
|
startDate: '', // 创建开始日期 - rqrq |
|
|
|
endDate: '', // 创建结束日期 - rqrq |
|
|
|
page: 1, |
|
|
|
size: 10, |
|
|
|
size: 20, |
|
|
|
totalCount: 0 |
|
|
|
}, |
|
|
|
// table高度 |
|
|
|
@ -600,13 +606,11 @@ export default { |
|
|
|
return typeMap[status] || 'info' |
|
|
|
}, |
|
|
|
|
|
|
|
// 获取来源类型文本 |
|
|
|
// 获取来源类型文本 - rqrq |
|
|
|
getSourceTypeText(sourceType) { |
|
|
|
const typeMap = { |
|
|
|
'ISSUE': '领料', |
|
|
|
'INBOUND': '入库', |
|
|
|
'OUTBOUND': '出库', |
|
|
|
'TRANSFER': '移库' |
|
|
|
'运输栈板': '运输栈板', |
|
|
|
'WCS运输栈板': 'WCS运输栈板' |
|
|
|
} |
|
|
|
return typeMap[sourceType] || sourceType |
|
|
|
}, |
|
|
|
@ -625,12 +629,13 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
// 导出相关方法 |
|
|
|
// 导出相关方法 - rqrq |
|
|
|
fields() { |
|
|
|
return { |
|
|
|
"任务单号": "taskNo", |
|
|
|
"来源类型": "sourceType", |
|
|
|
"来源单号": "sourceBillNo", |
|
|
|
"行号": "itemNo", |
|
|
|
"物料编码": "partNo", |
|
|
|
"数量": "qty", |
|
|
|
"批次号": "batchNo", |
|
|
|
@ -638,9 +643,18 @@ export default { |
|
|
|
"起始库位": "fromLocation", |
|
|
|
"目标库位": "toLocation", |
|
|
|
"托盘ID": "palletId", |
|
|
|
"托盘类型": "palletType", |
|
|
|
"目标区域": "toArea", |
|
|
|
"AGV编码": "agvCode", |
|
|
|
"优先级": "priority", |
|
|
|
"状态": "status", |
|
|
|
"WCS任务ID": "wcsTaskId", |
|
|
|
"错误代码": "errorCode", |
|
|
|
"错误信息": "errorMsg", |
|
|
|
"WMS发送时间": "wmsSendTime", |
|
|
|
"WCS接收时间": "wcsReceiveTime", |
|
|
|
"开始时间": "startTime", |
|
|
|
"完成时间": "completeTime", |
|
|
|
"创建时间": "createdTime" |
|
|
|
} |
|
|
|
}, |
|
|
|
|