feat(mes): 添加转移单及转移单行相关功能和数据结构

新增转移单及转移单行的相关数据对象、服务接口和控制器,支持转移单的创建、修改、删除和查询功能。同时,添加了转移单状态和类型的枚举,完善了相关的 API 接口。

- 添加 MesWmTransferDO、MesWmTransferLineDO、MesWmTransferDetailDO 数据对象
- 实现 MesWmTransferService 和 MesWmTransferLineService 接口
- 新增 MesWmTransferController 和 MesWmTransferLineController 控制器
- 更新相关的 API 接口文档
pull/871/MERGE
YunaiV 2026-03-08 20:39:21 +08:00
parent 5dbbb84d1b
commit 0a508c881e
9 changed files with 823 additions and 0 deletions

View File

@ -0,0 +1,54 @@
import request from '@/config/axios'
// MES 调拨明细 VO
export interface WmTransferDetailVO {
id: number
lineId: number
transferId: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitName?: string
unitMeasureName?: string
quantity: number
batchId: number
batchCode?: string
toWarehouseId: number
toWarehouseName?: string
toLocationId: number
toLocationName?: string
toAreaId: number
toAreaName?: string
remark: string
createTime?: string
}
// MES 调拨明细 API
export const WmTransferDetailApi = {
// 查询调拨明细列表(按行编号)
getTransferDetailListByLineId: async (lineId: number) => {
return await request.get({ url: '/mes/wm/transfer-detail/list-by-line', params: { lineId } })
},
// 查询调拨明细详情
getTransferDetail: async (id: number) => {
return await request.get({ url: '/mes/wm/transfer-detail/get?id=' + id })
},
// 新增调拨明细
createTransferDetail: async (data: WmTransferDetailVO) => {
return await request.post({ url: '/mes/wm/transfer-detail/create', data })
},
// 修改调拨明细
updateTransferDetail: async (data: WmTransferDetailVO) => {
return await request.put({ url: '/mes/wm/transfer-detail/update', data })
},
// 删除调拨明细
deleteTransferDetail: async (id: number) => {
return await request.delete({ url: '/mes/wm/transfer-detail/delete?id=' + id })
},
}

View File

@ -0,0 +1,73 @@
import request from '@/config/axios'
// MES 转移单 VO
export interface WmTransferVO {
id: number
code: string
name: string
type: number
deliveryFlag: boolean
recipientName: string
recipientTelephone: string
destinationAddress: string
carrier: string
shippingNumber: string
confirmFlag: boolean
transferDate: string
status: number
remark: string
createTime?: string
}
// MES 转移单 API
export const WmTransferApi = {
// 查询转移单分页
getTransferPage: async (params: any) => {
return await request.get({ url: '/mes/wm/transfer/page', params })
},
// 查询转移单详情
getTransfer: async (id: number) => {
return await request.get({ url: '/mes/wm/transfer/get?id=' + id })
},
// 新增转移单
createTransfer: async (data: WmTransferVO) => {
return await request.post({ url: '/mes/wm/transfer/create', data })
},
// 修改转移单
updateTransfer: async (data: WmTransferVO) => {
return await request.put({ url: '/mes/wm/transfer/update', data })
},
// 删除转移单
deleteTransfer: async (id: number) => {
return await request.delete({ url: '/mes/wm/transfer/delete?id=' + id })
},
// 提交转移单
submitTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/submit?id=' + id })
},
// 到货确认
confirmTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/confirm?id=' + id })
},
// 完成转移
finishTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/finish?id=' + id })
},
// 取消转移单
cancelTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/cancel?id=' + id })
},
// 导出转移单 Excel
exportTransfer: async (params: any) => {
return await request.download({ url: '/mes/wm/transfer/export-excel', params })
}
}

View File

@ -0,0 +1,54 @@
import request from '@/config/axios'
// MES 转移单行 VO
export interface WmTransferLineVO {
id: number
transferId: number
materialStockId: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitName?: string
unitMeasureName?: string
quantity: number
batchId: number
batchCode?: string
fromWarehouseId: number
fromWarehouseName?: string
fromLocationId: number
fromLocationName?: string
fromAreaId: number
fromAreaName?: string
remark: string
createTime?: string
}
// MES 转移单行 API
export const WmTransferLineApi = {
// 查询转移单行列表
getTransferLineList: async (transferId: number) => {
return await request.get({ url: '/mes/wm/transfer-line/list', params: { transferId } })
},
// 查询转移单行详情
getTransferLine: async (id: number) => {
return await request.get({ url: '/mes/wm/transfer-line/get?id=' + id })
},
// 新增转移单行
createTransferLine: async (data: WmTransferLineVO) => {
return await request.post({ url: '/mes/wm/transfer-line/create', data })
},
// 修改转移单行
updateTransferLine: async (data: WmTransferLineVO) => {
return await request.put({ url: '/mes/wm/transfer-line/update', data })
},
// 删除转移单行
deleteTransferLine: async (id: number) => {
return await request.delete({ url: '/mes/wm/transfer-line/delete?id=' + id })
},
}

View File

@ -294,6 +294,8 @@ export enum DICT_TYPE {
MES_RQC_TYPE = 'mes_rqc_type', // MES 退货检验类型
MES_WM_ARRIVAL_NOTICE_STATUS = 'mes_wm_arrival_notice_status', // MES 到货通知单状态
MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态
MES_WM_TRANSFER_STATUS = 'mes_wm_transfer_status', // MES 转移单状态
MES_WM_TRANSFER_TYPE = 'mes_wm_transfer_type', // MES 转移单类型
MES_WM_OUTSOURCE_RECPT_STATUS = 'mes_wm_outsource_recpt_status', // MES 外协入库单状态
MES_WM_PRODUCTION_ISSUE_STATUS = 'mes_wm_production_issue_status', // MES 领料出库单状态
MES_PRODUCT_PRODUCE_STATUS = 'mes_product_produce_status', // MES 生产入库单状态

View File

@ -209,6 +209,16 @@ export const MesWmItemReceiptStatusEnum = {
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 转移单状态枚举 */
export const MesWmTransferStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,
UNCONFIRMED: MesOrderStatusConstants.CONFIRMED,
UNSTOCK: MesOrderStatusConstants.APPROVING,
UNEXECUTE: MesOrderStatusConstants.APPROVED,
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 委外收货单状态枚举 */
export const MesWmOutsourceReceiptStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,

View File

@ -123,6 +123,7 @@ const handleConfirm = () => {
if (!selectedRow.value) {
return
}
// TODO @ warehouseNamelocationNameareaName
emit('select', {
materialStockId: selectedRow.value.id,
batchId: selectedRow.value.batchId,

View File

@ -128,6 +128,8 @@ const queryParams = reactive({
const getList = async () => {
loading.value = true
try {
// TODO @ -> ktg-mes
// packageId package-line/page
queryParams.packageId = props.packageId
const data = await WmPackageLineApi.getPackageLinePage(queryParams)
list.value = data.list

View File

@ -0,0 +1,295 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1100px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-row>
<el-col :span="8">
<el-form-item label="转移单编号" prop="code">
<el-input
v-model="formData.code"
placeholder="请输入转移单编号"
:disabled="isHeaderReadonly"
>
<template #append>
<el-button @click="generateCode" :disabled="formType !== 'create'">生成</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="转移单名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入转移单名称"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="转移单类型" prop="type">
<!-- TODO @AI可以更新 type 类型编辑的时候 -->
<!-- TODO @AI
当外部转移时才展示是否配送
在选择是配送时才有收货人联系方式承运航运输单号目的地字段
-->
<el-select
v-model="formData.type"
placeholder="请选择转移单类型"
class="!w-full"
:disabled="formType !== 'create' || isHeaderReadonly"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<!-- TODO @AI只选择日期当然后端还是使用 LocalDateTime 接收 -->
<el-col :span="8">
<el-form-item label="转移日期" prop="transferDate">
<el-date-picker
v-model="formData.transferDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择转移日期"
class="!w-full"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否配送" prop="deliveryFlag">
<el-switch v-model="formData.deliveryFlag" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否确认" prop="confirmFlag">
<el-switch v-model="formData.confirmFlag" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收货人" prop="recipientName">
<el-input
v-model="formData.recipientName"
placeholder="请输入收货人"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="recipientTelephone">
<el-input
v-model="formData.recipientTelephone"
placeholder="请输入联系电话"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="承运商" prop="carrier">
<el-input
v-model="formData.carrier"
placeholder="请输入承运商"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="运输单号" prop="shippingNumber">
<el-input
v-model="formData.shippingNumber"
placeholder="请输入运输单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="目的地" prop="destinationAddress">
<el-input
v-model="formData.destinationAddress"
placeholder="请输入目的地"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template v-if="formData.id">
<el-alert
v-if="formType === 'stock'"
type="info"
:closable="false"
class="mb-12px"
title="当前阶段仅维护调拨明细;明细维护完成后,请回到列表页执行后续状态操作。"
/>
<el-divider content-position="center">调拨物料</el-divider>
<TransferLineList :transfer-id="formData.id" :form-type="formType" />
</template>
<template #footer>
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
</el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { generateRandomStr } from '@/utils'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer'
import TransferLineList from './TransferLineList.vue'
// TODO @AI system user form.vue
defineOptions({ name: 'TransferForm' })
const emit = defineEmits(['success'])
const message = useMessage()
const dialogVisible = ref(false)
const formLoading = ref(false)
const formType = ref<string>('create')
const formRef = ref()
const formData = ref({
id: undefined as number | undefined,
code: undefined,
name: undefined,
type: undefined as number | undefined,
deliveryFlag: false,
recipientName: undefined,
recipientTelephone: undefined,
destinationAddress: undefined,
carrier: undefined,
shippingNumber: undefined,
confirmFlag: false,
transferDate: undefined,
status: undefined,
remark: undefined
})
// TODO @AI
const validateRecipientFields = (_rule, _value, callback) => {
if (!isOuterType.value) {
callback()
return
}
if (!formData.value.recipientName) {
callback(new Error('外部调拨时收货人不能为空'))
return
}
if (!formData.value.recipientTelephone) {
callback(new Error('外部调拨时联系电话不能为空'))
return
}
if (!formData.value.destinationAddress) {
callback(new Error('外部调拨时目的地不能为空'))
return
}
callback()
}
// TODO @AI codenametypetransferDate
const formRules = reactive({
code: [{ required: true, message: '转移单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '转移单名称不能为空', trigger: 'blur' }],
type: [{ required: true, message: '转移单类型不能为空', trigger: 'change' }],
transferDate: [{ required: true, message: '转移日期不能为空', trigger: 'change' }],
recipientName: [{ validator: validateRecipientFields, trigger: 'blur' }],
recipientTelephone: [{ validator: validateRecipientFields, trigger: 'blur' }],
destinationAddress: [{ validator: validateRecipientFields, trigger: 'blur' }]
})
const isUpdate = computed(() => ['create', 'update'].includes(formType.value))
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value))
const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2)
const dialogTitle = computed(() => {
const titles = {
create: '新增转移单',
update: '编辑转移单',
stock: '维护调拨明细',
detail: '转移单详情'
}
return titles[formType.value] || formType.value
})
// TODO @AI code
const generateCode = () => {
formData.value.code = 'TR' + generateRandomStr(10)
}
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
type: undefined,
deliveryFlag: false,
recipientName: undefined,
recipientTelephone: undefined,
destinationAddress: undefined,
carrier: undefined,
shippingNumber: undefined,
confirmFlag: false, // TODO @AI confirmFlag SaveVO
transferDate: undefined,
status: undefined, // TODO @AI status SaveVO
remark: undefined
}
formRef.value?.resetFields()
}
const open = async (type: string, id?: number) => {
dialogVisible.value = true
formType.value = type
resetForm()
if (id) {
formLoading.value = true
try {
formData.value = await WmTransferApi.getTransfer(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as unknown as WmTransferVO
if (formType.value === 'create') {
const id = await WmTransferApi.createTransfer(data)
message.success('新增成功')
formData.value.id = id
formType.value = 'update'
} else {
await WmTransferApi.updateTransfer(data)
message.success('修改成功')
}
emit('success')
} finally {
formLoading.value = false
}
}
</script>

View File

@ -0,0 +1,332 @@
<template>
<ContentWrap>
<el-form
ref="queryFormRef"
:model="queryParams"
:inline="true"
label-width="100px"
class="-mb-15px"
>
<el-form-item label="转移单编号" prop="code">
<el-input
v-model="queryParams.code"
placeholder="请输入转移单编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="转移单名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入转移单名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="转移单类型" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择转移单类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- TODO @AI前后端都去掉 转移日期单据状态的筛选项 -->
<el-form-item label="转移日期" prop="transferDate">
<el-date-picker
v-model="queryParams.transferDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_TRANSFER_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['mes:wm-transfer:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:wm-transfer:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="转移单编号" align="center" prop="code" min-width="160">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-button>
</template>
</el-table-column>
<el-table-column label="转移单名称" align="center" prop="name" min-width="160" />
<el-table-column label="转移单类型" align="center" prop="type" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_WM_TRANSFER_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="是否配送" align="center" prop="deliveryFlag" width="100">
<template #default="scope">
<el-tag :type="scope.row.deliveryFlag ? 'success' : 'info'">
{{ scope.row.deliveryFlag ? '是' : '否' }}
</el-tag>
</template>
</el-table-column>
<el-table-column
label="转移日期"
align="center"
prop="transferDate"
:formatter="dateFormatter2"
width="180"
/>
<el-table-column label="单据状态" align="center" prop="status" min-width="110">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_WM_TRANSFER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="280" fixed="right">
<template #default="scope">
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.PREPARE"
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:wm-transfer:update']"
>
编辑
</el-button>
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.PREPARE"
link
type="warning"
@click="handleSubmit(scope.row.id)"
v-hasPermi="['mes:wm-transfer:update']"
>
提交
</el-button>
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.PREPARE"
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:wm-transfer:delete']"
>
删除
</el-button>
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.UNCONFIRMED"
link
type="success"
@click="handleConfirm(scope.row.id)"
v-hasPermi="['mes:wm-transfer:update']"
>
到货确认
</el-button>
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.UNSTOCK"
link
type="success"
@click="openForm('stock', scope.row.id)"
v-hasPermi="['mes:wm-transfer:update']"
>
执行上架
</el-button>
<el-button
v-if="scope.row.status === MesWmTransferStatusEnum.UNEXECUTE"
link
type="primary"
@click="handleFinish(scope.row.id)"
v-hasPermi="['mes:wm-transfer:finish']"
>
执行转移
</el-button>
<el-button
v-if="canCancel(scope.row.status)"
link
type="danger"
@click="handleCancel(scope.row.id)"
v-hasPermi="['mes:wm-transfer:update']"
>
取消
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<TransferForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer'
import { MesWmTransferStatusEnum } from '@/views/mes/utils/constants'
import TransferForm from './TransferForm.vue'
// TODO @AI system user index.vue
defineOptions({ name: 'MesWmTransfer' })
const message = useMessage()
const { t } = useI18n()
const loading = ref(true)
const list = ref<WmTransferVO[]>([])
const total = ref(0)
const exportLoading = ref(false)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
type: undefined,
transferDate: undefined,
status: undefined
})
const queryFormRef = ref()
const formRef = ref()
// TODO @AI vue html
const canCancel = (status: number) => {
return [
MesWmTransferStatusEnum.UNCONFIRMED,
MesWmTransferStatusEnum.UNSTOCK,
MesWmTransferStatusEnum.UNEXECUTE
].includes(status)
}
const getList = async () => {
loading.value = true
try {
const data = await WmTransferApi.getTransferPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
const handleSubmit = async (id: number) => {
try {
await message.confirm('确认提交该转移单?')
await WmTransferApi.submitTransfer(id)
message.success('提交成功')
await getList()
} catch {}
}
const handleConfirm = async (id: number) => {
try {
await message.confirm('确认到货后,将进入待上架状态,是否继续?')
await WmTransferApi.confirmTransfer(id)
message.success('确认成功')
await getList()
} catch {}
}
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行调拨?执行后将更新库存。')
await WmTransferApi.finishTransfer(id)
message.success('执行成功')
await getList()
} catch {}
}
const handleCancel = async (id: number) => {
try {
await message.confirm('确认取消该转移单?取消后不可恢复。')
await WmTransferApi.cancelTransfer(id)
message.success('取消成功')
await getList()
} catch {}
}
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmTransferApi.deleteTransfer(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await WmTransferApi.exportTransfer(queryParams)
download.excel(data, '转移单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
onMounted(() => {
getList()
})
</script>