feat(wms): 新增调拨打印功能

- 添加调拨打印相关的 API 接口和方法
- 实现调拨打印列表、详情、新增、修改、删除等功能
- 添加调拨打印相关的数据结构和类型定义
- 优化调拨任务列表的展示和操作
master
zangch@mesnac.com 5 months ago
parent 202b73f730
commit 24c51045a6

@ -1,6 +1,7 @@
import request from '@/utils/request';
export const allocateOrderlList = (query) => {
return request({
url: '/wms/allocateOrder/list',
@ -83,3 +84,66 @@ export const delAllocateOrderDetail = (aoDId) => {
method: 'delete'
});
};
/*以下为新增测试*/
// 调拨分包打印
export const allocatePackagePrint = (data) => {
return request({
url: '/wms/wmsAllocateTask/packagePrint',
method: 'post',
data
});
};
// 根据调拨明细ID查询任务列表
export const queryTasksByDetailId = (aoDId) => {
return request({
url: '/wms/wmsAllocateTask/queryTasksByDetailId/' + aoDId,
method: 'get'
});
};
// 验证是否可打印(基于业务逻辑的前端验证)
export const validatePrintable = (data) => {
return request({
url: '/wms/wmsAllocateTask/validatePrintable',
method: 'post',
data
});
};
// 触发打印条码
export const triggerPrint = (allocateTaskId) => {
return request({
url: '/wms/wmsAllocateTask/triggerPrint/' + allocateTaskId,
method: 'post'
});
};
// 重新创建调拨任务
export const recreateAllocateTasks = (data) => {
return request({
url: '/wms/wmsAllocateTask/recreateTasks',
method: 'post',
data
});
};
// 更新调拨任务条码
export const updateTaskBarcode = (data) => {
return request({
url: '/wms/wmsAllocateTask/updateBarcode',
method: 'put',
data
});
};
// 根据调拨明细ID删除所有任务
export const deleteTasksByDetailId = (aoDId) => {
return request({
url: '/wms/wmsAllocateTask/deleteTasksByDetailId/' + aoDId,
method: 'delete'
});
};

@ -0,0 +1,77 @@
import request from '@/utils/request';
import { AxiosPromise } from 'axios';
import { WmsAllocateTaskVO, WmsAllocateTaskForm, WmsAllocateTaskQuery } from '@/api/wms/wmsAllocateTask/types';
/**
*
* @param query
* @returns {*}
*/
export const listWmsAllocateTask = (query?: WmsAllocateTaskQuery): AxiosPromise<WmsAllocateTaskVO[]> => {
return request({
url: '/wms/wmsAllocateTask/list',
method: 'get',
params: query
});
};
/**
*
* @param allocateTaskId
*/
export const getWmsAllocateTask = (allocateTaskId: string | number): AxiosPromise<WmsAllocateTaskVO> => {
return request({
url: '/wms/wmsAllocateTask/' + allocateTaskId,
method: 'get'
});
};
/**
*
* @param data
*/
export const addWmsAllocateTask = (data: WmsAllocateTaskForm) => {
return request({
url: '/wms/wmsAllocateTask',
method: 'post',
data: data
});
};
/**
*
* @param data
*/
export const updateWmsAllocateTask = (data: WmsAllocateTaskForm) => {
return request({
url: '/wms/wmsAllocateTask',
method: 'put',
data: data
});
};
/**
*
* @param allocateTaskId
*/
export const delWmsAllocateTask = (allocateTaskId: string | number | Array<string | number>) => {
return request({
url: '/wms/wmsAllocateTask/' + allocateTaskId,
method: 'delete'
});
};
/**
*
* @param query
* @returns {*}
*/
export function getWmsAllocateTaskList (query) {
return request({
url: '/wms/wmsAllocateTask/getWmsAllocateTaskList',
method: 'get',
params: query
});
};

@ -0,0 +1,256 @@
export interface WmsAllocateTaskVO {
/**
*
*/
allocateTaskId: string | number;
/**
*
*/
allocateCode: string;
/**
*
*/
batchCode: string;
/**
*
*/
materialQty: number;
/**
*
*/
apportionQty: number;
/**
* id
*/
materialId: string | number;
/**
*
*/
materialCode: string;
/**
*
*/
materialName: string;
/**
*
*/
materialSpe: string;
/**
*
*/
unitName: string;
/**
*
*/
codeYesNo: string;
/**
*
*/
materialCategories: string;
/**
* id
*/
locationId: string | number;
/**
* (0-,1-,2-)
*/
inboundStatus: string;
/**
*
*/
actualInboundTime: string;
/**
* id
*/
aoDId: string | number;
}
export interface WmsAllocateTaskForm extends BaseEntity {
/**
*
*/
allocateTaskId?: string | number;
/**
*
*/
allocateCode?: string;
/**
*
*/
batchCode?: string;
/**
*
*/
materialQty?: number;
/**
*
*/
apportionQty?: number;
/**
* id
*/
materialId?: string | number;
/**
*
*/
materialCode?: string;
/**
*
*/
materialName?: string;
/**
*
*/
materialSpe?: string;
/**
*
*/
unitName?: string;
/**
*
*/
codeYesNo?: string;
/**
*
*/
materialCategories?: string;
/**
* id
*/
locationId?: string | number;
/**
* (0-,1-,2-)
*/
inboundStatus?: string;
/**
*
*/
actualInboundTime?: string;
/**
* id
*/
aoDId?: string | number;
}
export interface WmsAllocateTaskQuery extends PageQuery {
/**
*
*/
allocateTaskId?: string | number;
/**
*
*/
allocateCode?: string;
/**
*
*/
batchCode?: string;
/**
*
*/
materialQty?: number;
/**
*
*/
apportionQty?: number;
/**
* id
*/
materialId?: string | number;
/**
*
*/
materialCode?: string;
/**
*
*/
materialName?: string;
/**
*
*/
materialSpe?: string;
/**
*
*/
unitName?: string;
/**
*
*/
codeYesNo?: string;
/**
*
*/
materialCategories?: string;
/**
* id
*/
locationId?: string | number;
/**
* (0-,1-,2-)
*/
inboundStatus?: string;
/**
*
*/
actualInboundTime?: string;
/**
* id
*/
aoDId?: string | number;
/**
*
*/
params?: any;
}

@ -0,0 +1,394 @@
<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" >
<!-- <el-form-item label="调拨任务表主键" prop="allocateTaskId">-->
<!-- <el-input v-model="queryParams.allocateTaskId" placeholder="请输入调拨任务表主键" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单号" prop="allocateCode">-->
<!-- <el-input v-model="queryParams.allocateCode" placeholder="请输入单号" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="批次码" prop="batchCode">-->
<!-- <el-input v-model="queryParams.batchCode" placeholder="请输入批次码" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="条码数量" prop="materialQty">-->
<!-- <el-input v-model="queryParams.materialQty" placeholder="请输入条码数量" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分包数量" prop="apportionQty">-->
<!-- <el-input v-model="queryParams.apportionQty" placeholder="请输入分包数量" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料id" prop="materialId">-->
<!-- <el-input v-model="queryParams.materialId" placeholder="请输入物料id" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料编码" prop="materialCode">-->
<!-- <el-input v-model="queryParams.materialCode" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料名称" prop="materialName">-->
<!-- <el-input v-model="queryParams.materialName" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料规格" prop="materialSpe">-->
<!-- <el-input v-model="queryParams.materialSpe" placeholder="请输入物料规格" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="计量单位名称" prop="unitName">-->
<!-- <el-input v-model="queryParams.unitName" placeholder="请输入计量单位名称" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否有条码" prop="codeYesNo">-->
<!-- <el-input v-model="queryParams.codeYesNo" placeholder="请输入是否有条码" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料大类" prop="materialCategories">-->
<!-- <el-input v-model="queryParams.materialCategories" placeholder="请输入物料大类" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="推荐库位id" prop="locationId">-->
<!-- <el-input v-model="queryParams.locationId" placeholder="请输入推荐库位id" clearable @keyup.enter="handleQuery" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库状态(0-待入库,1-已入库,2-入库中)" prop="inboundStatus">-->
<!-- <el-select v-model="queryParams.inboundStatus" placeholder="请选择入库状态(0-待入库,1-已入库,2-入库中)" clearable >-->
<!-- <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实际入库时间" prop="actualInboundTime">-->
<!-- <el-date-picker clearable-->
<!-- v-model="queryParams.actualInboundTime"-->
<!-- type="date"-->
<!-- value-format="YYYY-MM-DD"-->
<!-- placeholder="请选择实际入库时间"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="子表id" prop="aoDId">-->
<!-- <el-input v-model="queryParams.aoDId" placeholder="请输入子表id" clearable @keyup.enter="handleQuery" />-->
<!-- </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:wmsAllocateTask:add']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['wms:wmsAllocateTask:edit']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['wms:wmsAllocateTask:remove']"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['wms:wmsAllocateTask: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" :data="wmsAllocateTaskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="调拨任务表主键" align="center" prop="allocateTaskId" v-if="columns[0].visible"/>
<el-table-column label="单号" align="center" prop="allocateCode" v-if="columns[1].visible"/>
<el-table-column label="批次码" align="center" prop="batchCode" v-if="columns[3].visible"/>
<el-table-column label="条码数量" align="center" prop="materialQty" v-if="columns[4].visible"/>
<el-table-column label="分包数量" align="center" prop="apportionQty" v-if="columns[5].visible"/>
<el-table-column label="物料id" align="center" prop="materialId" v-if="columns[6].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[7].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[8].visible"/>
<el-table-column label="物料规格" align="center" prop="materialSpe" v-if="columns[9].visible"/>
<el-table-column label="计量单位名称" align="center" prop="unitName" v-if="columns[10].visible"/>
<el-table-column label="是否有条码" align="center" prop="codeYesNo" v-if="columns[11].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[12].visible"/>
<el-table-column label="推荐库位id" align="center" prop="locationId" v-if="columns[17].visible"/>
<el-table-column label="入库状态(0-待入库,1-已入库,2-入库中)" align="center" prop="inboundStatus" v-if="columns[18].visible">
<template #default="scope">
<dict-tag :options="wms_inbound_status" :value="scope.row.inboundStatus"/>
</template>
</el-table-column>
<el-table-column label="实际入库时间" align="center" prop="actualInboundTime" width="180" v-if="columns[19].visible">
<template #default="scope">
<span>{{ parseTime(scope.row.actualInboundTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="子表id" align="center" prop="aoDId" v-if="columns[20].visible"/>
<el-table-column label="操作" align="center" 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:wmsAllocateTask:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['wms:wmsAllocateTask: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="500px" append-to-body>
<el-form ref="wmsAllocateTaskFormRef" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="调拨任务表主键" prop="allocateTaskId">-->
<!-- <el-input v-model="form.allocateTaskId" placeholder="请输入调拨任务表主键" />-->
<!-- </el-form-item>-->
<el-form-item label="单号" prop="allocateCode">
<el-input v-model="form.allocateCode" placeholder="请输入单号" />
</el-form-item>
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次码" />
</el-form-item>
<el-form-item label="条码数量" prop="materialQty">
<el-input v-model="form.materialQty" placeholder="请输入条码数量" />
</el-form-item>
<el-form-item label="分包数量" prop="apportionQty">
<el-input v-model="form.apportionQty" placeholder="请输入分包数量" />
</el-form-item>
<el-form-item label="物料id" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料id" />
</el-form-item>
<!-- <el-form-item label="物料编码" prop="materialCode">-->
<!-- <el-input v-model="form.materialCode" placeholder="请输入物料编码" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="物料名称" prop="materialName">-->
<!-- <el-input v-model="form.materialName" placeholder="请输入物料名称" />-->
<!-- </el-form-item>-->
<el-form-item label="物料规格" prop="materialSpe">
<el-input v-model="form.materialSpe" placeholder="请输入物料规格" />
</el-form-item>
<el-form-item label="计量单位名称" prop="unitName">
<el-input v-model="form.unitName" placeholder="请输入计量单位名称" />
</el-form-item>
<el-form-item label="是否有条码" prop="codeYesNo">
<el-input v-model="form.codeYesNo" placeholder="请输入是否有条码" />
</el-form-item>
<el-form-item label="物料大类" prop="materialCategories">
<el-input v-model="form.materialCategories" placeholder="请输入物料大类" />
</el-form-item>
<el-form-item label="推荐库位id" prop="locationId">
<el-input v-model="form.locationId" placeholder="请输入推荐库位id" />
</el-form-item>
<el-form-item label="入库状态(0-待入库,1-已入库,2-入库中)" prop="inboundStatus">
<el-radio-group v-model="form.inboundStatus">
<el-radio
v-for="dict in wms_inbound_status"
:key="dict.value"
:value="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="实际入库时间" prop="actualInboundTime">
<el-date-picker clearable
v-model="form.actualInboundTime"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择实际入库时间">
</el-date-picker>
</el-form-item>
<el-form-item label="子表id" prop="aoDId">
<el-input v-model="form.aoDId" placeholder="请输入子表id" />
</el-form-item>
</el-form>
<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="WmsAllocateTask" lang="ts">
import { listWmsAllocateTask, getWmsAllocateTask, delWmsAllocateTask, addWmsAllocateTask, updateWmsAllocateTask } from '@/api/wms/wmsAllocateTask';
import { WmsAllocateTaskVO, WmsAllocateTaskQuery, WmsAllocateTaskForm } from '@/api/wms/wmsAllocateTask/types';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { material_mategories, wms_barcode_if, inspection_request, wms_inbound_status } = toRefs<any>(proxy?.useDict('material_mategories', 'wms_barcode_if', 'inspection_request', 'wms_inbound_status'));
const wmsAllocateTaskList = ref<WmsAllocateTaskVO[]>([]);
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 queryFormRef = ref<ElFormInstance>();
const wmsAllocateTaskFormRef = ref<ElFormInstance>();
const dialog = reactive<DialogOption>({
visible: false,
title: ''
});
//
const columns = ref<FieldOption[]>([
{ key: 0, label: `调拨任务表主键`, visible: false }, // ID
{ key: 1, label: `单号`, visible: true },
{ key: 2, label: `创建时间`, visible: false }, //
{ key: 3, label: `批次码`, visible: true },
{ key: 4, label: `条码数量`, visible: true },
{ key: 5, label: `分包数量`, visible: true },
{ key: 6, label: `物料id`, visible: false }, // ID
{ key: 7, label: `物料编码`, visible: true },
{ key: 8, label: `物料名称`, visible: true },
{ key: 9, label: `物料规格`, visible: true },
{ key: 10, label: `计量单位名称`, visible: true },
{ key: 11, label: `是否有条码`, visible: true },
{ key: 12, label: `物料大类`, visible: true },
{ key: 13, label: `租户`, visible: false }, //
{ key: 14, label: `创建者`, visible: false }, //
{ key: 15, label: `更新时间`, visible: false }, //
{ key: 16, label: `更新者`, visible: false }, //
{ key: 17, label: `推荐库位id`, visible: false }, // ID
{ key: 18, label: `入库状态(0-待入库,1-已入库,2-入库中)`, visible: true },
{ key: 19, label: `实际入库时间`, visible: true },
{ key: 20, label: `子表id`, visible: false }, // ID
]);
const initFormData: WmsAllocateTaskForm = {
allocateTaskId: undefined,
allocateCode: undefined,
batchCode: undefined,
materialQty: undefined,
apportionQty: undefined,
materialId: undefined,
materialCode: undefined,
materialName: undefined,
materialSpe: undefined,
unitName: undefined,
codeYesNo: undefined,
materialCategories: undefined,
locationId: undefined,
inboundStatus: undefined,
actualInboundTime: undefined,
aoDId: undefined
}
const data = reactive<PageData<WmsAllocateTaskForm, WmsAllocateTaskQuery>>({
form: {...initFormData},
queryParams: {
pageNum: 1,
pageSize: 10,
allocateTaskId: undefined,
allocateCode: undefined,
batchCode: undefined,
materialQty: undefined,
apportionQty: undefined,
materialId: undefined,
materialCode: undefined,
materialName: undefined,
materialSpe: undefined,
unitName: undefined,
codeYesNo: undefined,
materialCategories: undefined,
locationId: undefined,
inboundStatus: undefined,
actualInboundTime: undefined,
aoDId: undefined,
params: {
}
},
rules: {
}
});
const { queryParams, form, rules } = toRefs(data);
/** 查询调拨打印列表 */
const getList = async () => {
loading.value = true;
const res = await listWmsAllocateTask(queryParams.value);
wmsAllocateTaskList.value = res.rows;
total.value = res.total;
loading.value = false;
}
/** 取消按钮 */
const cancel = () => {
reset();
dialog.visible = false;
}
/** 表单重置 */
const reset = () => {
form.value = {...initFormData};
wmsAllocateTaskFormRef.value?.resetFields();
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value?.resetFields();
handleQuery();
}
/** 多选框选中数据 */
const handleSelectionChange = (selection: WmsAllocateTaskVO[]) => {
ids.value = selection.map(item => item.allocateTaskId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 新增按钮操作 */
const handleAdd = () => {
reset();
dialog.visible = true;
dialog.title = "添加调拨打印";
}
/** 修改按钮操作 */
const handleUpdate = async (row?: WmsAllocateTaskVO) => {
reset();
const _allocateTaskId = row?.allocateTaskId || ids.value[0]
const res = await getWmsAllocateTask(_allocateTaskId);
Object.assign(form.value, res.data);
dialog.visible = true;
dialog.title = "修改调拨打印";
}
/** 提交按钮 */
const submitForm = () => {
wmsAllocateTaskFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
if (form.value.allocateTaskId) {
await updateWmsAllocateTask(form.value).finally(() => buttonLoading.value = false);
} else {
await addWmsAllocateTask(form.value).finally(() => buttonLoading.value = false);
}
proxy?.$modal.msgSuccess("操作成功");
dialog.visible = false;
await getList();
}
});
}
/** 删除按钮操作 */
const handleDelete = async (row?: WmsAllocateTaskVO) => {
const _allocateTaskIds = row?.allocateTaskId || ids.value;
await proxy?.$modal.confirm('是否确认删除调拨打印编号为"' + _allocateTaskIds + '"的数据项?').finally(() => loading.value = false);
await delWmsAllocateTask(_allocateTaskIds);
proxy?.$modal.msgSuccess("删除成功");
await getList();
}
/** 导出按钮操作 */
const handleExport = () => {
proxy?.download('wms/wmsAllocateTask/export', {
...queryParams.value
}, `wmsAllocateTask_${new Date().getTime()}.xlsx`)
}
onMounted(() => {
getList();
});
</script>
Loading…
Cancel
Save