yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

✨ feat(mes): 新增外协发料单编码和数据校验逻辑 

新增外协发料单编码常量，更新相关服务以支持外协发料单的创建和校验逻辑。优化了发料单的创建、更新和取消流程，确保数据的完整性和有效性。
pull/871/MERGE
YunaiV 2026-03-31 22:38:53 +08:00
parent 89b61ba3cd
commit 2b9da6c2a2
5 changed files with 133 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/mes/utils/constants.ts
View File

@ -443,7 +443,8 @@ export const MesAutoCodeRuleCode = {
WM_MISC_RECEIPT_CODE: 'WM_MISC_RECEIPT_CODE', // 杂项入库单编码
WM_STOCK_TAKING_PLAN_CODE: 'WM_STOCK_TAKING_PLAN_CODE', // 盘点方案编码
WM_STOCK_TAKING_CODE: 'WM_STOCK_TAKING_CODE', // 盘点任务编码
TRANSFER_CODE: 'TRANSFER_CODE' // 转移调拨单编码
TRANSFER_CODE: 'TRANSFER_CODE', // 转移调拨单编码
WM_OUTSOURCE_ISSUE_CODE: 'WM_OUTSOURCE_ISSUE_CODE' // 外协发料单编码
} as const
/** 获取物料/产品标识的标签 */

1
src/views/mes/wm/outsourceissue/OutsourceIssueDetailForm.vue
View File

@ -1,5 +1,4 @@
<!-- MES 外协发料单明细表单弹窗 -->
<!-- DONE @芋艿：未 review（AI 未修复原因：标注为后续人工 review，需人工介入） -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
<el-form

141
src/views/mes/wm/outsourceissue/OutsourceIssueForm.vue
View File

@ -6,21 +6,29 @@
:rules="formRules"
label-width="110px"
v-loading="formLoading"
:disabled="isHeaderReadonly"
:disabled="isDetail"
>
<el-row>
<el-col :span="8">
<el-form-item label="发料单编号" prop="code" required>
<el-input v-model="formData.code" placeholder="请输入发料单编号">
<el-form-item label="发料单编号" prop="code">
<el-input
v-model="formData.code"
placeholder="请输入发料单编号"
:disabled="isHeaderReadonly"
>
<template #append>
<el-button @click="generateCode"> 生成 </el-button>
<el-button @click="generateCode" :disabled="isHeaderReadonly"> 生成 </el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="发料单名称" prop="name" required>
<el-input v-model="formData.name" placeholder="请输入发料单名称" />
<el-form-item label="发料单名称" prop="name">
<el-input
v-model="formData.name"
placeholder="请输入发料单名称"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -31,6 +39,7 @@
value-format="x"
placeholder="请选择发料日期"
class="!w-1/1"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
@ -38,7 +47,6 @@
<el-row>
<el-col :span="8">
<el-form-item label="外协工单" prop="workOrderId">
<!-- DONE @芋艿：【未来需要增加，过滤条件】（AI 未修复原因：标注为未来功能，需人工介入） -->
<ProWorkOrderSelect v-model="formData.workOrderId" :disabled="isHeaderReadonly" />
</el-form-item>
</el-col>
@ -51,7 +59,12 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
<el-input
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
:disabled="isHeaderReadonly"
/>
</el-form-item>
</el-col>
</el-row>
@ -62,48 +75,63 @@
<OutsourceIssueLineList :issue-id="formData.id" :form-type="formType" />
</template>
<template #footer>
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
确 定
<el-button v-if="isEditable" @click="submitForm" type="primary" :disabled="formLoading">
保 存
</el-button>
<el-button
v-if="isEditable && formData.status === MesWmOutsourceIssueStatusEnum.PREPARE"
@click="handleSubmit"
type="warning"
:disabled="formLoading"
>
提 交
</el-button>
<el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
执行拣货
</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button v-if="isFinish" @click="handleFinish" type="success" :disabled="formLoading">
执行领出
</el-button>
<el-button @click="dialogVisible = false">关 闭</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { generateRandomStr } from '@/utils'
import { WmOutsourceIssueApi, WmOutsourceIssueVO } from '@/api/mes/wm/outsourceissue'
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
import OutsourceIssueLineList from './OutsourceIssueLineList.vue'
import { MesAutoCodeRuleCode, MesWmOutsourceIssueStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'OutsourceIssueForm' })
const emit = defineEmits(['success'])
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const formLoading = ref(false) // 表单的加载中
const formType = ref<string>('create') // 表单的类型：create - 新增；update - 修改；stock - 拣货；detail - 详情
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
const formType = ref<string>('create') // 表单的类型：create / update / stock / finish / detail
const isEditable = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
const isStock = computed(() => formType.value === 'stock') // 是否为拣货模式
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
const isFinish = computed(() => formType.value === 'finish') // 是否为执行领出模式
const isDetail = computed(() => ['detail', 'finish'].includes(formType.value)) // 是否为详情模式
const isHeaderReadonly = computed(() => ['stock', 'detail', 'finish'].includes(formType.value)) // 是否只读
const dialogTitle = computed(() => {
const titles = {
create: '新增外协发料单',
update: '修改外协发料单',
update: '编辑外协发料单',
stock: '执行拣货',
detail: '查看外协发料单'
finish: '执行领出',
detail: '外协发料单详情'
}
return titles[formType.value] || t('action.' + formType.value)
return titles[formType.value] || formType.value
})
const formData = ref({
id: undefined,
id: undefined as number | undefined,
code: undefined,
name: undefined,
status: undefined as number | undefined,
vendorId: undefined,
workOrderId: undefined,
issueDate: undefined,
@ -115,10 +143,13 @@ const formRules = reactive({
workOrderId: [{ required: true, message: '请选择工单', trigger: 'change' }]
})
const formRef = ref() // 表单 Ref
const originalFormData = ref<string>('') // 原始表单数据快照，用于脏检查
/** 生成发料单编号 */
const generateCode = () => {
formData.value.code = 'WOS' + generateRandomStr(10)
const generateCode = async () => {
formData.value.code = await AutoCodeRecordApi.generateAutoCode(
MesAutoCodeRuleCode.WM_OUTSOURCE_ISSUE_CODE
)
}
/** 打开弹窗 */
@ -126,6 +157,7 @@ const open = async (type: string, id?: number) => {
dialogVisible.value = true
formType.value = type
resetForm()
// 修改/拣货/执行领出/详情时，加载数据
if (id) {
formLoading.value = true
try {
@ -134,28 +166,56 @@ const open = async (type: string, id?: number) => {
formLoading.value = false
}
}
// 保存原始数据快照
originalFormData.value = JSON.stringify(formData.value)
}
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 WmOutsourceIssueVO
if (formType.value === 'create') {
const res = await WmOutsourceIssueApi.createOutsourceIssue(data)
message.success(t('common.createSuccess'))
// 新增成功后，切换到修改模式，设置 id
message.success('新增成功')
// 创建成功后，更新表单数据和状态为编辑模式
formData.value.id = res
formData.value.status = MesWmOutsourceIssueStatusEnum.PREPARE
formType.value = 'update'
} else {
await WmOutsourceIssueApi.updateOutsourceIssue(data)
message.success(t('common.updateSuccess'))
dialogVisible.value = false
emit('success')
message.success('修改成功')
}
// 更新快照
originalFormData.value = JSON.stringify(formData.value)
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 提交操作：表单修改过则先保存，再提交 */
const handleSubmit = async () => {
// 校验表单
await formRef.value.validate()
try {
await message.confirm('确认提交该外协发料单？【提交后将不能修改】')
formLoading.value = true
// 1. 表单有修改时，先保存
if (JSON.stringify(formData.value) !== originalFormData.value) {
const data = formData.value as unknown as WmOutsourceIssueVO
await WmOutsourceIssueApi.updateOutsourceIssue(data)
}
// 2. 提交发料单
await WmOutsourceIssueApi.submitOutsourceIssue(formData.value.id!)
message.success('提交成功')
dialogVisible.value = false
emit('success')
} catch {
} finally {
formLoading.value = false
}
@ -164,12 +224,13 @@ const submitForm = async () => {
/** 执行拣货 */
const handleStock = async () => {
try {
formLoading.value = true
// 校验发料数量与拣货数量是否一致
const quantityMatch = await WmOutsourceIssueApi.checkOutsourceIssueQuantity(formData.value.id!)
if (!quantityMatch) {
await message.confirm('发料数量与拣货数量不一致，确认执行拣货？')
}
await message.confirm('确认执行拣货？')
formLoading.value = true
await WmOutsourceIssueApi.stockOutsourceIssue(formData.value.id!)
message.success('拣货成功')
dialogVisible.value = false
@ -180,12 +241,28 @@ const handleStock = async () => {
}
}
/** 执行领出 */
const handleFinish = async () => {
try {
await message.confirm('确认执行领出？执行后将扣减库存，且无法撤销。')
formLoading.value = true
await WmOutsourceIssueApi.finishOutsourceIssue(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,
status: undefined,
vendorId: undefined,
workOrderId: undefined,
issueDate: undefined,
@ -193,4 +270,6 @@ const resetForm = () => {
}
formRef.value?.resetFields()
}
defineExpose({ open })
</script>

1
src/views/mes/wm/outsourceissue/OutsourceIssueLineList.vue
View File

@ -1,5 +1,4 @@
<!-- MES 外协发料单行列表子组件 -->
<!-- DONE @芋艿：未 review（AI 未修复原因：标注为后续人工 review，需人工介入） -->
<template>
<div class="overflow-hidden">
<el-button v-if="isUpdate" type="primary" plain @click="openForm('create')" class="mb-10px">

72
src/views/mes/wm/outsourceissue/index.vue
View File

@ -67,13 +67,13 @@
<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-link type="primary" @click="openForm('detail', scope.row.id)">
<el-button link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-link>
</el-button>
</template>
</el-table-column>
<el-table-column label="发料单名称" align="center" prop="name" min-width="150" />
<el-table-column label="生产工单号" align="center" prop="workorderId" min-width="140" />
<el-table-column label="生产工单号" align="center" prop="workOrderCode" min-width="140" />
<el-table-column label="供应商名称" align="center" prop="vendorName" min-width="120" />
<el-table-column
label="发料日期"
@ -87,9 +87,9 @@
<dict-tag :type="DICT_TYPE.MES_WM_OUTSOURCE_ISSUE_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="260" fixed="right">
<el-table-column label="操作" align="center" width="240" fixed="right">
<template #default="scope">
<!-- 草稿状态：编辑、删除、提交 -->
<!-- 草稿：编辑、删除 -->
<el-button
link
type="primary"
@ -108,45 +108,35 @@
>
删除
</el-button>
<!-- 待拣货：执行拣货、取消 -->
<el-button
link
type="success"
@click="handleSubmit(scope.row.id)"
v-hasPermi="['mes:wm-outsource-issue:update']"
v-if="scope.row.status === MesWmOutsourceIssueStatusEnum.PREPARE"
>
提交
</el-button>
<!-- 待拣货状态：执行拣货 -->
<el-button
link
type="primary"
@click="openForm('stock', scope.row.id)"
v-hasPermi="['mes:wm-outsource-issue:update']"
v-if="scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVING"
>
执行拣货
</el-button>
<!-- 待执行出库状态：执行出库 -->
<!-- 待执行出库：执行领出、取消 -->
<el-button
link
type="warning"
@click="handleFinish(scope.row.id)"
type="success"
@click="openForm('finish', scope.row.id)"
v-hasPermi="['mes:wm-outsource-issue:finish']"
v-if="scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVED"
>
执行领出
</el-button>
<!-- 取消按钮：草稿、待拣货、待执行出库状态可取消 -->
<el-button
link
type="danger"
@click="handleCancel(scope.row.id)"
v-hasPermi="['mes:wm-outsource-issue:update']"
v-if="
scope.row.status === MesWmOutsourceIssueStatusEnum.PREPARE ||
scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVING ||
scope.row.status === MesWmOutsourceIssueStatusEnum.APPROVED
[MesWmOutsourceIssueStatusEnum.APPROVING, MesWmOutsourceIssueStatusEnum.APPROVED].includes(
scope.row.status
)
"
>
取消
@ -167,7 +157,7 @@
<script setup lang="ts">
import { dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { DICT_TYPE } from '@/utils/dict'
import download from '@/utils/download'
import { WmOutsourceIssueApi, WmOutsourceIssueVO } from '@/api/mes/wm/outsourceissue'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
@ -192,6 +182,7 @@ const queryParams = reactive({
issueDate: undefined
})
const queryFormRef = ref() // 搜索的表单
const formRef = ref() // 表单弹窗
/** 查询列表 */
const getList = async () => {
@ -205,48 +196,27 @@ const getList = async () => {
}
}
/** 搜索 */
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置 */
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 新增/修改/详情 */
const formRef = ref() // 表单弹窗
/** 添加/修改操作 */
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 提交到待拣货 */
const handleSubmit = async (id: number) => {
try {
await message.confirm('确认提交到待拣货状态吗？')
await WmOutsourceIssueApi.submitOutsourceIssue(id)
message.success('提交成功')
await getList()
} catch {}
}
/** 完成出库 */
const handleFinish = async (id: number) => {
try {
await message.confirm('确认执行出库吗？执行后将扣减库存，且无法撤销。')
await WmOutsourceIssueApi.finishOutsourceIssue(id)
message.success('出库成功')
await getList()
} catch {}
}
/** 取消发料单 */
/** 取消按钮操作 */
const handleCancel = async (id: number) => {
try {
await message.confirm('确认取消该发料单吗？')
await message.confirm('确认取消该外协发料单？取消后不可恢复。')
await WmOutsourceIssueApi.cancelOutsourceIssue(id)
message.success('取消成功')
await getList()
@ -277,7 +247,7 @@ const handleExport = async () => {
}
/** 初始化 */
onMounted(async () => {
await getList()
onMounted(() => {
getList()
})
</script>