feat(mes): 新增库存物资记录编号字段及相关逻辑

pull/871/MERGE
YunaiV 2026-03-30 15:50:31 +08:00
parent d8dbbf156e
commit e41d14bb67
2 changed files with 46 additions and 10 deletions

View File

@ -5,6 +5,7 @@ export interface WmProductReceiptLineVO {
id: number id: number
receiptId: number receiptId: number
itemId: number itemId: number
materialStockId: number
itemCode: string itemCode: string
itemName: string itemName: string
specification: string specification: string

View File

@ -74,10 +74,14 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-row> <el-row>
<!-- TODO @芋艿后面处理库存物资选择 -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料物料" prop="itemId"> <el-form-item label="库存记录" prop="materialStockId">
<MdItemSelect v-model="formData.itemId" placeholder="请选择物料物料" class="!w-1/1" /> <WmMaterialStockSelect
v-model="formData.materialStockId"
placeholder="请选择库存"
class="!w-1/1"
@change="handleStockChange"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -86,14 +90,22 @@
v-model="formData.quantity" v-model="formData.quantity"
:precision="2" :precision="2"
:min="0" :min="0"
:max="quantityMax"
controls-position="right" controls-position="right"
class="!w-1/1" class="!w-1/1"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号" prop="batchCode"> <el-form-item label="批次号">
<el-input v-model="formData.batchCode" placeholder="请输入批次号" /> <el-input :model-value="formData.batchCode" disabled placeholder="选择库存后自动带出" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物料">
<MdItemSelect v-model="formData.itemId" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -123,6 +135,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { WmProductReceiptLineApi, WmProductReceiptLineVO } from '@/api/mes/wm/productreceipt/line' import { WmProductReceiptLineApi, WmProductReceiptLineVO } from '@/api/mes/wm/productreceipt/line'
import { WmMaterialStockVO } from '@/api/mes/wm/materialstock'
import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import ProductReceiptDetailList from './ProductReceiptDetailList.vue' import ProductReceiptDetailList from './ProductReceiptDetailList.vue'
import ProductReceiptDetailForm from './ProductReceiptDetailForm.vue' import ProductReceiptDetailForm from './ProductReceiptDetailForm.vue'
@ -180,21 +194,40 @@ const dialogVisible = ref(false)
const dialogTitle = ref('') const dialogTitle = ref('')
const formLoading = ref(false) const formLoading = ref(false)
const lineFormType = ref('') const lineFormType = ref('')
const quantityMax = ref<number | undefined>(undefined)
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
receiptId: undefined as number | undefined, receiptId: undefined as number | undefined,
itemId: undefined, materialStockId: undefined as number | undefined,
quantity: undefined, itemId: undefined as number | undefined,
batchId: undefined, quantity: undefined as number | undefined,
batchCode: undefined, batchId: undefined as number | undefined,
batchCode: undefined as string | undefined,
remark: undefined remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], materialStockId: [{ required: true, message: '请选择库存记录', trigger: 'change' }],
quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }] quantity: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }]
}) })
const formRef = ref() const formRef = ref()
/** 库存选中回调 —— 自动回填物料ID/批次/数量上限 */
const handleStockChange = (stock: WmMaterialStockVO | undefined) => {
if (!stock) {
formData.value.itemId = undefined
formData.value.batchId = undefined
formData.value.batchCode = undefined
formData.value.quantity = undefined
quantityMax.value = undefined
return
}
formData.value.itemId = stock.itemId
formData.value.batchId = stock.batchId
formData.value.batchCode = stock.batchCode
formData.value.quantity = stock.quantity
quantityMax.value = stock.quantity
}
/** 打开表单弹窗 */ /** 打开表单弹窗 */
const openForm = async (type: string, id?: number) => { const openForm = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
@ -236,12 +269,14 @@ const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
receiptId: undefined, receiptId: undefined,
materialStockId: undefined,
itemId: undefined, itemId: undefined,
quantity: undefined, quantity: undefined,
batchId: undefined, batchId: undefined,
batchCode: undefined, batchCode: undefined,
remark: undefined remark: undefined
} }
quantityMax.value = undefined
formRef.value?.resetFields() formRef.value?.resetFields()
} }