houjianlan
/
kams4_test_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

上架

main
奥德彪本彪\92525 2024-09-25 22:24:00 +08:00
parent f45addc800
commit a3624bc45b
7 changed files with 85 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/agvTask.js
View File

@ -24,4 +24,13 @@ export function edit(data) {
})
}
export default { add, edit, del }
export function missionStateCallback(data) {
return request({
url: 'interfaces/api/amr/missionStateCallback',
method: 'post',
data
})
}
export default { add, edit, del ,missionStateCallback}

11
src/api/inventory.js
View File

@ -39,13 +39,4 @@ export function downloadXb(data) {
data
})
}
export function queryStockShangJia(status) {
return request({
url: 'api/inventory/queryStockShangJia',
method: 'get',
params: {status}
})
}
export default {add, edit, del, knywInventory, downloadXb,queryStockShangJia}
export default {add, edit, del, knywInventory, downloadXb}

18
src/api/task.js
View File

@ -43,6 +43,22 @@ export function queryTaskData(params) {
})
}
export function queryByPutAwayTask(status) {
return request({
url: 'api/task/queryByPutAwayTask',
method: 'get',
params: {status}
})
}
export function stockShangJia(data) {
return request({
url: 'api/task/stockShangJia',
method: 'post',
data
})
}
export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData}
export default { add, edit, del ,getTaskInfo,queryPickTask,queryTaskData,queryByPutAwayTask,stockShangJia}

6
src/views/business-agvTask/agvTask/index.vue
View File

@ -312,11 +312,7 @@ export default {
}
this.MissionStateCallback.missionCode = data.id
this.MissionStateCallback.containerCode = data.stockCode
if (data.type == 'ASN' || data.type == 'FB_RETURN') {
this.MissionStateCallback.missionStatus = 'FORK_DOWN'
} else {
this.MissionStateCallback.missionStatus = 'COMPLETED'
}
crudAgvTask.missionStateCallback(this.MissionStateCallback).then(res => {
if (res.status == 200) {
this.crud.notify("任务完成!", CRUD.NOTIFICATION_TYPE.SUCCESS);
@ -348,7 +344,7 @@ export default {
type: 'warning'
}).then(() => {
if (data.type == 'ASN') {
return this.crud.notify('原材料入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
return this.crud.notify('入库任务不允许重新发送!', CRUD.NOTIFICATION_TYPE.ERROR);
}
this.MissionStateCallback.missionCode = data.id
this.MissionStateCallback.missionStatus = 'RESEND'

37
src/views/business-asn/asn/index.vue
View File

@ -315,7 +315,7 @@ import {queryItemAll} from '@/api/item'
import {formatDate} from '@/utils/commonUtils'
import {xbjsOut} from "@/api/pickOut";
import viewAsnDetail from "@/views/business-asn/asn/viewAsnDetail.vue"
import crudInv from "@/api/inventory"
import crudTask from "@/api/task"
const defaultForm = {
id: null,
@ -467,7 +467,7 @@ export default {
stockShangJiaDialogVisible: false,
stockOptionsMap: new Map(),
stockShangjiaForm: {
id: null,
taskId: null,
stock: {}
}
@ -564,7 +564,6 @@ export default {
},
asnDetailRouter(datas) {
this.$refs.viewAsnDetail.asnFrom = datas
console.log(this.asnFrom.status)
this.$refs.viewAsnDetail.queryAsnDetail(datas.id)
this.$refs.viewAsnDetail.dialogInsertAsn = true
//this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
@ -688,21 +687,23 @@ export default {
})
},
queryStockShangjia() {
crudInv.queryStockShangJia('待入库').then(res => {
this.stockOptions = res.map(item => item.stock);
// 清空 Map
this.stockOptionsMap.clear();
// 处理数据并存入 Map
res.forEach(item => {
this.stockOptionsMap.set(item.id, item.stock);
});
//待上架任务
crudTask.queryByPutAwayTask('OPEN').then(res => {
// 使用一个对象来存储中间结果，减少重复计算
const stockOptions = res.map(task => task.srcStock);
// 直接使用map方法创建Map
this.stockOptionsMap = new Map(res.map(task => [task.id, task.srcStock]));
// 更新stockOptions
this.stockOptions = stockOptions;
})
},
getStock(stockOption) {
const invId = this.getKeyByValue(stockOption);
this.stockShangjiaForm.id = invId
const taskId = this.getKeyByValue(stockOption);
this.stockShangjiaForm.taskId = taskId
},
getKeyByValue(value) {
for (const [key, val] of this.stockOptionsMap.entries()) {
@ -713,7 +714,15 @@ export default {
return null;
},
stockShangJiaCof(){
crudTask.stockShangJia(this.stockShangjiaForm.taskId).then(res => {
if (res.status == 200) {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS);
this.crud.toQuery();
this.stockShangJiaDialogVisible = false;
} else {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR);
}
})
},
stockShangJiaClose(done) {
this.stockShangjiaForm = {};

31
src/views/business-asn/asn/viewAsnDetail.vue
View File

@ -150,12 +150,12 @@
@selection-change="crud.selectionChangeHandler" height="35vh"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="item.code " label="品番号" width="100px">
<el-table-column prop="item.code " label="料号" width="100px">
<template slot-scope="scope">
<div>{{ scope.row.item == null ? '' : scope.row.item.code }}</div>
</template>
</el-table-column>
<el-table-column prop="item.name" label="品番" width="100px">
<el-table-column prop="item.name" label="物料描述" width="100px">
<template slot-scope="scope">
<div>{{ scope.row.item == null ? '' : scope.row.item.name }}</div>
</template>
@ -200,11 +200,19 @@
:disabled="scope.row.receivedQty>0"
style="float: left"
size="mini" type="primary" icon="el-icon-edit" @click="toEditAsnDetail(scope.row)"/>
<udOperation
:data="scope.row"
:permission="permission"
:show-edit="false"
<el-popconfirm
title="是否确定删除？"
@confirm="deleteAsnDetail(scope.row)"
>
<el-button
class="filter-item"
slot="reference"
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="scope.row.receivedQty>0"
/>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
@ -259,6 +267,7 @@
<!--表单组件-->
<el-dialog
title="添加明细"
:visible.sync="dialogInsertAsnDetail"
center
width="400px"
@ -951,6 +960,16 @@ export default {
this.form = data;
this.dialogInsertAsnDetail = true;
},
deleteAsnDetail(data){
crudAsnDetail.del(data.id).then(res => {
if(res.status==200){
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
}else {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
}
})
},
asnDetailZl(datas) {
this.zlForm = datas[0];
this.zlDialogVisible = true;

11
src/views/business-inv/inventory/index.vue
View File

@ -82,19 +82,19 @@
<el-form ref="ywFrom" :rules="ywRules" :model="inventoryButton.inventoryYW"
size="small" label-width="90px"
>
<el-form-item label="品番">
<el-form-item label="料号">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.code" placeholder="品番"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="货品名称">
<el-form-item label="物料描述">
<el-input v-model="inventoryButton.inventoryYW.inventory.itemKey.item.name" placeholder="货品名称"
:disabled="true"
style="width: 220px;"
></el-input>
</el-form-item>
<el-form-item label="原库位">
<el-form-item label="库位号">
<el-input v-model="inventoryButton.inventoryYW.inventory.point.name" placeholder="原库位" :disabled="true"
style="width: 220px;"
></el-input>
@ -133,10 +133,10 @@
:title="'库存修改'" width="520px"
>
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="110px">
<el-form-item label="品番">
<el-form-item label="料号">
<el-input v-model="form.itemKey.item.code" style="width: 300px;" placeholder="品番" :disabled="true"/>
</el-form-item>
<el-form-item label="货品名" prop="name">
<el-form-item label="物料描述" prop="name">
<el-input v-model="form.itemKey.item.name" style="width: 300px;" placeholder="货品名" clearable/>
</el-form-item>
<el-form-item label="调整后的数量" prop="quantity">
@ -171,6 +171,7 @@
<el-table-column prop="point.code" label="库位号" align="center"/>
<el-table-column prop="itemKey.item.code" label="料号"/>
<el-table-column prop="itemKey.item.name" label="物料描述"/>
<el-table-column prop="status" label="状态"/>
<el-table-column prop="quantity" label="数量"/>
<el-table-column prop="queuedQty" label="占用数"/>
<el-table-column prop="itemKey.propC1" label="批次号"/>