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

add:增加一楼内包间点位移库相关逻辑。

Browse Source
This commit is contained in:
gongbaoxiong
2024-12-27 16:14:11 +08:00
parent 5de252e2e7
commit ce84f2ce50
34 changed files with 1528 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
View File

@@ -46,7 +46,7 @@
<el-table-column show-overflow-tooltip prop="quanlity_in_box" label="箱内子卷数" align="center" />
<el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
<el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />
<!-- <el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />-->
<el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
<el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
</el-table>
@@ -122,7 +122,7 @@
<el-table-column show-overflow-tooltip prop="container_name" label="子卷号" align="center" />
<el-table-column show-overflow-tooltip prop="paper_tube_description" label="子卷规格" align="center" />
<el-table-column show-overflow-tooltip prop="paper_weight" label="子管重量" align="center" />
<el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />
<!-- <el-table-column show-overflow-tooltip prop="weight" label="子卷重量" align="center" />-->
<el-table-column show-overflow-tooltip prop="box_type" label="木箱料号" align="center" />
</el-table>
</el-card>

29
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -139,10 +139,11 @@
<el-table-column prop="point_code4" label="放货点2" width="100" show-overflow-tooltip />
<el-table-column prop="car_no" label="车号" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="100" show-overflow-tooltip />
<el-table-column prop="task_group_id" label="关联任务" width="100" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编码1" width="130" show-overflow-tooltip />
<el-table-column prop="vehicle_code2" label="载具编码2" width="100" show-overflow-tooltip />
<el-table-column prop="request_param" label="请求参数" min-width="120" show-overflow-tooltip />
<el-table-column prop="response_param" label="响应参数" min-width="120" show-overflow-tooltip />
<el-table-column prop="request_param" label="请求参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="response_param" label="响应参数" min-width="120" :formatter="formatSignal" show-overflow-tooltip/>
<el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" width="135" show-overflow-tooltip />
<el-table-column prop="create_time" label="创建时间" width="135" show-overflow-tooltip />
@@ -294,6 +295,30 @@ export default {
}
})
},
formatSignal(row, column) {
if (row.task_type === '010911') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
}
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
}
} else if (row.task_type === '010904') {
if (column.property === 'request_param') {
return row.request_param === '3' ? '取空载具信号已发送' : '取空载具信号未发送';
}
} else if (row.task_type === '010901') {
if (column.property === 'response_param') {
return row.car_no === '4' ? '放满轴信号已发送' : '放满轴信号未发送';
}
}
else if (row.task_type === '010905'||row.task_type === '010913') {
if (column.property === 'response_param') {
return row.response_param === '1' ? '二次分配已分配' : '二次分配未分配';
}
}
return row[column.property];
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {