feat(mes): 添加销售退货单及行相关功能和数据结构

新增销售退货单及行的相关数据结构、请求和响应对象,包含销售退货单的基本信息、行信息以及相关的 API 接口,支持销售退货单的创建、更新、查询和删除操作,提升了系统的功能性和可维护性。
pull/871/MERGE
YunaiV 2026-03-01 22:16:12 +08:00
parent c2e397e84c
commit bc932d0a0d
6 changed files with 698 additions and 0 deletions

View File

@ -0,0 +1,47 @@
import request from '@/config/axios'
// MES 销售退货明细 VO
export interface WmReturnSalesDetailVO {
id?: number
returnId: number
lineId: number
itemId: number
quantity: number
batchId?: number
batchCode?: string
warehouseId: number
warehouseName?: string
locationId?: number
locationName?: string
areaId?: number
areaName?: string
remark?: string
}
// MES 销售退货明细 API
export const WmReturnSalesDetailApi = {
// 查询销售退货明细列表(按行编号)
getReturnSalesDetailListByLineId: async (lineId: number) => {
return await request.get({ url: '/mes/wm/return-sales-detail/list-by-line', params: { lineId } })
},
// 查询销售退货明细详情
getReturnSalesDetail: async (id: number) => {
return await request.get({ url: '/mes/wm/return-sales-detail/get?id=' + id })
},
// 新增销售退货明细
createReturnSalesDetail: async (data: WmReturnSalesDetailVO) => {
return await request.post({ url: '/mes/wm/return-sales-detail/create', data })
},
// 修改销售退货明细
updateReturnSalesDetail: async (data: WmReturnSalesDetailVO) => {
return await request.put({ url: '/mes/wm/return-sales-detail/update', data })
},
// 删除销售退货明细
deleteReturnSalesDetail: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-sales-detail/delete?id=' + id })
}
}

View File

@ -0,0 +1,70 @@
import request from '@/config/axios'
// MES 销售退货单 VO
export interface WmReturnSalesVO {
id?: number
code?: string
name: string
soCode?: string
clientId?: number
clientCode?: string
clientName?: string
returnDate?: string
returnReason?: string
status?: number
remark?: string
createTime?: string
}
// MES 销售退货单 API
export const WmReturnSalesApi = {
// 查询销售退货单分页
getReturnSalesPage: async (params: any) => {
return await request.get({ url: '/mes/wm/return-sales/page', params })
},
// 查询销售退货单详情
getReturnSales: async (id: number) => {
return await request.get({ url: '/mes/wm/return-sales/get?id=' + id })
},
// 新增销售退货单
createReturnSales: async (data: WmReturnSalesVO) => {
return await request.post({ url: '/mes/wm/return-sales/create', data })
},
// 修改销售退货单
updateReturnSales: async (data: WmReturnSalesVO) => {
return await request.put({ url: '/mes/wm/return-sales/update', data })
},
// 删除销售退货单
deleteReturnSales: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-sales/delete?id=' + id })
},
// 提交销售退货单
submitReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/submit?id=' + id })
},
// 执行退货
executeReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/execute?id=' + id })
},
// 执行上架
stockReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/stock?id=' + id })
},
// 取消销售退货单
cancelReturnSales: async (id: number) => {
return await request.put({ url: '/mes/wm/return-sales/cancel?id=' + id })
},
// 导出销售退货单 Excel
exportReturnSales: async (params: any) => {
return await request.download({ url: '/mes/wm/return-sales/export-excel', params })
}
}

View File

@ -0,0 +1,45 @@
import request from '@/config/axios'
// MES 销售退货单行 VO
export interface WmReturnSalesLineVO {
id?: number
returnId: number
itemId: number
itemCode?: string
itemName?: string
specification?: string
unitMeasureName?: string
quantityReturned: number
batchId?: number
batchCode?: string
qualityStatus?: number
remark?: string
}
// MES 销售退货单行 API
export const WmReturnSalesLineApi = {
// 查询销售退货单行分页
getReturnSalesLinePage: async (params: any) => {
return await request.get({ url: '/mes/wm/return-sales-line/page', params })
},
// 查询销售退货单行详情
getReturnSalesLine: async (id: number) => {
return await request.get({ url: '/mes/wm/return-sales-line/get?id=' + id })
},
// 新增销售退货单行
createReturnSalesLine: async (data: WmReturnSalesLineVO) => {
return await request.post({ url: '/mes/wm/return-sales-line/create', data })
},
// 修改销售退货单行
updateReturnSalesLine: async (data: WmReturnSalesLineVO) => {
return await request.put({ url: '/mes/wm/return-sales-line/update', data })
},
// 删除销售退货单行
deleteReturnSalesLine: async (id: number) => {
return await request.delete({ url: '/mes/wm/return-sales-line/delete?id=' + id })
}
}

View File

@ -227,6 +227,15 @@ export const MesWmReturnVendorStatusEnum = {
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 销售退货单状态枚举 */
export const MesWmReturnSalesStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,
APPROVING: MesOrderStatusConstants.APPROVING,
APPROVED: MesOrderStatusConstants.APPROVED,
FINISHED: MesOrderStatusConstants.FINISHED,
CANCELED: MesOrderStatusConstants.CANCELLED
}
/** MES 生产退料单状态枚举 */
export const MesWmReturnIssueStatusEnum = {
PREPARE: MesOrderStatusConstants.DRAFT,

View File

@ -0,0 +1,227 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<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="soCode">
<el-input
v-model="formData.soCode"
placeholder="请输入销售订单号"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="formData.clientId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="退货日期" prop="returnDate">
<el-date-picker
v-model="formData.returnDate"
type="datetime"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择退货日期"
:disabled="isHeaderReadonly"
class="!w-full"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- TODO @AI必填 -->
<el-col :span="24">
<el-form-item label="退货原因" prop="returnReason">
<el-input
v-model="formData.returnReason"
type="textarea"
placeholder="请输入退货原因"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<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-divider content-position="center">物料信息</el-divider>
<ReturnSalesLineList :return-id="formData.id" :form-type="formType" />
</template>
<template #footer>
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
</el-button>
<el-button v-if="isStock" @click="handleStock" 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 { WmReturnSalesApi, WmReturnSalesVO } from '@/api/mes/wm/returnsales'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import ReturnSalesLineList from './ReturnSalesLineList.vue'
defineOptions({ name: 'ReturnSalesForm' })
const message = useMessage() //
const dialogVisible = ref(false) //
const formLoading = ref(false) //
const formType = ref<string>('create') // 表单的类型create / update / stock / detail
const formData = ref({
id: undefined as number | undefined,
code: undefined,
name: undefined,
soCode: undefined,
clientId: undefined,
returnDate: undefined,
returnReason: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '退货单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '退货单名称不能为空', trigger: 'blur' }],
clientId: [{ required: true, message: '客户不能为空', trigger: 'change' }],
returnDate: [{ required: true, message: '退货日期不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) //
const isStock = computed(() => formType.value === 'stock') //
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) //
const dialogTitle = computed(() => {
const titles = {
create: '新增销售退货单',
update: '编辑销售退货单',
stock: '执行上架',
detail: '销售退货单详情'
}
return titles[formType.value] || formType.value
})
/** 生成退货单编号 */
const generateCode = () => {
formData.value.code = 'RS' + generateRandomStr(10)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
formType.value = type
resetForm()
// //
if (id) {
formLoading.value = true
try {
formData.value = await WmReturnSalesApi.getReturnSales(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单create/update 模式) */
const emit = defineEmits(['success'])
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as WmReturnSalesVO
if (formType.value === 'create') {
const res = await WmReturnSalesApi.createReturnSales(data)
message.success('新增成功')
formData.value.id = res
formType.value = 'update'
} else {
await WmReturnSalesApi.updateReturnSales(data)
message.success('修改成功')
}
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 执行上架 */
const handleStock = async () => {
try {
await message.confirm('确认执行上架?')
formLoading.value = true
await WmReturnSalesApi.stockReturnSales(formData.value.id!)
message.success('上架成功')
dialogVisible.value = false
emit('success')
} catch {
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
soCode: undefined,
clientId: undefined,
returnDate: undefined,
returnReason: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,300 @@
<template>
<ContentWrap>
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="100px"
>
<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>
<!-- TODO @AIsoCode 前后端都去掉 -->
<el-form-item label="销售订单号" prop="soCode">
<el-input
v-model="queryParams.soCode"
placeholder="请输入销售订单号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="客户" prop="clientId">
<MdClientSelect v-model="queryParams.clientId" clearable class="!w-240px" />
</el-form-item>
<!-- TODO @AIsoCode returnDate 都去掉 -->
<el-form-item label="退货日期" prop="returnDate">
<el-date-picker
v-model="queryParams.returnDate"
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>
<!-- TODO @AI缺一个单独状态 -->
<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-return-sales:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:wm-return-sales: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="150" />
<el-table-column label="销售订单号" align="center" prop="soCode" min-width="140" />
<el-table-column label="客户编码" align="center" prop="clientCode" min-width="120" />
<el-table-column label="客户名称" align="center" prop="clientName" min-width="150" />
<!-- TODO @AI退货原因 -->
<el-table-column
label="退货日期"
align="center"
prop="returnDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="单据状态" align="center" prop="status" min-width="110">
<template #default="scope">
<!-- TODO @AIDICT_TYPE 里没定义 -->
<dict-tag :type="DICT_TYPE.MES_WM_RETURN_SALES_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="240" fixed="right">
<template #default="scope">
{{ scope.row.status }}
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:wm-return-sales:update']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.PREPARE"
>
编辑
</el-button>
<el-button
link
type="warning"
@click="handleSubmit(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:submit']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.PREPARE"
>
提交
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:delete']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.PREPARE"
>
删除
</el-button>
<!-- TODO @AI执行退货执行上架是不是状态判断错了 -->
<!-- 待执行执行退货 -->
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:execute']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.APPROVING"
>
执行退货
</el-button>
<!-- 待上架执行上架 -->
<el-button
link
type="success"
@click="openForm('stock', scope.row.id)"
v-hasPermi="['mes:wm-return-sales:stock']"
v-if="scope.row.status === MesWmReturnSalesStatusEnum.APPROVED"
>
执行上架
</el-button>
<!-- 待执行待上架取消 -->
<el-button
link
type="danger"
@click="handleCancel(scope.row.id)"
v-hasPermi="['mes:wm-return-sales:cancel']"
v-if="
[MesWmReturnSalesStatusEnum.APPROVING, MesWmReturnSalesStatusEnum.APPROVED].includes(
scope.row.status
)
"
>
取消
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<ReturnSalesForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download'
import { WmReturnSalesApi, WmReturnSalesVO } from '@/api/mes/wm/returnsales'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import ReturnSalesForm from './ReturnSalesForm.vue'
import { MesWmReturnSalesStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesWmReturnSales' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<WmReturnSalesVO[]>([]) //
const total = ref(0) //
const exportLoading = ref(false) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
soCode: undefined,
clientId: undefined,
returnDate: undefined
})
const queryFormRef = ref() //
const formRef = ref() //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await WmReturnSalesApi.getReturnSalesPage(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 WmReturnSalesApi.submitReturnSales(id)
message.success('提交成功')
await getList()
} catch {}
}
/** 执行退货 */
const handleExecute = async (id: number) => {
try {
await message.confirm('确认执行退货?')
await WmReturnSalesApi.executeReturnSales(id)
message.success('执行成功')
await getList()
} catch {}
}
/** 取消 */
const handleCancel = async (id: number) => {
try {
await message.confirm('确认取消该销售退货单?取消后不可恢复。')
await WmReturnSalesApi.cancelReturnSales(id)
message.success('取消成功')
await getList()
} catch {}
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmReturnSalesApi.deleteReturnSales(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await WmReturnSalesApi.exportReturnSales(queryParams)
download.excel(data, '销售退货单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 */
onMounted(() => {
getList()
})
</script>