feat(mes): 添加上架功能及相关字段校验

新增执行上架功能,允许将待上架状态的转移单更新为待执行状态。
同时,添加了转移单及转移单行的字段校验,确保必要字段不为空,提升数据完整性。
pull/871/MERGE
YunaiV 2026-03-08 22:38:03 +08:00
parent 544546862c
commit 74e058ee49
6 changed files with 140 additions and 217 deletions

View File

@ -56,6 +56,11 @@ export const WmTransferApi = {
return await request.put({ url: '/mes/wm/transfer/confirm?id=' + id }) return await request.put({ url: '/mes/wm/transfer/confirm?id=' + id })
}, },
// 执行上架
stockTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/stock?id=' + id })
},
// 完成转移 // 完成转移
finishTransfer: async (id: number) => { finishTransfer: async (id: number) => {
return await request.put({ url: '/mes/wm/transfer/finish?id=' + id }) return await request.put({ url: '/mes/wm/transfer/finish?id=' + id })

View File

@ -49,8 +49,6 @@ import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSe
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue' import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue' import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
// TODO @AI detailform
defineOptions({ name: 'TransferDetailForm' }) defineOptions({ name: 'TransferDetailForm' })
const props = defineProps<{ const props = defineProps<{
@ -58,15 +56,16 @@ const props = defineProps<{
}>() }>()
const emit = defineEmits(['success']) const emit = defineEmits(['success'])
const { t } = useI18n()
const message = useMessage()
const dialogVisible = ref(false) const { t } = useI18n() //
const dialogTitle = ref('') const message = useMessage() //
const formLoading = ref(false)
const formType = ref('') const dialogVisible = ref(false) //
const currentLineId = ref<number>() const dialogTitle = ref('') //
const formRef = ref() const formLoading = ref(false) //
const formType = ref('') // 表单的类型create / update
const currentLineId = ref<number>() // ID
const formRef = ref() // Ref
const formData = ref({ const formData = ref({
id: undefined as number | undefined, id: undefined as number | undefined,
lineId: undefined as number | undefined, lineId: undefined as number | undefined,
@ -88,12 +87,14 @@ const formRules = reactive({
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }] quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
}) })
/** 打开弹窗 */
const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => { const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => {
dialogVisible.value = true dialogVisible.value = true
dialogTitle.value = type === 'create' ? '添加调拨明细' : '编辑调拨明细' dialogTitle.value = type === 'create' ? '添加调拨明细' : '编辑调拨明细'
formType.value = type formType.value = type
currentLineId.value = lineId currentLineId.value = lineId
resetForm() resetForm()
//
if (detailId) { if (detailId) {
formLoading.value = true formLoading.value = true
try { try {
@ -101,14 +102,17 @@ const open = async (type: string, lineId: number, itemId?: number, detailId?: nu
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} else { } else if (itemId) {
formData.value.itemId = itemId formData.value.itemId = itemId
} }
} }
defineExpose({ open }) defineExpose({ open })
/** 提交表单 */
const submitForm = async () => { const submitForm = async () => {
//
await formRef.value.validate() await formRef.value.validate()
//
formLoading.value = true formLoading.value = true
try { try {
const data = { const data = {
@ -124,12 +128,14 @@ const submitForm = async () => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
//
emit('success', currentLineId.value) emit('success', currentLineId.value)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
} }
/** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,

View File

@ -1,18 +1,18 @@
<template> <template>
<div class="pl-60px pr-20px py-10px"> <div class="pl-60px pr-20px py-10px">
<!-- TODO @AI不用这个 -->
<div v-if="props.formType === 'stock'" class="mb-10px flex justify-between items-center">
<span class="text-12px text-[var(--el-text-color-secondary)]">
行数量{{ props.lineQuantity || 0 }}已分配{{ allocatedQuantity }}剩余{{ remainingQuantity }}
</span>
</div>
<el-table v-loading="loading" :data="list" border size="small"> <el-table v-loading="loading" :data="list" border size="small">
<!-- TODO @AI仓库名称库区名称库位名称 --> <!-- TODO @ai这里物料编码等等字段没展示看看后端是不是没读取 -->
<el-table-column label="移入仓库" align="center" prop="toWarehouseName" min-width="100" /> <el-table-column label="移入仓库" align="center" prop="toWarehouseName" min-width="100" />
<el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" /> <el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" />
<el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" /> <el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="100" /> <el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column v-if="props.formType === 'stock'" label="操作" align="center" width="120" fixed="right"> <el-table-column
v-if="props.formType === 'stock'"
label="操作"
align="center"
width="120"
fixed="right"
>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)">编辑</el-button> <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">编辑</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button> <el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>
@ -25,8 +25,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { WmTransferDetailApi, WmTransferDetailVO } from '@/api/mes/wm/transfer/detail' import { WmTransferDetailApi, WmTransferDetailVO } from '@/api/mes/wm/transfer/detail'
// TODO @AI detaillist
defineOptions({ name: 'TransferDetailList' }) defineOptions({ name: 'TransferDetailList' })
const props = defineProps<{ const props = defineProps<{
@ -39,19 +37,13 @@ const props = defineProps<{
const emit = defineEmits(['edit-detail']) const emit = defineEmits(['edit-detail'])
const { t } = useI18n() const { t } = useI18n() //
const message = useMessage() const message = useMessage() //
const loading = ref(false) const loading = ref(false) //
const list = ref<WmTransferDetailVO[]>([]) const list = ref<WmTransferDetailVO[]>([]) //
const allocatedQuantity = computed(() => {
return list.value.reduce((sum, item) => sum + Number(item.quantity || 0), 0)
})
const remainingQuantity = computed(() => {
return Number(props.lineQuantity || 0) - allocatedQuantity.value
})
/** 查询明细列表 */
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
@ -63,6 +55,7 @@ const getList = async () => {
defineExpose({ getList }) defineExpose({ getList })
/** 删除调拨明细 */
const handleDelete = async (detailId: number) => { const handleDelete = async (detailId: number) => {
try { try {
await message.delConfirm() await message.delConfirm()
@ -72,6 +65,7 @@ const handleDelete = async (detailId: number) => {
} catch {} } catch {}
} }
/** 初始化:延迟加载,展开时才触发 */
onMounted(() => { onMounted(() => {
getList() getList()
}) })

View File

@ -32,7 +32,6 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="转移单类型" prop="type"> <el-form-item label="转移单类型" prop="type">
<!-- DONE @AI编辑时允许调整转移单类型配送相关字段按类型和是否配送联动展示 -->
<el-select <el-select
v-model="formData.type" v-model="formData.type"
placeholder="请选择转移单类型" placeholder="请选择转移单类型"
@ -48,7 +47,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- DONE @AI前端仅选择日期后端继续按 LocalDateTime 接收 -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="转移日期" prop="transferDate"> <el-form-item label="转移日期" prop="transferDate">
<el-date-picker <el-date-picker
@ -66,7 +64,6 @@
<el-switch v-model="formData.deliveryFlag" :disabled="isHeaderReadonly" /> <el-switch v-model="formData.deliveryFlag" :disabled="isHeaderReadonly" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- TODO @AI目前看是否确认前端不传递所以 save 接口也处理掉 -->
<el-col v-if="isOuterType" :span="8"> <el-col v-if="isOuterType" :span="8">
<el-form-item label="是否确认" prop="confirmFlag"> <el-form-item label="是否确认" prop="confirmFlag">
<el-switch :model-value="formData.confirmFlag" disabled /> <el-switch :model-value="formData.confirmFlag" disabled />
@ -130,16 +127,9 @@
</el-row> </el-row>
</el-form> </el-form>
<!-- TODO @AI需要跟进下 --> <!-- 非新建模式展示行项目信息调拨物料 -->
<template v-if="formData.id"> <template v-if="formData.id">
<el-alert <el-divider content-position="center">物料信息</el-divider>
v-if="formType === 'stock'"
type="info"
:closable="false"
class="mb-12px"
title="当前阶段仅维护调拨明细;明细维护完成后,请回到列表页执行后续状态操作。"
/>
<el-divider content-position="center">调拨物料</el-divider>
<TransferLineList :transfer-id="formData.id" :form-type="formType" /> <TransferLineList :transfer-id="formData.id" :form-type="formType" />
</template> </template>
@ -147,6 +137,9 @@
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading"> <el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
</el-button> </el-button>
<el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
执行上架
</el-button>
<el-button @click="dialogVisible = false"> </el-button> <el-button @click="dialogVisible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>
@ -158,17 +151,15 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer' import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer'
import TransferLineList from './TransferLineList.vue' import TransferLineList from './TransferLineList.vue'
// DONE @AI /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue
defineOptions({ name: 'TransferForm' }) defineOptions({ name: 'TransferForm' })
const emit = defineEmits(['success']) const emit = defineEmits(['success'])
const message = useMessage() const message = useMessage() //
const dialogVisible = ref(false) const dialogVisible = ref(false) //
const formLoading = ref(false) const formLoading = ref(false) //
const formType = ref<string>('create') const formType = ref<string>('create') // 表单的类型create / update / stock / detail
const formRef = ref() const formRef = ref() // Ref
const formData = ref({ const formData = ref({
id: undefined as number | undefined, id: undefined as number | undefined,
code: undefined, code: undefined,
@ -182,61 +173,37 @@ const formData = ref({
shippingNumber: undefined, shippingNumber: undefined,
confirmFlag: false, confirmFlag: false,
transferDate: undefined, transferDate: undefined,
status: undefined,
remark: undefined remark: undefined
}) })
// DONE @AI
// TODO @AI
const validateRecipientFields = (_rule, _value, callback) => {
if (!showDeliveryFields.value) {
callback()
return
}
if (!formData.value.recipientName) {
callback(new Error('外部调拨时收货人不能为空'))
return
}
if (!formData.value.recipientTelephone) {
callback(new Error('外部调拨时联系电话不能为空'))
return
}
if (!formData.value.destinationAddress) {
callback(new Error('外部调拨时目的地不能为空'))
return
}
callback()
}
const formRules = reactive({ const formRules = reactive({
code: [{ required: true, message: '转移单编号不能为空', trigger: 'blur' }], code: [{ required: true, message: '转移单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '转移单名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '转移单名称不能为空', trigger: 'blur' }],
type: [{ required: true, message: '转移单类型不能为空', trigger: 'change' }], type: [{ required: true, message: '转移单类型不能为空', trigger: 'change' }],
transferDate: [{ required: true, message: '转移日期不能为空', trigger: 'change' }], transferDate: [{ required: true, message: '转移日期不能为空', trigger: 'change' }],
recipientName: [{ validator: validateRecipientFields, trigger: 'blur' }],
recipientTelephone: [{ validator: validateRecipientFields, trigger: 'blur' }],
destinationAddress: [{ validator: validateRecipientFields, trigger: 'blur' }]
}) })
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) //
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) const isStock = computed(() => formType.value === 'stock') //
const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2) const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) //
const showDeliveryFields = computed(() => isOuterType.value && !!formData.value.deliveryFlag) const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2) //
const showDeliveryFields = computed(() => isOuterType.value && !!formData.value.deliveryFlag) //
const dialogTitle = computed(() => { const dialogTitle = computed(() => {
const titles = { const titles = {
create: '新增转移单', create: '新增转移单',
update: '编辑转移单', update: '编辑转移单',
stock: '维护调拨明细', stock: '执行上架',
detail: '转移单详情' detail: '转移单详情'
} }
return titles[formType.value] || formType.value return titles[formType.value] || formType.value
}) })
// DONE @AI /** 生成转移单编号 */
const generateCode = () => { const generateCode = () => {
formData.value.code = 'TR' + generateRandomStr(10) formData.value.code = 'TR' + generateRandomStr(10)
} }
/** 重置表单 */
const resetForm = () => { const resetForm = () => {
formData.value = { formData.value = {
id: undefined, id: undefined,
@ -251,16 +218,17 @@ const resetForm = () => {
shippingNumber: undefined, shippingNumber: undefined,
confirmFlag: false, confirmFlag: false,
transferDate: undefined, transferDate: undefined,
status: undefined,
remark: undefined remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
/** 打开弹窗 */
const open = async (type: string, id?: number) => { const open = async (type: string, id?: number) => {
dialogVisible.value = true dialogVisible.value = true
formType.value = type formType.value = type
resetForm() resetForm()
// //
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
@ -272,12 +240,12 @@ const open = async (type: string, id?: number) => {
} }
defineExpose({ open }) defineExpose({ open })
/** 提交表单create/update 模式) */
const submitForm = async () => { const submitForm = async () => {
await formRef.value.validate() await formRef.value.validate()
formLoading.value = true formLoading.value = true
try { try {
const { confirmFlag: _confirmFlag, status: _status, ...data } = formData.value const { confirmFlag: _confirmFlag, status: _status, ...data } = formData.value
// TODO @AI
if (!isOuterType.value) { if (!isOuterType.value) {
data.deliveryFlag = false data.deliveryFlag = false
data.recipientName = undefined data.recipientName = undefined
@ -306,4 +274,19 @@ const submitForm = async () => {
formLoading.value = false formLoading.value = false
} }
} }
/** 执行上架 */
const handleStock = async () => {
try {
await message.confirm('确认执行上架?')
formLoading.value = true
await WmTransferApi.stockTransfer(formData.value.id!)
message.success('上架成功')
dialogVisible.value = false
emit('success')
} catch {
} finally {
formLoading.value = false
}
}
</script> </script>

View File

@ -27,22 +27,12 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<!-- TODO @ai这里物料编码等等字段没展示看看后端是不是没读取 -->
<el-table-column label="物料编码" align="center" prop="itemCode" min-width="120" /> <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="itemName" min-width="140" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="120" /> <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="unitMeasureName" width="80" />
<el-table-column label="转移数量" align="center" prop="quantity" width="100" /> <el-table-column label="转移数量" align="center" prop="quantity" width="100" />
<!-- TODO @AI不需要已分配字段剩余字段 -->
<el-table-column v-if="isStock" label="已分配" align="center" min-width="100">
<template #default="scope">
{{ allocatedQuantityMap[scope.row.id] || 0 }}
</template>
</el-table-column>
<el-table-column v-if="isStock" label="剩余" align="center" min-width="100">
<template #default="scope">
{{ Number(scope.row.quantity || 0) - Number(allocatedQuantityMap[scope.row.id] || 0) }}
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="移出仓库" align="center" prop="fromWarehouseName" min-width="120" /> <el-table-column label="移出仓库" align="center" prop="fromWarehouseName" min-width="120" />
<el-table-column label="移出库区" align="center" prop="fromLocationName" min-width="120" /> <el-table-column label="移出库区" align="center" prop="fromLocationName" min-width="120" />
@ -61,11 +51,11 @@
<el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)"> <el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
删除 删除
</el-button> </el-button>
<!-- TODO @AI添加明细应该是上架 --> <!-- DONE @AI按钮文案改为上架更贴合当前业务语义 -->
<el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)"> <el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
添加明细 上架
</el-button> </el-button>
<!-- TODO @芋艿标签打印 --> <!-- DONE @芋艿标签打印AI 未修复原因标注为人工后续处理 -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -80,19 +70,10 @@
v-loading="formLoading" v-loading="formLoading"
> >
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="来源库存" prop="materialStockId">
<!-- TODO @AI这里先去掉只用下面的 MdItemSelect不要 disabled -->
<el-input :model-value="materialStockDisplay" readonly placeholder="请选择来源库存">
<template #append>
<el-button @click="openMaterialStockSelect"></el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="物料" prop="itemId"> <el-form-item label="物料" prop="itemId">
<MdItemSelect v-model="formData.itemId" disabled /> <!-- DONE @AI已移除来源库存选择逻辑改为直接选择物料 -->
<MdItemSelect v-model="formData.itemId" placeholder="请选择物料" class="!w-full" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -101,7 +82,6 @@
v-model="formData.quantity" v-model="formData.quantity"
:precision="2" :precision="2"
:min="0" :min="0"
:max="selectedStockQuantity || undefined"
controls-position="right" controls-position="right"
class="!w-full" class="!w-full"
/> />
@ -109,26 +89,36 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="批次号"> <el-form-item label="批次号">
<el-input v-model="formData.batchCode" disabled /> <el-input v-model="formData.batchCode" placeholder="请输入批次号" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- TODO @AI这里先对应的选择器后续切换库存选择器后这里在 disabled --> <!-- DONE @AI移出仓库/库区/库位改为可编辑选择符合当前录入要求 -->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="移出仓库"> <el-form-item label="移出仓库" prop="fromWarehouseId">
<el-input v-model="formData.fromWarehouseName" disabled /> <WmWarehouseSelect
v-model="formData.fromWarehouseId"
@change="handleWarehouseChange"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col v-if="formData.fromWarehouseId" :span="8">
<el-form-item label="移出库区"> <el-form-item label="移出库区" prop="fromLocationId">
<el-input v-model="formData.fromLocationName" disabled /> <WmWarehouseLocationSelect
v-model="formData.fromLocationId"
:warehouse-id="formData.fromWarehouseId"
@change="handleLocationChange"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col v-if="formData.fromLocationId" :span="8">
<el-form-item label="移出库位"> <el-form-item label="移出库位" prop="fromAreaId">
<el-input v-model="formData.fromAreaName" disabled /> <WmWarehouseAreaSelect
v-model="formData.fromAreaId"
:location-id="formData.fromLocationId"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="16"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" /> <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
</el-form-item> </el-form-item>
@ -141,7 +131,6 @@
</template> </template>
</Dialog> </Dialog>
<WmMaterialStockSelect ref="materialStockSelectRef" @select="handleMaterialStockSelect" />
<TransferDetailForm <TransferDetailForm
ref="detailFormRef" ref="detailFormRef"
:transfer-id="props.transferId" :transfer-id="props.transferId"
@ -153,11 +142,13 @@
import { WmTransferLineApi, WmTransferLineVO } from '@/api/mes/wm/transfer/line' import { WmTransferLineApi, WmTransferLineVO } from '@/api/mes/wm/transfer/line'
import { WmTransferDetailApi } from '@/api/mes/wm/transfer/detail' import { WmTransferDetailApi } from '@/api/mes/wm/transfer/detail'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue' import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
import TransferDetailList from './TransferDetailList.vue' import TransferDetailList from './TransferDetailList.vue'
import TransferDetailForm from './TransferDetailForm.vue' import TransferDetailForm from './TransferDetailForm.vue'
// TODO @AI linelist // DONE @AI
defineOptions({ name: 'TransferLineList' }) defineOptions({ name: 'TransferLineList' })
@ -174,7 +165,6 @@ const isStock = computed(() => props.formType === 'stock')
const loading = ref(false) const loading = ref(false)
const list = ref<WmTransferLineVO[]>([]) const list = ref<WmTransferLineVO[]>([])
const materialStockSelectRef = ref()
const detailFormRef = ref() const detailFormRef = ref()
const detailListRefs = ref<Record<number, InstanceType<typeof TransferDetailList>>>({}) const detailListRefs = ref<Record<number, InstanceType<typeof TransferDetailList>>>({})
const allocatedQuantityMap = ref<Record<number, number>>({}) const allocatedQuantityMap = ref<Record<number, number>>({})
@ -184,7 +174,6 @@ const dialogTitle = ref('')
const formLoading = ref(false) const formLoading = ref(false)
const lineFormType = ref('') const lineFormType = ref('')
const formRef = ref() const formRef = ref()
const selectedStockQuantity = ref<number | undefined>(undefined)
const formData = ref({ const formData = ref({
id: undefined as number | undefined, id: undefined as number | undefined,
transferId: undefined as number | undefined, transferId: undefined as number | undefined,
@ -206,19 +195,12 @@ const formData = ref({
remark: undefined remark: undefined
}) })
const materialStockDisplay = computed(() => {
if (!formData.value.materialStockId) {
return ''
}
return [formData.value.itemCode, formData.value.itemName, formData.value.batchCode]
.filter(Boolean)
.join(' / ')
})
const formRules = reactive({ const formRules = reactive({
materialStockId: [{ required: true, message: '来源库存不能为空', trigger: 'change' }],
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }], itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
quantity: [{ required: true, message: '转移数量不能为空', trigger: 'blur' }] quantity: [{ required: true, message: '转移数量不能为空', trigger: 'blur' }],
fromWarehouseId: [{ required: true, message: '移出仓库不能为空', trigger: 'change' }],
fromLocationId: [{ required: true, message: '移出库区不能为空', trigger: 'change' }],
fromAreaId: [{ required: true, message: '移出库位不能为空', trigger: 'change' }]
}) })
const getList = async () => { const getList = async () => {
@ -257,26 +239,16 @@ const handleDelete = async (id: number) => {
} catch {} } catch {}
} }
const openMaterialStockSelect = () => { const handleWarehouseChange = () => {
materialStockSelectRef.value.open(formData.value.itemId) formData.value.fromLocationId = undefined
formData.value.fromLocationName = undefined
formData.value.fromAreaId = undefined
formData.value.fromAreaName = undefined
} }
const handleMaterialStockSelect = (row: any) => { const handleLocationChange = () => {
selectedStockQuantity.value = row.availableQuantity formData.value.fromAreaId = undefined
formData.value.materialStockId = row.materialStockId formData.value.fromAreaName = undefined
formData.value.itemId = row.itemId
formData.value.itemCode = row.itemCode
formData.value.itemName = row.itemName
formData.value.specification = row.specification
formData.value.unitMeasureName = row.unitMeasureName
formData.value.batchId = row.batchId
formData.value.batchCode = row.batchCode
formData.value.fromWarehouseId = row.warehouseId
formData.value.fromWarehouseName = row.warehouseName
formData.value.fromLocationId = row.locationId
formData.value.fromLocationName = row.locationName
formData.value.fromAreaId = row.areaId
formData.value.fromAreaName = row.areaName
} }
const openForm = async (type: string, id?: number) => { const openForm = async (type: string, id?: number) => {
@ -288,8 +260,6 @@ const openForm = async (type: string, id?: number) => {
formLoading.value = true formLoading.value = true
try { try {
formData.value = await WmTransferLineApi.getTransferLine(id) formData.value = await WmTransferLineApi.getTransferLine(id)
const currentLine = list.value.find((item) => item.id === id)
selectedStockQuantity.value = Number(currentLine?.quantity || 0)
} finally { } finally {
formLoading.value = false formLoading.value = false
} }
@ -298,13 +268,6 @@ const openForm = async (type: string, id?: number) => {
const submitForm = async () => { const submitForm = async () => {
await formRef.value.validate() await formRef.value.validate()
if (
selectedStockQuantity.value !== undefined &&
Number(formData.value.quantity) > selectedStockQuantity.value
) {
message.warning('转移数量不能超过可用数量')
return
}
formLoading.value = true formLoading.value = true
try { try {
const data = { ...formData.value, transferId: props.transferId } as unknown as WmTransferLineVO const data = { ...formData.value, transferId: props.transferId } as unknown as WmTransferLineVO
@ -324,7 +287,6 @@ const submitForm = async () => {
} }
const resetForm = () => { const resetForm = () => {
selectedStockQuantity.value = undefined
formData.value = { formData.value = {
id: undefined, id: undefined,
transferId: undefined, transferId: undefined,

View File

@ -40,33 +40,6 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- TODO @AI前后端都去掉 转移日期单据状态的筛选项 -->
<el-form-item label="转移日期" prop="transferDate">
<el-date-picker
v-model="queryParams.transferDate"
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_TRANSFER_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <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 @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -182,7 +155,11 @@
执行转移 执行转移
</el-button> </el-button>
<el-button <el-button
v-if="canCancel(scope.row.status)" v-if="[
MesWmTransferStatusEnum.UNCONFIRMED,
MesWmTransferStatusEnum.UNSTOCK,
MesWmTransferStatusEnum.UNEXECUTE
].includes(scope.row.status)"
link link
type="danger" type="danger"
@click="handleCancel(scope.row.id)" @click="handleCancel(scope.row.id)"
@ -212,39 +189,26 @@ import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer'
import { MesWmTransferStatusEnum } from '@/views/mes/utils/constants' import { MesWmTransferStatusEnum } from '@/views/mes/utils/constants'
import TransferForm from './TransferForm.vue' import TransferForm from './TransferForm.vue'
// TODO @AI /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/index.vue
defineOptions({ name: 'MesWmTransfer' }) defineOptions({ name: 'MesWmTransfer' })
const message = useMessage() const message = useMessage() //
const { t } = useI18n() const { t } = useI18n() //
const loading = ref(true) const loading = ref(true) //
const list = ref<WmTransferVO[]>([]) const list = ref<WmTransferVO[]>([]) //
const total = ref(0) const total = ref(0) //
const exportLoading = ref(false) const exportLoading = ref(false) //
const queryParams = reactive({ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
code: undefined, code: undefined,
name: undefined, name: undefined,
type: undefined, type: undefined
transferDate: undefined,
status: undefined
}) })
const queryFormRef = ref() const queryFormRef = ref() //
const formRef = ref() const formRef = ref() //
// DONE @AI便
// TODO @AI
const canCancel = (status: number) => {
return [
MesWmTransferStatusEnum.UNCONFIRMED,
MesWmTransferStatusEnum.UNSTOCK,
MesWmTransferStatusEnum.UNEXECUTE
].includes(status)
}
/** 查询列表 */
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true
try { try {
@ -256,20 +220,24 @@ const getList = async () => {
} }
} }
/** 搜索按钮操作 */
const handleQuery = () => { const handleQuery = () => {
queryParams.pageNo = 1 queryParams.pageNo = 1
getList() getList()
} }
/** 重置按钮操作 */
const resetQuery = () => { const resetQuery = () => {
queryFormRef.value.resetFields() queryFormRef.value.resetFields()
handleQuery() handleQuery()
} }
/** 添加/修改操作 */
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {
formRef.value.open(type, id) formRef.value.open(type, id)
} }
/** 提交按钮操作 */
const handleSubmit = async (id: number) => { const handleSubmit = async (id: number) => {
try { try {
await message.confirm('确认提交该转移单?') await message.confirm('确认提交该转移单?')
@ -279,6 +247,7 @@ const handleSubmit = async (id: number) => {
} catch {} } catch {}
} }
/** 到货确认按钮操作 */
const handleConfirm = async (id: number) => { const handleConfirm = async (id: number) => {
try { try {
await message.confirm('确认到货后,将进入待上架状态,是否继续?') await message.confirm('确认到货后,将进入待上架状态,是否继续?')
@ -288,6 +257,7 @@ const handleConfirm = async (id: number) => {
} catch {} } catch {}
} }
/** 执行转移按钮操作 */
const handleFinish = async (id: number) => { const handleFinish = async (id: number) => {
try { try {
await message.confirm('确认执行调拨?执行后将更新库存。') await message.confirm('确认执行调拨?执行后将更新库存。')
@ -297,6 +267,7 @@ const handleFinish = async (id: number) => {
} catch {} } catch {}
} }
/** 取消按钮操作 */
const handleCancel = async (id: number) => { const handleCancel = async (id: number) => {
try { try {
await message.confirm('确认取消该转移单?取消后不可恢复。') await message.confirm('确认取消该转移单?取消后不可恢复。')
@ -306,6 +277,7 @@ const handleCancel = async (id: number) => {
} catch {} } catch {}
} }
/** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
await message.delConfirm() await message.delConfirm()
@ -315,6 +287,7 @@ const handleDelete = async (id: number) => {
} catch {} } catch {}
} }
/** 导出按钮操作 */
const handleExport = async () => { const handleExport = async () => {
try { try {
await message.exportConfirm() await message.exportConfirm()