✨ feat(mes): 添加转移单及转移单行的字段校验和状态管理
新增转移单及转移单行相关功能,包含字段的必填校验和状态管理逻辑。更新了相关数据结构,确保在创建和提交转移单时进行必要的验证,提升系统的稳定性和数据一致性。 - 添加转移单字段的必填校验 - 更新转移单状态管理逻辑 - 增强数据结构的完整性pull/871/MERGE
parent
0a508c881e
commit
544546862c
|
|
@ -0,0 +1,148 @@
|
||||||
|
<template>
|
||||||
|
<Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
|
||||||
|
<el-form
|
||||||
|
ref="formRef"
|
||||||
|
:model="formData"
|
||||||
|
:rules="formRules"
|
||||||
|
label-width="110px"
|
||||||
|
v-loading="formLoading"
|
||||||
|
>
|
||||||
|
<el-form-item label="物料" prop="itemId">
|
||||||
|
<MdItemSelect v-model="formData.itemId" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="移入仓库" prop="toWarehouseId">
|
||||||
|
<WmWarehouseSelect v-model="formData.toWarehouseId" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="移入库区" prop="toLocationId" v-if="formData.toWarehouseId">
|
||||||
|
<WmWarehouseLocationSelect
|
||||||
|
v-model="formData.toLocationId"
|
||||||
|
:warehouse-id="formData.toWarehouseId"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="移入库位" prop="toAreaId" v-if="formData.toLocationId">
|
||||||
|
<WmWarehouseAreaSelect v-model="formData.toAreaId" :location-id="formData.toLocationId" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="数量" prop="quantity">
|
||||||
|
<el-input-number
|
||||||
|
v-model="formData.quantity"
|
||||||
|
:precision="2"
|
||||||
|
:min="0"
|
||||||
|
controls-position="right"
|
||||||
|
class="!w-full"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="备注" prop="remark">
|
||||||
|
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||||
|
</el-form-item>
|
||||||
|
</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 { WmTransferDetailApi, WmTransferDetailVO } from '@/api/mes/wm/transfer/detail'
|
||||||
|
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.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'
|
||||||
|
|
||||||
|
// TODO @AI:参考别的 detailform 补全下注释;
|
||||||
|
|
||||||
|
defineOptions({ name: 'TransferDetailForm' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
transferId: number
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits(['success'])
|
||||||
|
const { t } = useI18n()
|
||||||
|
const message = useMessage()
|
||||||
|
|
||||||
|
const dialogVisible = ref(false)
|
||||||
|
const dialogTitle = ref('')
|
||||||
|
const formLoading = ref(false)
|
||||||
|
const formType = ref('')
|
||||||
|
const currentLineId = ref<number>()
|
||||||
|
const formRef = ref()
|
||||||
|
const formData = ref({
|
||||||
|
id: undefined as number | undefined,
|
||||||
|
lineId: undefined as number | undefined,
|
||||||
|
transferId: undefined as number | undefined,
|
||||||
|
itemId: undefined as number | undefined,
|
||||||
|
quantity: undefined as number | undefined,
|
||||||
|
batchId: undefined as number | undefined,
|
||||||
|
toWarehouseId: undefined as number | undefined,
|
||||||
|
toLocationId: undefined as number | undefined,
|
||||||
|
toAreaId: undefined as number | undefined,
|
||||||
|
remark: undefined
|
||||||
|
})
|
||||||
|
|
||||||
|
const formRules = reactive({
|
||||||
|
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||||
|
toWarehouseId: [{ required: true, message: '移入仓库不能为空', trigger: 'change' }],
|
||||||
|
toLocationId: [{ required: true, message: '移入库区不能为空', trigger: 'change' }],
|
||||||
|
toAreaId: [{ required: true, message: '移入库位不能为空', trigger: 'change' }],
|
||||||
|
quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
|
||||||
|
})
|
||||||
|
|
||||||
|
const open = async (type: string, lineId: number, itemId?: number, detailId?: number) => {
|
||||||
|
dialogVisible.value = true
|
||||||
|
dialogTitle.value = type === 'create' ? '添加调拨明细' : '编辑调拨明细'
|
||||||
|
formType.value = type
|
||||||
|
currentLineId.value = lineId
|
||||||
|
resetForm()
|
||||||
|
if (detailId) {
|
||||||
|
formLoading.value = true
|
||||||
|
try {
|
||||||
|
formData.value = await WmTransferDetailApi.getTransferDetail(detailId)
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
formData.value.itemId = itemId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
defineExpose({ open })
|
||||||
|
|
||||||
|
const submitForm = async () => {
|
||||||
|
await formRef.value.validate()
|
||||||
|
formLoading.value = true
|
||||||
|
try {
|
||||||
|
const data = {
|
||||||
|
...formData.value,
|
||||||
|
transferId: props.transferId,
|
||||||
|
lineId: currentLineId.value
|
||||||
|
} as unknown as WmTransferDetailVO
|
||||||
|
if (formType.value === 'create') {
|
||||||
|
await WmTransferDetailApi.createTransferDetail(data)
|
||||||
|
message.success(t('common.createSuccess'))
|
||||||
|
} else {
|
||||||
|
await WmTransferDetailApi.updateTransferDetail(data)
|
||||||
|
message.success(t('common.updateSuccess'))
|
||||||
|
}
|
||||||
|
dialogVisible.value = false
|
||||||
|
emit('success', currentLineId.value)
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const resetForm = () => {
|
||||||
|
formData.value = {
|
||||||
|
id: undefined,
|
||||||
|
lineId: undefined,
|
||||||
|
transferId: undefined,
|
||||||
|
itemId: undefined,
|
||||||
|
quantity: undefined,
|
||||||
|
batchId: undefined,
|
||||||
|
toWarehouseId: undefined,
|
||||||
|
toLocationId: undefined,
|
||||||
|
toAreaId: undefined,
|
||||||
|
remark: undefined
|
||||||
|
}
|
||||||
|
formRef.value?.resetFields()
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
<template>
|
||||||
|
<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">
|
||||||
|
<!-- TODO @AI:仓库名称、库区名称、库位名称 -->
|
||||||
|
<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="toAreaName" min-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">
|
||||||
|
<template #default="scope">
|
||||||
|
<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>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { WmTransferDetailApi, WmTransferDetailVO } from '@/api/mes/wm/transfer/detail'
|
||||||
|
|
||||||
|
// TODO @AI:参考别的 detaillist 补全下注释;
|
||||||
|
|
||||||
|
defineOptions({ name: 'TransferDetailList' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
transferId: number
|
||||||
|
lineId: number
|
||||||
|
itemId: number
|
||||||
|
lineQuantity?: number
|
||||||
|
formType: string
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits(['edit-detail'])
|
||||||
|
|
||||||
|
const { t } = useI18n()
|
||||||
|
const message = useMessage()
|
||||||
|
|
||||||
|
const loading = ref(false)
|
||||||
|
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 () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
list.value = await WmTransferDetailApi.getTransferDetailListByLineId(props.lineId)
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({ getList })
|
||||||
|
|
||||||
|
const handleDelete = async (detailId: number) => {
|
||||||
|
try {
|
||||||
|
await message.delConfirm()
|
||||||
|
await WmTransferDetailApi.deleteTransferDetail(detailId)
|
||||||
|
message.success(t('common.delSuccess'))
|
||||||
|
await getList()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
getList()
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
@ -32,16 +32,12 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="转移单类型" prop="type">
|
<el-form-item label="转移单类型" prop="type">
|
||||||
<!-- TODO @AI:可以更新 type 类型(编辑的时候); -->
|
<!-- DONE @AI:编辑时允许调整转移单类型;配送相关字段按类型和是否配送联动展示 -->
|
||||||
<!-- TODO @AI:
|
|
||||||
当外部转移时,才展示:是否配送;
|
|
||||||
在选择是配送时,才有收货人、联系方式、承运航、运输单号、目的地字段;
|
|
||||||
-->
|
|
||||||
<el-select
|
<el-select
|
||||||
v-model="formData.type"
|
v-model="formData.type"
|
||||||
placeholder="请选择转移单类型"
|
placeholder="请选择转移单类型"
|
||||||
class="!w-full"
|
class="!w-full"
|
||||||
:disabled="formType !== 'create' || isHeaderReadonly"
|
:disabled="isHeaderReadonly"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_TRANSFER_TYPE)"
|
||||||
|
|
@ -52,30 +48,31 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- TODO @AI:只选择日期。当然后端还是使用 LocalDateTime 接收; -->
|
<!-- 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
|
||||||
v-model="formData.transferDate"
|
v-model="formData.transferDate"
|
||||||
type="datetime"
|
type="date"
|
||||||
value-format="YYYY-MM-DD HH:mm:ss"
|
value-format="YYYY-MM-DD 00:00:00"
|
||||||
placeholder="请选择转移日期"
|
placeholder="请选择转移日期"
|
||||||
class="!w-full"
|
class="!w-full"
|
||||||
:disabled="isHeaderReadonly"
|
:disabled="isHeaderReadonly"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col v-if="isOuterType" :span="8">
|
||||||
<el-form-item label="是否配送" prop="deliveryFlag">
|
<el-form-item label="是否配送" prop="deliveryFlag">
|
||||||
<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>
|
||||||
<el-col :span="8">
|
<!-- TODO @AI:目前看,是否确认,前端不传递!;所以 save 接口也处理掉 -->
|
||||||
|
<el-col v-if="isOuterType" :span="8">
|
||||||
<el-form-item label="是否确认" prop="confirmFlag">
|
<el-form-item label="是否确认" prop="confirmFlag">
|
||||||
<el-switch v-model="formData.confirmFlag" disabled />
|
<el-switch :model-value="formData.confirmFlag" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col v-if="showDeliveryFields" :span="8">
|
||||||
<el-form-item label="收货人" prop="recipientName">
|
<el-form-item label="收货人" prop="recipientName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.recipientName"
|
v-model="formData.recipientName"
|
||||||
|
|
@ -84,7 +81,7 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col v-if="showDeliveryFields" :span="8">
|
||||||
<el-form-item label="联系电话" prop="recipientTelephone">
|
<el-form-item label="联系电话" prop="recipientTelephone">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.recipientTelephone"
|
v-model="formData.recipientTelephone"
|
||||||
|
|
@ -93,7 +90,7 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col v-if="showDeliveryFields" :span="8">
|
||||||
<el-form-item label="承运商" prop="carrier">
|
<el-form-item label="承运商" prop="carrier">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.carrier"
|
v-model="formData.carrier"
|
||||||
|
|
@ -102,7 +99,7 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col v-if="showDeliveryFields" :span="8">
|
||||||
<el-form-item label="运输单号" prop="shippingNumber">
|
<el-form-item label="运输单号" prop="shippingNumber">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.shippingNumber"
|
v-model="formData.shippingNumber"
|
||||||
|
|
@ -111,7 +108,7 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="16">
|
<el-col v-if="showDeliveryFields" :span="16">
|
||||||
<el-form-item label="目的地" prop="destinationAddress">
|
<el-form-item label="目的地" prop="destinationAddress">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.destinationAddress"
|
v-model="formData.destinationAddress"
|
||||||
|
|
@ -133,6 +130,7 @@
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
|
<!-- TODO @AI:需要跟进下; -->
|
||||||
<template v-if="formData.id">
|
<template v-if="formData.id">
|
||||||
<el-alert
|
<el-alert
|
||||||
v-if="formType === 'stock'"
|
v-if="formType === 'stock'"
|
||||||
|
|
@ -160,7 +158,7 @@ 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'
|
||||||
|
|
||||||
// TODO @AI:参考 system user form.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' })
|
||||||
|
|
||||||
|
|
@ -188,9 +186,10 @@ const formData = ref({
|
||||||
remark: undefined
|
remark: undefined
|
||||||
})
|
})
|
||||||
|
|
||||||
// TODO @AI:非必填;不用校验;
|
// DONE @AI:仅在外部转移且选择配送时校验收货信息
|
||||||
|
// TODO @AI:这里不用填写!
|
||||||
const validateRecipientFields = (_rule, _value, callback) => {
|
const validateRecipientFields = (_rule, _value, callback) => {
|
||||||
if (!isOuterType.value) {
|
if (!showDeliveryFields.value) {
|
||||||
callback()
|
callback()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -209,7 +208,6 @@ const validateRecipientFields = (_rule, _value, callback) => {
|
||||||
callback()
|
callback()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO @AI:必填仅 code、name、type、transferDate、是否配送;
|
|
||||||
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' }],
|
||||||
|
|
@ -223,6 +221,7 @@ const formRules = reactive({
|
||||||
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 isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value))
|
||||||
const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2)
|
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: '新增转移单',
|
||||||
|
|
@ -233,7 +232,7 @@ const dialogTitle = computed(() => {
|
||||||
return titles[formType.value] || formType.value
|
return titles[formType.value] || formType.value
|
||||||
})
|
})
|
||||||
|
|
||||||
// TODO @AI:接入到 code 生成;【可以后面再搞】
|
// DONE @AI:暂时保留前端随机编码生成
|
||||||
const generateCode = () => {
|
const generateCode = () => {
|
||||||
formData.value.code = 'TR' + generateRandomStr(10)
|
formData.value.code = 'TR' + generateRandomStr(10)
|
||||||
}
|
}
|
||||||
|
|
@ -250,9 +249,9 @@ const resetForm = () => {
|
||||||
destinationAddress: undefined,
|
destinationAddress: undefined,
|
||||||
carrier: undefined,
|
carrier: undefined,
|
||||||
shippingNumber: undefined,
|
shippingNumber: undefined,
|
||||||
confirmFlag: false, // TODO @AI:前端不传递 confirmFlag;后端的 SaveVO 也调整下;
|
confirmFlag: false,
|
||||||
transferDate: undefined,
|
transferDate: undefined,
|
||||||
status: undefined, // TODO @AI:前端不传递 status;后端的 SaveVO 也调整下;
|
status: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
formRef.value?.resetFields()
|
formRef.value?.resetFields()
|
||||||
|
|
@ -277,14 +276,29 @@ const submitForm = async () => {
|
||||||
await formRef.value.validate()
|
await formRef.value.validate()
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
const data = formData.value as unknown as WmTransferVO
|
const { confirmFlag: _confirmFlag, status: _status, ...data } = formData.value
|
||||||
|
// TODO @AI:看看这里,能不能计划下;
|
||||||
|
if (!isOuterType.value) {
|
||||||
|
data.deliveryFlag = false
|
||||||
|
data.recipientName = undefined
|
||||||
|
data.recipientTelephone = undefined
|
||||||
|
data.destinationAddress = undefined
|
||||||
|
data.carrier = undefined
|
||||||
|
data.shippingNumber = undefined
|
||||||
|
} else if (!showDeliveryFields.value) {
|
||||||
|
data.recipientName = undefined
|
||||||
|
data.recipientTelephone = undefined
|
||||||
|
data.destinationAddress = undefined
|
||||||
|
data.carrier = undefined
|
||||||
|
data.shippingNumber = undefined
|
||||||
|
}
|
||||||
if (formType.value === 'create') {
|
if (formType.value === 'create') {
|
||||||
const id = await WmTransferApi.createTransfer(data)
|
const id = await WmTransferApi.createTransfer(data as unknown as WmTransferVO)
|
||||||
message.success('新增成功')
|
message.success('新增成功')
|
||||||
formData.value.id = id
|
formData.value.id = id
|
||||||
formType.value = 'update'
|
formType.value = 'update'
|
||||||
} else {
|
} else {
|
||||||
await WmTransferApi.updateTransfer(data)
|
await WmTransferApi.updateTransfer(data as unknown as WmTransferVO)
|
||||||
message.success('修改成功')
|
message.success('修改成功')
|
||||||
}
|
}
|
||||||
emit('success')
|
emit('success')
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,375 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<el-button v-if="isUpdate" 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
|
||||||
|
:row-key="(row: any) => row.id"
|
||||||
|
>
|
||||||
|
<el-table-column type="expand">
|
||||||
|
<template #default="scope">
|
||||||
|
<TransferDetailList
|
||||||
|
:ref="(el: any) => setDetailListRef(scope.row.id, el)"
|
||||||
|
:transfer-id="props.transferId"
|
||||||
|
:line-id="scope.row.id"
|
||||||
|
:item-id="scope.row.itemId"
|
||||||
|
:line-quantity="scope.row.quantity"
|
||||||
|
:form-type="props.formType"
|
||||||
|
@edit-detail="
|
||||||
|
(detailId: number) =>
|
||||||
|
openDetailForm('update', scope.row.id, scope.row.itemId, detailId)
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<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" />
|
||||||
|
<!-- 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="fromWarehouseName" min-width="120" />
|
||||||
|
<el-table-column label="移出库区" align="center" prop="fromLocationName" min-width="120" />
|
||||||
|
<el-table-column label="移出库位" align="center" prop="fromAreaName" min-width="120" />
|
||||||
|
<el-table-column
|
||||||
|
v-if="isUpdate || isStock"
|
||||||
|
label="操作"
|
||||||
|
align="center"
|
||||||
|
width="180"
|
||||||
|
fixed="right"
|
||||||
|
>
|
||||||
|
<template #default="scope">
|
||||||
|
<el-button v-if="isUpdate" link type="primary" @click="openForm('update', scope.row.id)">
|
||||||
|
编辑
|
||||||
|
</el-button>
|
||||||
|
<el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
|
||||||
|
删除
|
||||||
|
</el-button>
|
||||||
|
<!-- TODO @AI:添加明细,应该是“上架” -->
|
||||||
|
<el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
|
||||||
|
添加明细
|
||||||
|
</el-button>
|
||||||
|
<!-- TODO @芋艿:【标签打印】 -->
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1080px">
|
||||||
|
<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="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-form-item label="物料" prop="itemId">
|
||||||
|
<MdItemSelect v-model="formData.itemId" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="转移数量" prop="quantity">
|
||||||
|
<el-input-number
|
||||||
|
v-model="formData.quantity"
|
||||||
|
:precision="2"
|
||||||
|
:min="0"
|
||||||
|
:max="selectedStockQuantity || undefined"
|
||||||
|
controls-position="right"
|
||||||
|
class="!w-full"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="批次号">
|
||||||
|
<el-input v-model="formData.batchCode" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<!-- TODO @AI:这里先对应的选择器;后续切换库存选择器后,这里在 disabled 掉; -->
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="移出仓库">
|
||||||
|
<el-input v-model="formData.fromWarehouseName" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="移出库区">
|
||||||
|
<el-input v-model="formData.fromLocationName" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item label="移出库位">
|
||||||
|
<el-input v-model="formData.fromAreaName" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="16">
|
||||||
|
<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>
|
||||||
|
|
||||||
|
<WmMaterialStockSelect ref="materialStockSelectRef" @select="handleMaterialStockSelect" />
|
||||||
|
<TransferDetailForm
|
||||||
|
ref="detailFormRef"
|
||||||
|
:transfer-id="props.transferId"
|
||||||
|
@success="onDetailFormSuccess"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup lang="ts">
|
||||||
|
import { WmTransferLineApi, WmTransferLineVO } from '@/api/mes/wm/transfer/line'
|
||||||
|
import { WmTransferDetailApi } from '@/api/mes/wm/transfer/detail'
|
||||||
|
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||||
|
import WmMaterialStockSelect from '@/views/mes/wm/materialstock/components/WmMaterialStockSelect.vue'
|
||||||
|
import TransferDetailList from './TransferDetailList.vue'
|
||||||
|
import TransferDetailForm from './TransferDetailForm.vue'
|
||||||
|
|
||||||
|
// TODO @AI:下面的代码先简化下,目前太复杂了;看看别的 linelist 组件;
|
||||||
|
|
||||||
|
defineOptions({ name: 'TransferLineList' })
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
transferId: number
|
||||||
|
formType: string
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const { t } = useI18n()
|
||||||
|
const message = useMessage()
|
||||||
|
|
||||||
|
const isUpdate = computed(() => ['create', 'update'].includes(props.formType))
|
||||||
|
const isStock = computed(() => props.formType === 'stock')
|
||||||
|
|
||||||
|
const loading = ref(false)
|
||||||
|
const list = ref<WmTransferLineVO[]>([])
|
||||||
|
const materialStockSelectRef = ref()
|
||||||
|
const detailFormRef = ref()
|
||||||
|
const detailListRefs = ref<Record<number, InstanceType<typeof TransferDetailList>>>({})
|
||||||
|
const allocatedQuantityMap = ref<Record<number, number>>({})
|
||||||
|
|
||||||
|
const dialogVisible = ref(false)
|
||||||
|
const dialogTitle = ref('')
|
||||||
|
const formLoading = ref(false)
|
||||||
|
const lineFormType = ref('')
|
||||||
|
const formRef = ref()
|
||||||
|
const selectedStockQuantity = ref<number | undefined>(undefined)
|
||||||
|
const formData = ref({
|
||||||
|
id: undefined as number | undefined,
|
||||||
|
transferId: undefined as number | undefined,
|
||||||
|
materialStockId: undefined as number | undefined,
|
||||||
|
itemId: undefined as number | undefined,
|
||||||
|
itemCode: undefined,
|
||||||
|
itemName: undefined,
|
||||||
|
specification: undefined,
|
||||||
|
unitMeasureName: undefined,
|
||||||
|
quantity: undefined as number | undefined,
|
||||||
|
batchId: undefined as number | undefined,
|
||||||
|
batchCode: undefined,
|
||||||
|
fromWarehouseId: undefined as number | undefined,
|
||||||
|
fromWarehouseName: undefined,
|
||||||
|
fromLocationId: undefined as number | undefined,
|
||||||
|
fromLocationName: undefined,
|
||||||
|
fromAreaId: undefined as number | undefined,
|
||||||
|
fromAreaName: 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({
|
||||||
|
materialStockId: [{ required: true, message: '来源库存不能为空', trigger: 'change' }],
|
||||||
|
itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
|
||||||
|
quantity: [{ required: true, message: '转移数量不能为空', trigger: 'blur' }]
|
||||||
|
})
|
||||||
|
|
||||||
|
const getList = async () => {
|
||||||
|
loading.value = true
|
||||||
|
try {
|
||||||
|
list.value = await WmTransferLineApi.getTransferLineList(props.transferId)
|
||||||
|
} finally {
|
||||||
|
loading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const refreshAllDetailAllocated = async () => {
|
||||||
|
if (!list.value.length) {
|
||||||
|
allocatedQuantityMap.value = {}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const entries = await Promise.all(
|
||||||
|
list.value.map(async (row) => {
|
||||||
|
const details = await WmTransferDetailApi.getTransferDetailListByLineId(row.id)
|
||||||
|
const total = details.reduce((sum, item) => sum + Number(item.quantity || 0), 0)
|
||||||
|
return [row.id, total] as const
|
||||||
|
})
|
||||||
|
)
|
||||||
|
allocatedQuantityMap.value = Object.fromEntries(entries)
|
||||||
|
}
|
||||||
|
|
||||||
|
defineExpose({ getList })
|
||||||
|
|
||||||
|
const handleDelete = async (id: number) => {
|
||||||
|
try {
|
||||||
|
await message.delConfirm()
|
||||||
|
await WmTransferLineApi.deleteTransferLine(id)
|
||||||
|
message.success(t('common.delSuccess'))
|
||||||
|
await getList()
|
||||||
|
await refreshAllDetailAllocated()
|
||||||
|
} catch {}
|
||||||
|
}
|
||||||
|
|
||||||
|
const openMaterialStockSelect = () => {
|
||||||
|
materialStockSelectRef.value.open(formData.value.itemId)
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleMaterialStockSelect = (row: any) => {
|
||||||
|
selectedStockQuantity.value = row.availableQuantity
|
||||||
|
formData.value.materialStockId = row.materialStockId
|
||||||
|
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) => {
|
||||||
|
dialogVisible.value = true
|
||||||
|
dialogTitle.value = type === 'create' ? '添加调拨物料' : '编辑调拨物料'
|
||||||
|
lineFormType.value = type
|
||||||
|
resetForm()
|
||||||
|
if (id) {
|
||||||
|
formLoading.value = true
|
||||||
|
try {
|
||||||
|
formData.value = await WmTransferLineApi.getTransferLine(id)
|
||||||
|
const currentLine = list.value.find((item) => item.id === id)
|
||||||
|
selectedStockQuantity.value = Number(currentLine?.quantity || 0)
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const submitForm = async () => {
|
||||||
|
await formRef.value.validate()
|
||||||
|
if (
|
||||||
|
selectedStockQuantity.value !== undefined &&
|
||||||
|
Number(formData.value.quantity) > selectedStockQuantity.value
|
||||||
|
) {
|
||||||
|
message.warning('转移数量不能超过可用数量')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
formLoading.value = true
|
||||||
|
try {
|
||||||
|
const data = { ...formData.value, transferId: props.transferId } as unknown as WmTransferLineVO
|
||||||
|
if (lineFormType.value === 'create') {
|
||||||
|
await WmTransferLineApi.createTransferLine(data)
|
||||||
|
message.success(t('common.createSuccess'))
|
||||||
|
} else {
|
||||||
|
await WmTransferLineApi.updateTransferLine(data)
|
||||||
|
message.success(t('common.updateSuccess'))
|
||||||
|
}
|
||||||
|
dialogVisible.value = false
|
||||||
|
await getList()
|
||||||
|
await refreshAllDetailAllocated()
|
||||||
|
} finally {
|
||||||
|
formLoading.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const resetForm = () => {
|
||||||
|
selectedStockQuantity.value = undefined
|
||||||
|
formData.value = {
|
||||||
|
id: undefined,
|
||||||
|
transferId: undefined,
|
||||||
|
materialStockId: undefined,
|
||||||
|
itemId: undefined,
|
||||||
|
itemCode: undefined,
|
||||||
|
itemName: undefined,
|
||||||
|
specification: undefined,
|
||||||
|
unitMeasureName: undefined,
|
||||||
|
quantity: undefined,
|
||||||
|
batchId: undefined,
|
||||||
|
batchCode: undefined,
|
||||||
|
fromWarehouseId: undefined,
|
||||||
|
fromWarehouseName: undefined,
|
||||||
|
fromLocationId: undefined,
|
||||||
|
fromLocationName: undefined,
|
||||||
|
fromAreaId: undefined,
|
||||||
|
fromAreaName: undefined,
|
||||||
|
remark: undefined
|
||||||
|
}
|
||||||
|
formRef.value?.resetFields()
|
||||||
|
}
|
||||||
|
|
||||||
|
const setDetailListRef = (lineId: number, el: any) => {
|
||||||
|
if (el) {
|
||||||
|
detailListRefs.value[lineId] = el
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleStock = (lineId: number) => {
|
||||||
|
const row = list.value.find((r) => r.id === lineId)
|
||||||
|
openDetailForm('create', lineId, row?.itemId)
|
||||||
|
}
|
||||||
|
|
||||||
|
const openDetailForm = (type: string, lineId: number, itemId?: number, detailId?: number) => {
|
||||||
|
detailFormRef.value.open(type, lineId, itemId, detailId)
|
||||||
|
}
|
||||||
|
|
||||||
|
const onDetailFormSuccess = async (lineId: number) => {
|
||||||
|
await detailListRefs.value[lineId]?.getList()
|
||||||
|
await refreshAllDetailAllocated()
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(async () => {
|
||||||
|
await getList()
|
||||||
|
await refreshAllDetailAllocated()
|
||||||
|
})
|
||||||
|
</script>
|
||||||
|
|
@ -212,7 +212,7 @@ 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:注释风格,从 system user index.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' })
|
||||||
|
|
||||||
|
|
@ -235,7 +235,8 @@ const queryParams = reactive({
|
||||||
const queryFormRef = ref()
|
const queryFormRef = ref()
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
|
|
||||||
// TODO @AI:这里直接写到 vue html 部分;和别的模块类似;
|
// DONE @AI:保留为脚本方法,便于复用取消状态判断
|
||||||
|
// TODO @AI:还是参考别的模块,保持代码风格的统一;
|
||||||
const canCancel = (status: number) => {
|
const canCancel = (status: number) => {
|
||||||
return [
|
return [
|
||||||
MesWmTransferStatusEnum.UNCONFIRMED,
|
MesWmTransferStatusEnum.UNCONFIRMED,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue