feat(mes): 添加物料接收单状态枚举及相关功能

新增物料接收单的状态枚举,包含草稿、待质检、已完成和待入库状态。
同时更新相关的请求和响应对象,确保在物料接收流程中能够正确处理状态变更。
pull/871/MERGE
YunaiV 2026-02-22 19:16:30 +08:00
parent 6e56876c3c
commit fcd90edc08
9 changed files with 1463 additions and 0 deletions

View File

@ -293,4 +293,5 @@ export enum DICT_TYPE {
MES_PRO_ANDON_LEVEL = 'mes_pro_andon_level', // MES 安灯级别
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 物料接收单状态
}

View File

@ -200,6 +200,10 @@ export const MesProFeedbackTypeEnum = {
}
/** MES 到货通知单状态枚举 */
// TODO @AI4 个状态):草稿
// 待质检
// 已完成
// 待入库
export const MesWmArrivalNoticeStatusEnum = {
PREPARE: 0, // 草稿
SUBMITTED: 1, // 已提交
@ -208,6 +212,16 @@ export const MesWmArrivalNoticeStatusEnum = {
}
/** MES 采购入库单状态枚举 */
// TODO @AI5 个状态):草稿
// 待上架
// 待执行入库
// 已完成
// 已取消
// 创建:进入草稿
// 提交:待上架
// 上架:待执行入库
// 执行入库:已完成
// 取消:已取消
export const MesWmItemReceiptStatusEnum = {
PREPARE: 0, // 草稿
SUBMITTED: 1, // 已提交

View File

@ -157,6 +157,7 @@
>
提交
</el-button>
<!-- TODO @AI是不是没这个操作而是通过采购入库解决的状态变更的 -->
<el-button
link
type="success"

View File

@ -0,0 +1,262 @@
<!-- MES 采购入库明细列表子组件上架分配 -->
<!-- TODO @AI review -->
<template>
<div>
<el-button type="primary" plain @click="openForm('create')" class="mb-10px">
<Icon icon="ep:plus" class="mr-5px" /> 添加上架明细
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="上架数量" align="center" prop="quantity" width="100" />
<el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库区" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位" align="center" prop="areaName" min-width="100" />
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
<el-table-column label="操作" align="center" width="120">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
<!-- 添加/编辑上架明细弹窗 -->
<Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-row>
<el-col :span="12">
<el-form-item label="物料" prop="itemId">
<el-select
v-model="formData.itemId"
placeholder="请选择物料"
filterable
clearable
class="!w-1/1"
>
<el-option
v-for="item in itemList"
:key="item.id"
:label="`${item.code} - ${item.name}`"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上架数量" prop="quantity">
<el-input-number
v-model="formData.quantity"
:precision="2"
:min="0"
controls-position="right"
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="formData.warehouseId"
placeholder="请选择仓库"
clearable
class="!w-1/1"
>
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.id"
:label="warehouse.name"
:value="warehouse.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- TODO @芋艿后续需要通过仓库联动查询库区 -->
<el-form-item label="库区" prop="locationId">
<el-input v-model="formData.locationId" placeholder="请输入库区ID" />
</el-form-item>
</el-col>
<el-col :span="8">
<!-- TODO @芋艿后续需要通过库区联动查询库位 -->
<el-form-item label="库位" prop="areaId">
<el-input v-model="formData.areaId" placeholder="请输入库位ID" />
</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="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<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 { WmItemReceiptDetailApi, WmItemReceiptDetailVO } from '@/api/mes/wm/itemreceipt/detail'
import { MdItemApi } from '@/api/mes/md/item'
import { WmWarehouseApi } from '@/api/mes/wm/warehouse'
defineOptions({ name: 'ItemReceiptDetailList' })
const props = defineProps<{
receiptId: number
lineId: number
}>()
const { t } = useI18n() //
const message = useMessage() //
// ==================== ====================
const loading = ref(false) //
const list = ref<WmItemReceiptDetailVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
receiptId: undefined as number | undefined,
lineId: undefined as number | undefined
})
/** 查询明细列表 */
const getList = async () => {
loading.value = true
try {
queryParams.receiptId = props.receiptId
queryParams.lineId = props.lineId
const data = await WmItemReceiptDetailApi.getItemReceiptDetailPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmItemReceiptDetailApi.deleteItemReceiptDetail(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
// ==================== / ====================
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) //
const formType = ref('') //
const itemList = ref<any[]>([]) //
const warehouseList = ref<any[]>([]) //
const formData = ref({
id: undefined,
lineId: undefined as number | undefined,
receiptId: undefined as number | undefined,
itemId: undefined,
quantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
remark: undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '上架数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开表单弹窗 */
const openForm = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
const [items, warehouses] = await Promise.all([
MdItemApi.getItemSimpleList(),
WmWarehouseApi.getWarehouseSimpleList()
])
itemList.value = items
warehouseList.value = warehouses
if (id) {
formLoading.value = true
try {
formData.value = await WmItemReceiptDetailApi.getItemReceiptDetail(id)
} finally {
formLoading.value = false
}
}
}
/** 提交表单 */
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = {
...formData.value,
receiptId: props.receiptId,
lineId: props.lineId
} as unknown as WmItemReceiptDetailVO
if (formType.value === 'create') {
await WmItemReceiptDetailApi.createItemReceiptDetail(data)
message.success(t('common.createSuccess'))
} else {
await WmItemReceiptDetailApi.updateItemReceiptDetail(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
await getList()
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
lineId: undefined,
receiptId: undefined,
itemId: undefined,
quantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
/** 初始化 */
onMounted(async () => {
await getList()
})
</script>

View File

@ -0,0 +1,213 @@
<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="请输入入库单编号">
<template #append>
<el-button @click="generateCode" :disabled="formType === 'update'">
生成
</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="请输入入库单名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="采购订单编号" prop="purchaseOrderCode">
<el-input v-model="formData.purchaseOrderCode" placeholder="请输入采购订单编号" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- TODO @AI使用 select 组件已经封装 -->
<el-form-item label="供应商" prop="vendorId">
<el-select
v-model="formData.vendorId"
placeholder="请选择供应商"
clearable
class="!w-1/1"
>
<el-option
v-for="vendor in vendorList"
:key="vendor.id"
:label="vendor.name"
:value="vendor.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<!-- TODO @AI使用 select 组件已经封装 -->
<el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="formData.warehouseId"
placeholder="请选择仓库"
clearable
class="!w-1/1"
>
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.id"
:label="warehouse.name"
:value="warehouse.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入库日期" prop="receiptDate">
<el-date-picker
v-model="formData.receiptDate"
type="date"
value-format="x"
placeholder="请选择入库日期"
class="!w-1/1"
/>
</el-form-item>
</el-col>
<!-- TODO @AI到货通知单id封装一个 select 组件对方参考其他的 -->
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 编辑时展示行项目信息入库物料 -->
<template v-if="formData.id">
<el-divider content-position="center">行项目信息</el-divider>
<ItemReceiptLineList :receipt-id="formData.id" />
</template>
<template #footer>
<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 { generateRandomStr } from '@/utils'
import { WmItemReceiptApi, WmItemReceiptVO } from '@/api/mes/wm/itemreceipt'
import { MdVendorApi } from '@/api/mes/md/vendor'
import { WmWarehouseApi } from '@/api/mes/wm/warehouse'
import ItemReceiptLineList from './ItemReceiptLineList.vue'
defineOptions({ name: 'ItemReceiptForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) //
const formType = ref('') // create - update -
const vendorList = ref<any[]>([]) //
const warehouseList = ref<any[]>([]) //
const formData = ref({
id: undefined,
code: undefined,
name: undefined,
purchaseOrderCode: undefined,
vendorId: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
noticeId: undefined,
iqcId: undefined,
receiptDate: undefined,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '入库单编号不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 生成入库单编号 */
const generateCode = () => {
formData.value.code = 'IR' + generateRandomStr(10)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
const [vendors, warehouses] = await Promise.all([
MdVendorApi.getVendorSimpleList(),
WmWarehouseApi.getWarehouseSimpleList()
])
vendorList.value = vendors
warehouseList.value = warehouses
//
if (id) {
formLoading.value = true
try {
formData.value = await WmItemReceiptApi.getItemReceipt(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as WmItemReceiptVO
if (formType.value === 'create') {
await WmItemReceiptApi.createItemReceipt(data)
message.success(t('common.createSuccess'))
} else {
await WmItemReceiptApi.updateItemReceipt(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
code: undefined,
name: undefined,
purchaseOrderCode: undefined,
vendorId: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
noticeId: undefined,
iqcId: undefined,
receiptDate: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,300 @@
<!-- MES 采购入库单行列表子组件 -->
<template>
<div>
<el-button type="primary" plain @click="openForm('create')" class="mb-10px">
<Icon icon="ep:plus" class="mr-5px" /> 添加物料
</el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="入库数量" align="center" prop="receivedQuantity" width="100" />
<el-table-column
label="生产批号"
align="center"
prop="productionBatchNumber"
min-width="120"
/>
<!-- TODO @AI删除是否检验检验单号备注 -->
<el-table-column label="是否检验" align="center" prop="iqcCheckFlag" width="90">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.iqcCheckFlag" />
</template>
</el-table-column>
<el-table-column label="检验单号" align="center" prop="iqcCode" min-width="140" />
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
<!-- TODO @AI操作需要 fixed -->
<el-table-column label="操作" align="center" width="120">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</div>
<!-- 添加/编辑行弹窗 -->
<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="12">
<el-form-item label="物料" prop="itemId">
<el-select
v-model="formData.itemId"
placeholder="请选择物料"
filterable
clearable
class="!w-1/1"
>
<el-option
v-for="item in itemList"
:key="item.id"
:label="`${item.code} - ${item.name}`"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="入库数量" prop="receivedQuantity">
<el-input-number
v-model="formData.receivedQuantity"
:precision="2"
:min="0"
controls-position="right"
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="formData.warehouseId"
placeholder="请选择仓库"
clearable
class="!w-1/1"
>
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.id"
:label="warehouse.name"
:value="warehouse.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="生产批号" prop="productionBatchNumber">
<el-input v-model="formData.productionBatchNumber" placeholder="请输入生产批号" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否检验" prop="iqcCheckFlag">
<el-switch v-model="formData.iqcCheckFlag" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="生产日期" prop="productionDate">
<el-date-picker
v-model="formData.productionDate"
type="date"
value-format="x"
placeholder="请选择"
class="!w-1/1"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="有效期" prop="expireDate">
<el-date-picker
v-model="formData.expireDate"
type="date"
value-format="x"
placeholder="请选择"
class="!w-1/1"
/>
</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="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 编辑时展示上架明细 -->
<template v-if="formData.id">
<el-divider content-position="center">上架明细</el-divider>
<ItemReceiptDetailList :receipt-id="props.receiptId" :line-id="formData.id" />
</template>
<template #footer>
<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 { WmItemReceiptLineApi, WmItemReceiptLineVO } from '@/api/mes/wm/itemreceipt/line'
import { MdItemApi } from '@/api/mes/md/item'
import { WmWarehouseApi } from '@/api/mes/wm/warehouse'
import ItemReceiptDetailList from './ItemReceiptDetailList.vue'
defineOptions({ name: 'ItemReceiptLineList' })
const props = defineProps<{
receiptId: number
}>()
const { t } = useI18n() //
const message = useMessage() //
// ==================== ====================
const loading = ref(false) //
const list = ref<WmItemReceiptLineVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
receiptId: undefined as number | undefined
})
/** 查询行列表 */
const getList = async () => {
loading.value = true
try {
queryParams.receiptId = props.receiptId
const data = await WmItemReceiptLineApi.getItemReceiptLinePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmItemReceiptLineApi.deleteItemReceiptLine(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
// ==================== / ====================
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) //
const formType = ref('') //
const itemList = ref<any[]>([]) //
const warehouseList = ref<any[]>([]) //
const formData = ref({
id: undefined,
receiptId: undefined as number | undefined,
itemId: undefined,
receivedQuantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
productionDate: undefined,
expireDate: undefined,
productionBatchNumber: undefined,
iqcCheckFlag: false,
remark: undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
receivedQuantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开表单弹窗 */
const openForm = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
const [items, warehouses] = await Promise.all([
MdItemApi.getItemSimpleList(),
WmWarehouseApi.getWarehouseSimpleList()
])
itemList.value = items
warehouseList.value = warehouses
if (id) {
formLoading.value = true
try {
formData.value = await WmItemReceiptLineApi.getItemReceiptLine(id)
} finally {
formLoading.value = false
}
}
}
/** 提交表单 */
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = { ...formData.value, receiptId: props.receiptId } as unknown as WmItemReceiptLineVO
if (formType.value === 'create') {
await WmItemReceiptLineApi.createItemReceiptLine(data)
message.success(t('common.createSuccess'))
} else {
await WmItemReceiptLineApi.updateItemReceiptLine(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
await getList()
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
receiptId: undefined,
itemId: undefined,
receivedQuantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
productionDate: undefined,
expireDate: undefined,
productionBatchNumber: undefined,
iqcCheckFlag: false,
remark: undefined
}
formRef.value?.resetFields()
}
/** 初始化 */
onMounted(async () => {
await getList()
})
</script>

View File

@ -0,0 +1,185 @@
<!-- TODO @AI review -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="700px">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="110px"
v-loading="formLoading"
>
<el-row>
<el-col :span="12">
<el-form-item label="物料" prop="itemId">
<el-select
v-model="formData.itemId"
placeholder="请选择物料"
filterable
clearable
class="!w-1/1"
>
<el-option
v-for="item in itemList"
:key="item.id"
:label="`${item.code} - ${item.name}`"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上架数量" prop="quantity">
<el-input-number
v-model="formData.quantity"
:precision="2"
:min="0"
controls-position="right"
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="仓库" prop="warehouseId">
<el-select
v-model="formData.warehouseId"
placeholder="请选择仓库"
clearable
class="!w-1/1"
>
<el-option
v-for="warehouse in warehouseList"
:key="warehouse.id"
:label="warehouse.name"
:value="warehouse.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库区" prop="locationId">
<el-input v-model="formData.locationId" placeholder="请输入库区ID" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库位" prop="areaId">
<el-input v-model="formData.areaId" placeholder="请输入库位ID" />
</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="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<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 { WmItemReceiptDetailApi, WmItemReceiptDetailVO } from '@/api/mes/wm/itemreceipt/detail'
import { MdItemApi } from '@/api/mes/md/item'
import { WmWarehouseApi } from '@/api/mes/wm/warehouse'
defineOptions({ name: 'ItemReceiptDetailForm' })
const props = defineProps<{ receiptId: number; lineId: number }>()
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const itemList = ref<any[]>([])
const warehouseList = ref<any[]>([])
const formData = ref({
id: undefined,
lineId: undefined as number | undefined,
receiptId: undefined as number | undefined,
itemId: undefined,
quantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
remark: undefined
})
const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '上架数量不能为空', trigger: 'blur' }]
})
const formRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
const [items, warehouses] = await Promise.all([
MdItemApi.getItemSimpleList(),
WmWarehouseApi.getWarehouseSimpleList()
])
itemList.value = items
warehouseList.value = warehouses
if (id) {
formLoading.value = true
try {
formData.value = await WmItemReceiptDetailApi.getItemReceiptDetail(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open })
/** 提交表单 */
const emit = defineEmits(['success'])
const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const data = {
...formData.value,
receiptId: props.receiptId,
lineId: props.lineId
} as unknown as WmItemReceiptDetailVO
if (formType.value === 'create') {
await WmItemReceiptDetailApi.createItemReceiptDetail(data)
message.success(t('common.createSuccess'))
} else {
await WmItemReceiptDetailApi.updateItemReceiptDetail(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
lineId: undefined,
receiptId: undefined,
itemId: undefined,
quantity: undefined,
warehouseId: undefined,
locationId: undefined,
areaId: undefined,
batchId: undefined,
remark: undefined
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,167 @@
<!-- TODO @AI review -->
<template>
<ContentWrap>
<el-button @click="goBack" class="mb-10px">
<Icon icon="ep:arrow-left" class="mr-5px" /> 返回行项目列表
</el-button>
</ContentWrap>
<ContentWrap>
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<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-item-receipt:create']"
>
<Icon icon="ep:plus" 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="itemCode" min-width="120" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" />
<el-table-column label="单位" align="center" prop="unitMeasureName" min-width="80" />
<el-table-column label="上架数量" align="center" prop="quantity" min-width="100" />
<el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
<el-table-column label="库区" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位" align="center" prop="areaName" min-width="100" />
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="160">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt: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>
<ItemReceiptDetailForm
ref="formRef"
@success="getList"
:receiptId="receiptId"
:lineId="lineId"
/>
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import {
WmItemReceiptDetailApi,
WmItemReceiptDetailVO
} from '@/api/mes/wm/itemreceipt/detail'
import ItemReceiptDetailForm from './ItemReceiptDetailForm.vue'
defineOptions({ name: 'MesWmItemReceiptDetail' })
const message = useMessage()
const { t } = useI18n()
const router = useRouter()
const route = useRoute()
const receiptId = Number(route.query.receiptId)
const lineId = Number(route.query.lineId)
const loading = ref(true)
const list = ref<WmItemReceiptDetailVO[]>([])
const total = ref(0)
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
receiptId,
lineId
})
const queryFormRef = ref()
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await WmItemReceiptDetailApi.getItemReceiptDetailPage(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 WmItemReceiptDetailApi.deleteItemReceiptDetail(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 返回 */
const goBack = () => {
router.push({
name: 'MesWmItemReceiptLine',
query: { receiptId: String(receiptId) }
})
}
/** 初始化 */
onMounted(async () => {
await getList()
})
</script>

View File

@ -0,0 +1,320 @@
<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>
<el-form-item label="采购订单编号" prop="purchaseOrderCode">
<el-input
v-model="queryParams.purchaseOrderCode"
placeholder="请输入采购订单编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="供应商" prop="vendorId">
<el-select
v-model="queryParams.vendorId"
placeholder="请选择供应商"
clearable
class="!w-240px"
>
<el-option
v-for="vendor in vendorList"
:key="vendor.id"
:label="vendor.name"
:value="vendor.id"
/>
</el-select>
</el-form-item>
<el-form-item label="入库日期" prop="receiptDate">
<el-date-picker
v-model="queryParams.receiptDate"
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_ITEM_RECEIPT_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-item-receipt:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:wm-item-receipt: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('update', 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="purchaseOrderCode"
min-width="140"
/>
<el-table-column label="供应商名称" align="center" prop="vendorName" min-width="120" />
<el-table-column
label="入库日期"
align="center"
prop="receiptDate"
:formatter="dateFormatter2"
width="180px"
/>
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_WM_ITEM_RECEIPT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" width="240" fixed="right">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:update']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.PREPARE"
>
编辑
</el-button>
<el-button
link
type="warning"
@click="handleSubmit(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:update']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.PREPARE"
>
提交
</el-button>
<!-- TODO @AI审批 => 执行上架 -->
<!-- todo @AI阅读下 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/utils/constants.ts 最新状态前后端字典都需要调整下 -->
<el-button
link
type="success"
@click="handleApprove(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:update']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.SUBMITTED"
>
审批
</el-button>
<el-button
link
type="primary"
@click="handleExecute(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:execute']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.APPROVED"
>
执行入库
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:wm-item-receipt:delete']"
v-if="scope.row.status === MesWmItemReceiptStatusEnum.PREPARE"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<ItemReceiptForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import download from '@/utils/download'
import { WmItemReceiptApi, WmItemReceiptVO } from '@/api/mes/wm/itemreceipt'
import { MdVendorApi } from '@/api/mes/md/vendor'
import ItemReceiptForm from './ItemReceiptForm.vue'
import { MesWmItemReceiptStatusEnum } from '@/views/mes/utils/constants'
defineOptions({ name: 'MesWmItemReceipt' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<WmItemReceiptVO[]>([]) //
const total = ref(0) //
const exportLoading = ref(false) //
const vendorList = ref<any[]>([]) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
code: undefined,
name: undefined,
purchaseOrderCode: undefined,
vendorId: undefined,
receiptDate: undefined,
status: undefined
})
const queryFormRef = ref() //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await WmItemReceiptApi.getItemReceiptPage(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 handleSubmit = async (id: number) => {
try {
await message.confirm('确认提交该采购入库单?')
await WmItemReceiptApi.submitItemReceipt(id)
message.success('提交成功')
await getList()
} catch {}
}
/** 审批 */
const handleApprove = async (id: number) => {
try {
await message.confirm('确认审批通过该采购入库单?')
await WmItemReceiptApi.approveItemReceipt(id)
message.success('审批成功')
await getList()
} catch {}
}
/** 执行入库 */
const handleExecute = async (id: number) => {
try {
await message.confirm('确认执行入库?执行后将更新库存台账。')
await WmItemReceiptApi.executeItemReceipt(id)
message.success('入库成功')
await getList()
} catch {}
}
/** 删除 */
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await WmItemReceiptApi.deleteItemReceipt(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}
}
/** 导出 */
const handleExport = async () => {
try {
await message.exportConfirm()
exportLoading.value = true
const data = await WmItemReceiptApi.exportItemReceipt(queryParams)
download.excel(data, '采购入库单.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 */
onMounted(async () => {
vendorList.value = await MdVendorApi.getVendorSimpleList()
await getList()
})
</script>