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): 添加流转卡和工序记录相关的请求和响应 VO，重构服务接口及实现

pull/871/MERGE
YunaiV 2026-02-21 11:58:14 +08:00
parent eab4883204
commit 7b274a0990
4 changed files with 565 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/api/mes/pro/card/index.ts Normal file
View File

@ -0,0 +1,54 @@
import request from '@/config/axios'
// MES 生产流转卡 VO
export interface ProCardVO {
id: number // 编号
code: string // 流转卡编码
workOrderId: number // 生产工单编号
workOrderCode: string // 工单编码
workOrderName: string // 工单名称
batchCode: string // 批次号
itemId: number // 产品物料编号
itemCode: string // 产品编码
itemName: string // 产品名称
specification: string // 规格型号
unitMeasureId: number // 单位编号
unitMeasureName: string // 单位名称
barcodeUrl: string // 条码地址
transferedQuantity: number // 流转数量
status: number // 状态
remark: string // 备注
}
// MES 生产流转卡 API
export const ProCardApi = {
// 查询生产流转卡分页
getCardPage: async (params: any) => {
return await request.get({ url: `/mes/pro/card/page`, params })
},
// 查询生产流转卡详情
getCard: async (id: number) => {
return await request.get({ url: `/mes/pro/card/get?id=` + id })
},
// 新增生产流转卡
createCard: async (data: ProCardVO) => {
return await request.post({ url: `/mes/pro/card/create`, data })
},
// 修改生产流转卡
updateCard: async (data: ProCardVO) => {
return await request.put({ url: `/mes/pro/card/update`, data })
},
// 删除生产流转卡
deleteCard: async (id: number) => {
return await request.delete({ url: `/mes/pro/card/delete?id=` + id })
},
// 导出生产流转卡 Excel
exportCard: async (params: any) => {
return await request.download({ url: `/mes/pro/card/export-excel`, params })
}
}

51
src/api/mes/pro/card/process/index.ts Normal file
View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
// MES 流转卡工序记录 VO
export interface ProCardProcessVO {
id: number // 编号
cardId: number // 流转卡编号
sort: number // 序号
processId: number // 工序编号
processCode: string // 工序编码
processName: string // 工序名称
inputTime: Date // 进入工序时间
outputTime: Date // 出工序时间
inputQuantity: number // 投入数量
outputQuantity: number // 产出数量
unqualifiedQuantity: number // 不合格品数量
workstationId: number // 工位编号
workstationCode: string // 工位编码
workstationName: string // 工位名称
userId: number // 操作人编号
nickname: string // 操作人名称
ipqcId: number // 过程检验单编号
remark: string // 备注
}
// MES 流转卡工序记录 API
export const ProCardProcessApi = {
// 查询流转卡工序记录分页
getCardProcessPage: async (params: any) => {
return await request.get({ url: `/mes/pro/card-process/page`, params })
},
// 查询流转卡工序记录详情
getCardProcess: async (id: number) => {
return await request.get({ url: `/mes/pro/card-process/get?id=` + id })
},
// 新增流转卡工序记录
createCardProcess: async (data: ProCardProcessVO) => {
return await request.post({ url: `/mes/pro/card-process/create`, data })
},
// 修改流转卡工序记录
updateCardProcess: async (data: ProCardProcessVO) => {
return await request.put({ url: `/mes/pro/card-process/update`, data })
},
// 删除流转卡工序记录
deleteCardProcess: async (id: number) => {
return await request.delete({ url: `/mes/pro/card-process/delete?id=` + id })
}
}

228
src/views/mes/pro/card/CardForm.vue Normal file
View File

@ -0,0 +1,228 @@
<!-- MES 生产流转卡表单 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="960px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="120px"
v-loading="formLoading"
>
<el-row>
<el-col :span="12">
<el-form-item label="流转卡编码" prop="code">
<el-input v-model="formData.code" placeholder="请输入流转卡编码" :disabled="isDetail">
<template #append>
<el-button @click="generateCode" :disabled="formType === 'update' || isDetail">
生成
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产工单" prop="workOrderId">
<el-input-number
v-model="formData.workOrderId"
placeholder="请输入工单编号"
class="!w-1/1"
:disabled="isDetail"
/>
<!-- TODO @芋艿：替换为 WorkOrderSelect 组件（工单选择器） -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="产品" prop="itemId">
<MdItemSelect
v-model="formData.itemId"
:disabled="isDetail"
@change="handleItemChange"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="流转数量" prop="transferedQuantity">
<el-input-number
v-model="formData.transferedQuantity"
:min="0"
:precision="2"
class="!w-1/1"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="formData.batchCode"
placeholder="请输入批次号"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="规格型号" prop="specification">
<el-input
v-model="formData.specification"
placeholder="请输入规格型号"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formType !== 'create'">
<el-form-item label="状态" prop="status">
<dict-tag :type="DICT_TYPE.MES_PRO_WORK_ORDER_STATUS" :value="formData.status" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input
type="textarea"
v-model="formData.remark"
placeholder="请输入备注"
:disabled="isDetail"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 工序记录子表：编辑/详情时显示 -->
<el-tabs v-if="formType !== 'create'" v-model="activeTab" class="mt-15px">
<el-tab-pane label="工序记录" name="process">
<CardProcessList
v-if="formData.id"
:card-id="formData.id"
:disabled="isDetail"
/>
</el-tab-pane>
</el-tabs>
<template #footer v-if="!isDetail">
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
import { MdItemVO } from '@/api/mes/md/item'
import { generateRandomStr } from '@/utils'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import CardProcessList from './CardProcessList.vue'
defineOptions({ name: 'CardForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中
const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
const activeTab = ref('process') // 活跃的 Tab
const formData = ref({
id: undefined,
code: undefined,
workOrderId: undefined,
batchCode: undefined,
itemId: undefined,
specification: undefined,
unitMeasureId: undefined,
barcodeUrl: undefined,
transferedQuantity: undefined,
status: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '流转卡编码不能为空', trigger: 'blur' }],
workOrderId: [{ required: true, message: '生产工单不能为空', trigger: 'change' }],
itemId: [{ required: true, message: '产品不能为空', trigger: 'change' }],
transferedQuantity: [{ required: true, message: '流转数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref
/** 是否为详情模式 */
const isDetail = computed(() => formType.value === 'detail')
/** 生成流转卡编码 */
const generateCode = () => {
formData.value.code = 'CARD' + generateRandomStr(10)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = type === 'detail' ? '流转卡详情' : t('action.' + type)
formType.value = type
activeTab.value = 'process'
resetForm()
// 修改/详情时，设置数据
if (id) {
formLoading.value = true
try {
formData.value = await ProCardApi.getCard(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 产品变更：自动填充单位和规格 */
// TODO @AI：这 2 个字段，不用存储，通过 item 查询即可。
const handleItemChange = (item: MdItemVO) => {
if (item?.unitMeasureId) {
formData.value.unitMeasureId = item.unitMeasureId
}
if (item?.specification) {
formData.value.specification = item.specification
}
}
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = formData.value as unknown as ProCardVO
if (formType.value === 'create') {
await ProCardApi.createCard(data)
message.success(t('common.createSuccess'))
} else {
await ProCardApi.updateCard(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
workOrderId: undefined,
batchCode: undefined,
itemId: undefined,
specification: undefined,
unitMeasureId: undefined,
barcodeUrl: undefined,
transferedQuantity: undefined,
status: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

232
src/views/mes/pro/card/index.vue Normal file
View File

@ -0,0 +1,232 @@
<!-- MES 生产流转卡列表 -->
<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>
<!-- TODO @AI：生产工单编号 select 组件 -->
<!-- TODO @AI：批次号 -->
<el-form-item label="产品" prop="itemId">
<MdItemSelect v-model="queryParams.itemId" placeholder="请选择产品" class="!w-240px" />
</el-form-item>
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="queryParams.batchCode"
placeholder="请输入批次号"
clearable
@keyup.enter="handleQuery"
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_PRO_WORK_ORDER_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
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>
<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:pro-card:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:pro-card: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" width="140" />
<el-table-column label="生产工单编号" align="center" prop="workOrderCode" width="140" />
<el-table-column label="工单名称" align="center" prop="workOrderName" min-width="150" />
<el-table-column label="批次号" align="center" prop="batchCode" width="120" />
<el-table-column label="产品物料编码" align="center" prop="itemCode" width="120" />
<el-table-column label="产品物料名称" align="center" prop="itemName" min-width="120" />
<el-table-column label="规格型号" align="center" prop="specification" width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="流转数量" align="center" prop="transferedQuantity" width="100" />
<el-table-column label="状态" align="center" prop="status" width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_PRO_WORK_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180"
/>
<el-table-column label="操作" align="center" width="200" fixed="right">
<template #default="scope">
<!-- TODO @芋艿：打印 -->
<el-button
link
type="primary"
@click="openForm('detail', scope.row.id)"
v-hasPermi="['mes:pro-card:query']"
>
详情
</el-button>
<!-- TODO @芋艿：好像不用编辑、删除？？？ -->
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:pro-card:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:pro-card:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<CardForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { ProCardApi, ProCardVO } from '@/api/mes/pro/card'
import CardForm from './CardForm.vue'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
defineOptions({ name: 'MesProCard' })
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const loading = ref(true) // 列表的加载中
const list = ref<ProCardVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
itemId: undefined,
batchCode: undefined,
status: undefined,
createTime: undefined
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await ProCardApi.getCardPage(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 formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await ProCardApi.deleteCard(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await ProCardApi.exportCard(queryParams)
download.excel(data, '生产流转卡.xls')
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(async () => {
await getList()
})
</script>