Compare commits

..

8 Commits

5 changed files with 1316 additions and 1558 deletions

View File

@@ -1,19 +1,11 @@
import request from '@/utils/request'
// 查询库存单据列表
export function listBill(query) {
export function listBill(data) {
return request({
url: '/wisdom/bill/list',
method: 'get',
params: query
})
}
// 查询库存单据详细
export function getBill(id) {
return request({
url: '/wisdom/bill/' + id,
method: 'get'
method: 'POST',
data: data
})
}
@@ -29,11 +21,88 @@ export function addBill(data) {
// 修改库存单据
export function updateBill(data) {
return request({
url: '/wisdom/bill',
method: 'put',
url: '/wisdom/bill/update',
method: 'post',
data: data
})
}
// 查询库存单据明细列表
export function listStock(id) {
return request({
url: '/wisdom/record/listByBillNo/' + id,
method: 'get'
})
}
// 修改库存单据
export function appendBill(data) {
return request({
url: '/wisdom/bill/append',
method: 'post',
data: data
})
}
// 移库
export function moveRecord(data) {
return request({
url: '/inventory/move/add',
method: 'post',
data: data
})
}
// 修改库存单据明细内容
export function updateRecord(data) {
return request({
url: '/wisdom/record/update',
method: 'post',
data: data
})
}
// 撤销入库
export function backoutRecord(data) {
return request({
url: '/wisdom/record/rollback',
method: 'post',
data: data
})
}
// 一键入库
export function recordFinish(data) {
return request({
url: '/wisdom/record/finish',
method: 'post',
data: data
})
}
// 删除库存单据
export function delBill(id) {
@@ -43,20 +112,13 @@ export function delBill(id) {
})
}
// 查询库存单据明细列表
export function listStock(id) {
return request({
url: '/wisdom/record/listByBillNo/' + id,
method: 'get'
})
}
// 查询库存单据详细
// export function getBill(id) {
// return request({
// url: '/wisdom/bill/' + id,
// method: 'get'
// })
// }
// 查询库存单据明细详细
export function getStock(id) {

View File

@@ -11,9 +11,9 @@
<tbody>
<tr>
<td class="label-td">{{isRuKu ? '入库类型' : '出库类型'}}</td>
<td class="value-td">{{ isRuKu ? billAllObj[0]?.rkTypeName : billAllObj[0]?.ckTypeName }}</td>
<td class="value-td">{{ isRuKu ? billAllObj[0]?.operationTypeName : billAllObj[0]?.ckTypeName }}</td>
<td class="label-td">{{isRuKu ? '入库日期' : '出库日期'}}</td>
<td class="value-td">{{ isRuKu ? parseTime(billAllObj[0]?.rkTime, '{y}-{m}-{d} {h}:{i}:{s}') : parseTime(billAllObj[0]?.lyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</td>
<td class="value-td">{{ isRuKu ? parseTime(billAllObj[0]?.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') : parseTime(billAllObj[0]?.lyTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</td>
</tr>
<tr>
<td class="label-td">订单编号</td>
@@ -71,11 +71,11 @@
:cell-style="tableCellStyle"
>
<el-table-column type="index" label="序号" align="center" width="50" />
<el-table-column label="库存状态" align="center" width="100">
<!-- <el-table-column label="库存状态" align="center" width="100">
<template #default="scope">
<span>{{ isChukuFun(scope.row.isChuku) }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="wlNo" label="物料编码" align="center" width="100" />
<el-table-column prop="wlMs" label="物料描述" align="center" min-width="180" />
<el-table-column prop="dw" label="计量单位" align="center" width="60" />

View File

@@ -54,6 +54,7 @@
<el-table v-loading="loading" :data="pcdedetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库位编号" align="center" prop="pcode" />
<el-table-column label="RFID" align="center" width="250" prop="encodedId" />
<el-table-column label="所属场景" align="center" prop="sceneName" />
<el-table-column label="所属大库" align="center" prop="parentWarehouseName" />
<el-table-column label="所属小库" align="center" prop="warehouseName" />

View File

@@ -530,6 +530,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef");
importTime.value=''
handleQuery();
}

File diff suppressed because it is too large Load Diff