feat(wms): 物料调拨单

dev
wanghao 1 week ago
parent fb96896926
commit 85f5ff795f

@ -0,0 +1,76 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { MaterialTransferBillsVO, MaterialTransferBillsForm, MaterialTransferBillsQuery } from '@/api/wms/materialTransferBills/types';
/**
*
* @param query
* @returns {*}
*/
export const listMaterialTransferBills = (query?: MaterialTransferBillsQuery): AxiosPromise<MaterialTransferBillsVO[]> => {
return request({
url: '/wms/materialTransferBills/list',
method: 'get',
params: query
});
};
/**
*
* @param transferBillsId
*/
export const getMaterialTransferBills = (transferBillsId: string | number): AxiosPromise<MaterialTransferBillsVO> => {
return request({
url: '/wms/materialTransferBills/' + transferBillsId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addMaterialTransferBills = (data: MaterialTransferBillsForm) => {
return request({
url: '/wms/materialTransferBills',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateMaterialTransferBills = (data: MaterialTransferBillsForm) => {
return request({
url: '/wms/materialTransferBills',
method: 'put',
data: data
});
};
/**
*
* @param transferBillsId
*/
export const delMaterialTransferBills = (transferBillsId: string | number | Array<string | number>) => {
return request({
url: '/wms/materialTransferBills/' + transferBillsId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getWmsMaterialTransferBillsList (query) {
return request({
url: '/wms/materialTransferBills/getWmsMaterialTransferBillsList',
method: 'get',
params: query
});
};

@ -0,0 +1,131 @@
export interface MaterialTransferBillsVO {
/**
* ID
*/
transferBillsId: string | number;
/**
*
*/
transferBillsCode: string;
/**
*
*/
transferOutStoreId: string | number;
/**
*
*/
transferInStoreId: string | number;
/**
*
*/
billsStatus: string;
/**
*
*/
remark: string;
/**
*
*/
tenantId: string | number;
/**
* 0 1
*/
delFlag: string;
/**
*
*/
createDept: number;
/**
*
*/
createBy: number;
/**
*
*/
createTime: string;
/**
*
*/
updateBy: number;
/**
*
*/
updateTime: string;
}
export interface MaterialTransferBillsForm extends BaseEntity {
/**
* ID
*/
transferBillsId?: string | number;
/**
*
*/
transferBillsCode?: string;
/**
*
*/
transferOutStoreId?: string | number;
/**
*
*/
transferInStoreId?: string | number;
/**
*
*/
billsStatus?: string;
/**
*
*/
remark?: string;
}
export interface MaterialTransferBillsQuery extends PageQuery {
/**
*
*/
transferOutStoreId?: string | number;
/**
*
*/
transferInStoreId?: string | number;
/**
*
*/
billsStatus?: string;
/**
*
*/
createTime?: string;
/**
*
*/
params?: any;
}

@ -1,6 +1,6 @@
import request from '@/utils/request'; import request from '@/utils/request';
import { AxiosPromise } from 'axios'; import { AxiosPromise } from 'axios';
import { MaterialTransferRecordVO, MaterialTransferRecordForm, MaterialTransferRecordQuery } from '@/api/wms/materialTransferRecord/types'; import { MaterialTransferRecordForm, MaterialTransferRecordQuery, MaterialTransferRecordVO } from '@/api/wms/materialTransferRecord/types';
/** /**
* *
@ -67,10 +67,10 @@ export const delMaterialTransferRecord = (transferRecordId: string | number | Ar
* @param query * @param query
* @returns {*} * @returns {*}
*/ */
export function getWmsMaterialTransferRecordList (query) { export function getWmsMaterialTransferRecordList(query) {
return request({ return request({
url: '/wms/materialTransferRecord/getWmsMaterialTransferRecordList', url: '/wms/materialTransferRecord/getWmsMaterialTransferRecordList',
method: 'get', method: 'get',
params: query params: query
}); });
}; }

@ -0,0 +1,474 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
<el-form-item label="调出仓库" prop="transferOutStoreId">
<el-select v-model="queryParams.transferOutStoreId" placeholder="请选择调出仓库" clearable @keyup.enter="handleQuery">
<el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="调入仓库" prop="transferInStoreId">
<el-select v-model="queryParams.transferInStoreId" placeholder="请选择调入仓库" clearable @keyup.enter="handleQuery">
<el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
<el-form-item label="创建时间" style="width: 308px">
<el-date-picker
v-model="dateRangeCreateTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"></el-button>
<el-button icon="Refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
</el-card>
</div>
</transition>
<el-card shadow="never">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:materialTransferBills:add']"> </el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:materialTransferBills:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['wms:materialTransferBills:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:materialTransferBills:export']"> </el-button>
</el-col>-->
<right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
</el-row>
</template>
<el-table
v-loading="loading"
border
:data="materialTransferBillsList"
@selection-change="handleSelectionChange"
@expand-change="handleExpandChange"
:row-key="(row) => row.transferBillsId"
>
<el-table-column type="expand">
<template #default="{ row }">
<el-table :data="row.data" v-loading="row.loading" border style="width: 95%; margin: 0 auto">
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="物料说明" align="center" prop="productSpe" />
<el-table-column label="批次号" align="center" prop="batchNumber" />
<el-table-column label="调拨数量" align="center" prop="transferQty" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="调拨时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="调拨记录ID" align="center" prop="transferBillsId" v-if="columns[0].visible" />
<el-table-column label="调拨单号" align="center" prop="transferBillsCode" v-if="columns[1].visible" />
<el-table-column label="调出仓库" align="center" prop="transferOutStoreId" v-if="columns[2].visible">
<template #default="scope">
{{ getWarehouseName(scope.row.transferOutStoreId) }}
</template>
</el-table-column>
<el-table-column label="调入仓库" align="center" prop="transferInStoreId" v-if="columns[3].visible">
<template #default="scope">
{{ getWarehouseName(scope.row.transferOutStoreId) }}
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="billsStatus" v-if="columns[4].visible" />
<el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible" />
<el-table-column label="租户编号" align="center" prop="tenantId" v-if="columns[6].visible" />
<el-table-column label="删除标志" align="center" prop="delFlag" v-if="columns[7].visible" />
<el-table-column label="创建部门" align="center" prop="createDept" v-if="columns[8].visible" />
<el-table-column label="创建人" align="center" prop="createBy" v-if="columns[9].visible" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[10].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[11].visible" />
<el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[12].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<!--<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['wms:materialTransferBills:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:materialTransferBills:remove']"
></el-button>
</el-tooltip>
</template>
</el-table-column>-->
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改物料调拨单对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="1000px" append-to-body>
<el-form ref="materialTransferBillsFormRef" :model="form" :rules="rules" label-width="120px">
<!--<el-form-item label="调拨单号" prop="transferBillsCode">-->
<!-- <el-input v-model="form.transferBillsCode" placeholder="请输入调拨单号" />-->
<!--</el-form-item>-->
<el-row>
<el-col :span="12">
<el-form-item label="调出仓库" prop="transferOutStoreId">
<el-select v-model="form.transferOutStoreId" placeholder="请选择调出仓库" :disabled="selectInventorys.length > 0">
<el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="调入仓库" prop="transferInStoreId">
<el-select v-model="form.transferInStoreId" placeholder="请选择调入仓库">
<el-option v-for="item in warehouseInfoList" :key="item.warehouseId" :label="item.warehouseName" :value="item.warehouseId" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="请输入备注" style="width: 100%" />
</el-form-item>
</el-form>
<el-card>
<template #header>
<div>添加出库物料</div>
</template>
<el-button type="primary" @click="openInventorySelect"></el-button>
<div v-if="selectInventorys.length > 0" style="margin-top: 20px">
<h4>已选择的物料</h4>
<el-table border :data="selectInventorys">
<el-table-column label="批次号" align="center" prop="batchNumber" />
<el-table-column label="物料编码" align="center" prop="productCode" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="单价" align="center" prop="unitPrice" width="80" />
<el-table-column label="当前库存" align="center" prop="inventoryAmount" width="90" />
<el-table-column label="调拨数量" align="center" prop="transferQty" width="140">
<template #default="scope">
<el-input-number
v-model="scope.row.transferQty"
:min="0"
:precision="2"
:step="1"
:max="scope.row.inventoryAmount"
controls-position="right"
size="small"
placeholder="请输入数量"
/>
</template>
</el-table-column>
<el-table-column label="单位" align="center" prop="unitName" width="80" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="60">
<template #default="scope">
<el-button link type="danger" icon="Delete" @click="removeOutDetail(scope.$index)"></el-button>
</template>
</el-table-column>
</el-table>
</div>
</el-card>
<wms-inventory-select
ref="inventorySelectRef"
:multiple="true"
:warehouse-id="form.transferOutStoreId"
@confirmCallBack="handleInventorySelect"
/>
<template #footer>
<div class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="MaterialTransferBills" lang="ts">
import {
addMaterialTransferBills,
delMaterialTransferBills,
getMaterialTransferBills,
listMaterialTransferBills
} from '@/api/wms/materialTransferBills';
import { MaterialTransferBillsForm, MaterialTransferBillsQuery, MaterialTransferBillsVO } from '@/api/wms/materialTransferBills/types';
import { getWmsWarehouseInfoList } from '@/api/wms/warehouseInfo';
import WmsInventorySelect from '@/components/WmsInventorySelect/index.vue';
import { getWmsMaterialTransferRecordList } from '@/api/wms/materialTransferRecord';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const materialTransferBillsList = ref<MaterialTransferBillsVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const dateRangeCreateTime = ref<[DateModelType, DateModelType]>(['', '']);
const queryFormRef = ref<ElFormInstance>();
const materialTransferBillsFormRef = ref<ElFormInstance>();
//
const handleExpandChange = async (row, expandedRows) => {
if (expandedRows.length && !row.data) {
try {
row.loading = true;
const res = await getWmsMaterialTransferRecordList({ transferBillsId: row.transferBillsId });
row.data = res.data;
} finally {
row.loading = false;
}
}
};
//
const warehouseInfoList = ref([]);
//
const inventorySelectRef = ref();
//
const selectInventorys = ref([]);
/** 根据仓库ID获取仓库名称 */
const getWarehouseName = (warehouseId) => {
const warehouse = warehouseInfoList.value.find((item) => item.warehouseId === warehouseId);
return warehouse ? warehouse.warehouseName : warehouseId;
};
/** 打开库存选择器 */
const openInventorySelect = () => {
if (!form.value.transferOutStoreId) {
ElMessage.warning('请先选择仓库');
return;
}
// inventorySelectRef.value.warehouseId = form.value.transferOutStoreId;
inventorySelectRef.value.open();
};
/** 处理库存选择器确认选择 */
const handleInventorySelect = (selectedInventorys) => {
selectInventorys.value = selectedInventorys;
console.log(selectedInventorys);
};
/** 删除选中的出库明细 */
const removeOutDetail = (index) => {
selectInventorys.value.splice(index, 1);
};
/** 获取仓库列表 */
const getWarehouseInfoList = async () => {
const res = await getWmsWarehouseInfoList();
warehouseInfoList.value = res.data || [];
};
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `调拨记录ID`, visible: false },
{ key: 1, label: `调拨单号`, visible: true },
{ key: 2, label: `调出仓库`, visible: true },
{ key: 3, label: `调入仓库`, visible: true },
{ key: 4, label: `状态`, visible: false },
{ key: 5, label: `备注`, visible: true },
{ key: 6, label: `租户编号`, visible: false },
{ key: 7, label: `删除标志`, visible: false },
{ key: 8, label: `创建部门`, visible: false },
{ key: 9, label: `创建人`, visible: false },
{ key: 10, label: `创建时间`, visible: true },
{ key: 11, label: `更新人`, visible: false },
{ key: 12, label: `更新时间`, visible: false }
]);
const initFormData: MaterialTransferBillsForm = {
transferBillsId: undefined,
transferBillsCode: undefined,
transferOutStoreId: undefined,
transferInStoreId: undefined,
billsStatus: undefined,
remark: undefined
};
const data = reactive<PageData<MaterialTransferBillsForm, MaterialTransferBillsQuery>>({
form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
transferOutStoreId: undefined,
transferInStoreId: undefined,
billsStatus: undefined,
params: {
createTime: undefined
}
},
rules: {
// transferBillsId: [{ required: true, message: 'ID', trigger: 'blur' }]
transferOutStoreId: [{ required: true, message: '调出仓库不能为空', trigger: 'blur' }],
transferInStoreId: [{ required: true, message: '调入仓库不能为空', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询物料调拨单列表 */
const getList = async () => {
loading.value = true;
queryParams.value.params = {};
proxy?.addDateRange(queryParams.value, dateRangeCreateTime.value, 'CreateTime');
const res = await listMaterialTransferBills(queryParams.value);
materialTransferBillsList.value = res.rows;
total.value = res.total;
loading.value = false;
};
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
};
/** 表单重置 */
const reset = () => {
form.value = { ...initFormData };
materialTransferBillsFormRef.value?.resetFields();
};
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
};
/** 重置按钮操作 */
const resetQuery = () => {
dateRangeCreateTime.value = ['', ''];
queryFormRef.value?.resetFields();
handleQuery();
};
/** 多选框选中数据 */
const handleSelectionChange = (selection: MaterialTransferBillsVO[]) => {
ids.value = selection.map((item) => item.transferBillsId);
single.value = selection.length != 1;
multiple.value = !selection.length;
};
/** 新增按钮操作 */
const handleAdd = () => {
reset();
selectInventorys.value = [];
dialog.visible = true;
dialog.title = '添加物料调拨单';
};
/** 修改按钮操作 */
const handleUpdate = async (row?: MaterialTransferBillsVO) => {
reset();
const _transferBillsId = row?.transferBillsId || ids.value[0];
const res = await getMaterialTransferBills(_transferBillsId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = '修改物料调拨单';
};
/** 提交按钮 */
const submitForm = () => {
materialTransferBillsFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
//
if (form.value.transferOutStoreId === form.value.transferInStoreId) {
proxy?.$modal.msgError('调出仓库不能等于调入仓库');
return;
}
//
if (selectInventorys.value.length === 0) {
proxy?.$modal.msgError('请至少选择一个库存明细');
return;
}
buttonLoading.value = true;
if (form.value.transferBillsId) {
// await updateMaterialTransferBills(form.value).finally(() => (buttonLoading.value = false));
} else {
const submitData = {
...form.value,
list: selectInventorys.value.map((item) => ({
materielId: item.materielId,
batchNumber: item.batchNumber,
transferQty: item.transferQty,
unitName: item.unitName,
transferOutStoreId: form.value.transferOutStoreId,
transferInStoreId: form.value.transferInStoreId,
inventoryDetailsId: item.inventoryDetailsId,
unitPrice: item.unitPrice,
projectId: item.projectId
}))
};
await addMaterialTransferBills(submitData).finally(() => (buttonLoading.value = false));
}
proxy?.$modal.msgSuccess('操作成功');
dialog.visible = false;
await getList();
}
});
};
/** 删除按钮操作 */
const handleDelete = async (row?: MaterialTransferBillsVO) => {
const _transferBillsIds = row?.transferBillsId || ids.value;
await proxy?.$modal.confirm('是否确认删除物料调拨单编号为"' + _transferBillsIds + '"的数据项?').finally(() => (loading.value = false));
await delMaterialTransferBills(_transferBillsIds);
proxy?.$modal.msgSuccess('删除成功');
await getList();
};
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download(
'wms/materialTransferBills/export',
{
...queryParams.value
},
`materialTransferBills_${new Date().getTime()}.xlsx`
);
};
onMounted(() => {
getList();
getWarehouseInfoList();
});
</script>

@ -36,9 +36,9 @@
<el-card shadow="never"> <el-card shadow="never">
<template #header> <template #header>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!--<el-col :span="1.5">-->
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:materialTransferRecord:add']"> </el-button> <!-- <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['wms:materialTransferRecord:add']"> </el-button>-->
</el-col> <!--</el-col>-->
<!--<el-col :span="1.5">--> <!--<el-col :span="1.5">-->
<!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:materialTransferRecord:edit']"--> <!-- <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:materialTransferRecord:edit']"-->
<!-- >修改--> <!-- >修改-->
@ -254,17 +254,17 @@ const handleInventorySelect = (selectedInventorys) => {
const removeOutDetail = (index) => { const removeOutDetail = (index) => {
selectInventorys.value.splice(index, 1); selectInventorys.value.splice(index, 1);
}; };
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
/** 获取仓库列表 */ /** 获取仓库列表 */
const getWarehouseInfoList = async () => { const getWarehouseInfoList = async () => {
const res = await getWmsWarehouseInfoList(); const res = await getWmsWarehouseInfoList();
warehouseInfoList.value = res.data || []; warehouseInfoList.value = res.data || [];
}; };
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
// //
const columns = ref<FieldOption[]>([ const columns = ref<FieldOption[]>([
{ key: 0, label: `调拨记录ID`, visible: false }, { key: 0, label: `调拨记录ID`, visible: false },

Loading…
Cancel
Save