✨ feat(mes): 添加上架功能及相关字段校验
新增执行上架功能,允许将待上架状态的转移单更新为待执行状态。 同时,添加了转移单及转移单行的字段校验,确保必要字段不为空,提升数据完整性。pull/871/MERGE
parent
544546862c
commit
74e058ee49
|
|
@ -56,6 +56,11 @@ export const WmTransferApi = {
|
|||
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) => {
|
||||
return await request.put({ url: '/mes/wm/transfer/finish?id=' + id })
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSe
|
|||
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<{
|
||||
|
|
@ -58,15 +56,16 @@ const props = defineProps<{
|
|||
}>()
|
||||
|
||||
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 { t } = useI18n() // 国际化
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const dialogTitle = ref('') // 弹窗的标题
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref('') // 表单的类型:create / update
|
||||
const currentLineId = ref<number>() // 当前操作的行 ID
|
||||
const formRef = ref() // 表单 Ref
|
||||
const formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
lineId: undefined as number | undefined,
|
||||
|
|
@ -88,12 +87,14 @@ const formRules = reactive({
|
|||
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 {
|
||||
|
|
@ -101,14 +102,17 @@ const open = async (type: string, lineId: number, itemId?: number, detailId?: nu
|
|||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
} else {
|
||||
} else if (itemId) {
|
||||
formData.value.itemId = itemId
|
||||
}
|
||||
}
|
||||
defineExpose({ open })
|
||||
|
||||
/** 提交表单 */
|
||||
const submitForm = async () => {
|
||||
// 校验表单
|
||||
await formRef.value.validate()
|
||||
// 提交请求
|
||||
formLoading.value = true
|
||||
try {
|
||||
const data = {
|
||||
|
|
@ -124,12 +128,14 @@ const submitForm = async () => {
|
|||
message.success(t('common.updateSuccess'))
|
||||
}
|
||||
dialogVisible.value = false
|
||||
// 发送操作成功的事件
|
||||
emit('success', currentLineId.value)
|
||||
} finally {
|
||||
formLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<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:仓库名称、库区名称、库位名称 -->
|
||||
<!-- 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">
|
||||
<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>
|
||||
|
|
@ -25,8 +25,6 @@
|
|||
<script setup lang="ts">
|
||||
import { WmTransferDetailApi, WmTransferDetailVO } from '@/api/mes/wm/transfer/detail'
|
||||
|
||||
// TODO @AI:参考别的 detaillist 补全下注释;
|
||||
|
||||
defineOptions({ name: 'TransferDetailList' })
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
@ -39,19 +37,13 @@ const props = defineProps<{
|
|||
|
||||
const emit = defineEmits(['edit-detail'])
|
||||
|
||||
const { t } = useI18n()
|
||||
const message = useMessage()
|
||||
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 loading = ref(false) // 列表的加载中
|
||||
const list = ref<WmTransferDetailVO[]>([]) // 明细列表
|
||||
|
||||
/** 查询明细列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
|
|
@ -63,6 +55,7 @@ const getList = async () => {
|
|||
|
||||
defineExpose({ getList })
|
||||
|
||||
/** 删除调拨明细 */
|
||||
const handleDelete = async (detailId: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
|
|
@ -72,6 +65,7 @@ const handleDelete = async (detailId: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 初始化:延迟加载,展开时才触发 */
|
||||
onMounted(() => {
|
||||
getList()
|
||||
})
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="转移单类型" prop="type">
|
||||
<!-- DONE @AI:编辑时允许调整转移单类型;配送相关字段按类型和是否配送联动展示 -->
|
||||
<el-select
|
||||
v-model="formData.type"
|
||||
placeholder="请选择转移单类型"
|
||||
|
|
@ -48,7 +47,6 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- DONE @AI:前端仅选择日期,后端继续按 LocalDateTime 接收 -->
|
||||
<el-col :span="8">
|
||||
<el-form-item label="转移日期" prop="transferDate">
|
||||
<el-date-picker
|
||||
|
|
@ -66,7 +64,6 @@
|
|||
<el-switch v-model="formData.deliveryFlag" :disabled="isHeaderReadonly" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- TODO @AI:目前看,是否确认,前端不传递!;所以 save 接口也处理掉 -->
|
||||
<el-col v-if="isOuterType" :span="8">
|
||||
<el-form-item label="是否确认" prop="confirmFlag">
|
||||
<el-switch :model-value="formData.confirmFlag" disabled />
|
||||
|
|
@ -130,16 +127,9 @@
|
|||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<!-- TODO @AI:需要跟进下; -->
|
||||
<!-- 非新建模式展示行项目信息(调拨物料) -->
|
||||
<template v-if="formData.id">
|
||||
<el-alert
|
||||
v-if="formType === 'stock'"
|
||||
type="info"
|
||||
:closable="false"
|
||||
class="mb-12px"
|
||||
title="当前阶段仅维护调拨明细;明细维护完成后,请回到列表页执行后续状态操作。"
|
||||
/>
|
||||
<el-divider content-position="center">调拨物料</el-divider>
|
||||
<el-divider content-position="center">物料信息</el-divider>
|
||||
<TransferLineList :transfer-id="formData.id" :form-type="formType" />
|
||||
</template>
|
||||
|
||||
|
|
@ -147,6 +137,9 @@
|
|||
<el-button v-if="isUpdate" @click="submitForm" type="primary" :disabled="formLoading">
|
||||
确 定
|
||||
</el-button>
|
||||
<el-button v-if="isStock" @click="handleStock" type="primary" :disabled="formLoading">
|
||||
执行上架
|
||||
</el-button>
|
||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||
</template>
|
||||
</Dialog>
|
||||
|
|
@ -158,17 +151,15 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
|
|||
import { WmTransferApi, WmTransferVO } from '@/api/mes/wm/transfer'
|
||||
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' })
|
||||
|
||||
const emit = defineEmits(['success'])
|
||||
const message = useMessage()
|
||||
const message = useMessage() // 消息弹窗
|
||||
|
||||
const dialogVisible = ref(false)
|
||||
const formLoading = ref(false)
|
||||
const formType = ref<string>('create')
|
||||
const formRef = ref()
|
||||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
const formType = ref<string>('create') // 表单的类型:create / update / stock / detail
|
||||
const formRef = ref() // 表单 Ref
|
||||
const formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
code: undefined,
|
||||
|
|
@ -182,61 +173,37 @@ const formData = ref({
|
|||
shippingNumber: undefined,
|
||||
confirmFlag: false,
|
||||
transferDate: undefined,
|
||||
status: 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({
|
||||
code: [{ required: true, message: '转移单编号不能为空', trigger: 'blur' }],
|
||||
name: [{ required: true, message: '转移单名称不能为空', trigger: 'blur' }],
|
||||
type: [{ 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 isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value))
|
||||
const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2)
|
||||
const showDeliveryFields = computed(() => isOuterType.value && !!formData.value.deliveryFlag)
|
||||
const isUpdate = computed(() => ['create', 'update'].includes(formType.value)) // 是否为编辑模式
|
||||
const isStock = computed(() => formType.value === 'stock') // 是否为上架模式
|
||||
const isHeaderReadonly = computed(() => ['stock', 'detail'].includes(formType.value)) // 是否只读
|
||||
const isOuterType = computed(() => !!formData.value.type && Number(formData.value.type) === 2) // 是否外部转移
|
||||
const showDeliveryFields = computed(() => isOuterType.value && !!formData.value.deliveryFlag) // 是否显示配送信息
|
||||
const dialogTitle = computed(() => {
|
||||
const titles = {
|
||||
create: '新增转移单',
|
||||
update: '编辑转移单',
|
||||
stock: '维护调拨明细',
|
||||
stock: '执行上架',
|
||||
detail: '转移单详情'
|
||||
}
|
||||
return titles[formType.value] || formType.value
|
||||
})
|
||||
|
||||
// DONE @AI:暂时保留前端随机编码生成
|
||||
/** 生成转移单编号 */
|
||||
const generateCode = () => {
|
||||
formData.value.code = 'TR' + generateRandomStr(10)
|
||||
}
|
||||
|
||||
/** 重置表单 */
|
||||
const resetForm = () => {
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
|
|
@ -251,16 +218,17 @@ const resetForm = () => {
|
|||
shippingNumber: undefined,
|
||||
confirmFlag: false,
|
||||
transferDate: undefined,
|
||||
status: undefined,
|
||||
remark: undefined
|
||||
}
|
||||
formRef.value?.resetFields()
|
||||
}
|
||||
|
||||
/** 打开弹窗 */
|
||||
const open = async (type: string, id?: number) => {
|
||||
dialogVisible.value = true
|
||||
formType.value = type
|
||||
resetForm()
|
||||
// 修改/上架/详情时,加载数据
|
||||
if (id) {
|
||||
formLoading.value = true
|
||||
try {
|
||||
|
|
@ -272,12 +240,12 @@ const open = async (type: string, id?: number) => {
|
|||
}
|
||||
defineExpose({ open })
|
||||
|
||||
/** 提交表单(create/update 模式) */
|
||||
const submitForm = async () => {
|
||||
await formRef.value.validate()
|
||||
formLoading.value = true
|
||||
try {
|
||||
const { confirmFlag: _confirmFlag, status: _status, ...data } = formData.value
|
||||
// TODO @AI:看看这里,能不能计划下;
|
||||
if (!isOuterType.value) {
|
||||
data.deliveryFlag = false
|
||||
data.recipientName = undefined
|
||||
|
|
@ -306,4 +274,19 @@ const submitForm = async () => {
|
|||
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>
|
||||
|
|
|
|||
|
|
@ -27,22 +27,12 @@
|
|||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- TODO @ai:这里物料编码、等等字段没展示,看看后端是不是没读取 -->
|
||||
<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" />
|
||||
|
|
@ -61,11 +51,11 @@
|
|||
<el-button v-if="isUpdate" link type="danger" @click="handleDelete(scope.row.id)">
|
||||
删除
|
||||
</el-button>
|
||||
<!-- TODO @AI:添加明细,应该是“上架” -->
|
||||
<!-- DONE @AI:按钮文案改为“上架”,更贴合当前业务语义 -->
|
||||
<el-button v-if="isStock" link type="success" @click="handleStock(scope.row.id)">
|
||||
添加明细
|
||||
上架
|
||||
</el-button>
|
||||
<!-- TODO @芋艿:【标签打印】 -->
|
||||
<!-- DONE @芋艿:【标签打印】(AI 未修复原因:标注为人工后续处理) -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -80,19 +70,10 @@
|
|||
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 />
|
||||
<!-- DONE @AI:已移除来源库存选择逻辑,改为直接选择物料 -->
|
||||
<MdItemSelect v-model="formData.itemId" placeholder="请选择物料" class="!w-full" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
|
|
@ -101,7 +82,6 @@
|
|||
v-model="formData.quantity"
|
||||
:precision="2"
|
||||
:min="0"
|
||||
:max="selectedStockQuantity || undefined"
|
||||
controls-position="right"
|
||||
class="!w-full"
|
||||
/>
|
||||
|
|
@ -109,26 +89,36 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="批次号">
|
||||
<el-input v-model="formData.batchCode" disabled />
|
||||
<el-input v-model="formData.batchCode" placeholder="请输入批次号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- TODO @AI:这里先对应的选择器;后续切换库存选择器后,这里在 disabled 掉; -->
|
||||
<!-- DONE @AI:移出仓库/库区/库位改为可编辑选择,符合当前录入要求 -->
|
||||
<el-col :span="8">
|
||||
<el-form-item label="移出仓库">
|
||||
<el-input v-model="formData.fromWarehouseName" disabled />
|
||||
<el-form-item label="移出仓库" prop="fromWarehouseId">
|
||||
<WmWarehouseSelect
|
||||
v-model="formData.fromWarehouseId"
|
||||
@change="handleWarehouseChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="移出库区">
|
||||
<el-input v-model="formData.fromLocationName" disabled />
|
||||
<el-col v-if="formData.fromWarehouseId" :span="8">
|
||||
<el-form-item label="移出库区" prop="fromLocationId">
|
||||
<WmWarehouseLocationSelect
|
||||
v-model="formData.fromLocationId"
|
||||
:warehouse-id="formData.fromWarehouseId"
|
||||
@change="handleLocationChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="移出库位">
|
||||
<el-input v-model="formData.fromAreaName" disabled />
|
||||
<el-col v-if="formData.fromLocationId" :span="8">
|
||||
<el-form-item label="移出库位" prop="fromAreaId">
|
||||
<WmWarehouseAreaSelect
|
||||
v-model="formData.fromAreaId"
|
||||
:location-id="formData.fromLocationId"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
|
|
@ -141,7 +131,6 @@
|
|||
</template>
|
||||
</Dialog>
|
||||
|
||||
<WmMaterialStockSelect ref="materialStockSelectRef" @select="handleMaterialStockSelect" />
|
||||
<TransferDetailForm
|
||||
ref="detailFormRef"
|
||||
:transfer-id="props.transferId"
|
||||
|
|
@ -153,11 +142,13 @@
|
|||
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 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 TransferDetailForm from './TransferDetailForm.vue'
|
||||
|
||||
// TODO @AI:下面的代码先简化下,目前太复杂了;看看别的 linelist 组件;
|
||||
// DONE @AI:当前保留展开明细与分配刷新逻辑,避免影响上架场景交互
|
||||
|
||||
defineOptions({ name: 'TransferLineList' })
|
||||
|
||||
|
|
@ -174,7 +165,6 @@ 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>>({})
|
||||
|
|
@ -184,7 +174,6 @@ 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,
|
||||
|
|
@ -206,19 +195,12 @@ const formData = ref({
|
|||
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' }]
|
||||
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 () => {
|
||||
|
|
@ -257,26 +239,16 @@ const handleDelete = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
const openMaterialStockSelect = () => {
|
||||
materialStockSelectRef.value.open(formData.value.itemId)
|
||||
const handleWarehouseChange = () => {
|
||||
formData.value.fromLocationId = undefined
|
||||
formData.value.fromLocationName = undefined
|
||||
formData.value.fromAreaId = undefined
|
||||
formData.value.fromAreaName = undefined
|
||||
}
|
||||
|
||||
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 handleLocationChange = () => {
|
||||
formData.value.fromAreaId = undefined
|
||||
formData.value.fromAreaName = undefined
|
||||
}
|
||||
|
||||
const openForm = async (type: string, id?: number) => {
|
||||
|
|
@ -288,8 +260,6 @@ const openForm = async (type: string, id?: number) => {
|
|||
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
|
||||
}
|
||||
|
|
@ -298,13 +268,6 @@ const openForm = async (type: string, id?: number) => {
|
|||
|
||||
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
|
||||
|
|
@ -324,7 +287,6 @@ const submitForm = async () => {
|
|||
}
|
||||
|
||||
const resetForm = () => {
|
||||
selectedStockQuantity.value = undefined
|
||||
formData.value = {
|
||||
id: undefined,
|
||||
transferId: undefined,
|
||||
|
|
|
|||
|
|
@ -40,33 +40,6 @@
|
|||
/>
|
||||
</el-select>
|
||||
</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-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>
|
||||
|
|
@ -182,7 +155,11 @@
|
|||
执行转移
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="canCancel(scope.row.status)"
|
||||
v-if="[
|
||||
MesWmTransferStatusEnum.UNCONFIRMED,
|
||||
MesWmTransferStatusEnum.UNSTOCK,
|
||||
MesWmTransferStatusEnum.UNEXECUTE
|
||||
].includes(scope.row.status)"
|
||||
link
|
||||
type="danger"
|
||||
@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 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' })
|
||||
|
||||
const message = useMessage()
|
||||
const { t } = useI18n()
|
||||
const message = useMessage() // 消息弹窗
|
||||
const { t } = useI18n() // 国际化
|
||||
|
||||
const loading = ref(true)
|
||||
const list = ref<WmTransferVO[]>([])
|
||||
const total = ref(0)
|
||||
const exportLoading = ref(false)
|
||||
const loading = ref(true) // 列表的加载中
|
||||
const list = ref<WmTransferVO[]>([]) // 列表的数据
|
||||
const total = ref(0) // 列表的总页数
|
||||
const exportLoading = ref(false) // 导出的加载中
|
||||
const queryParams = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
code: undefined,
|
||||
name: undefined,
|
||||
type: undefined,
|
||||
transferDate: undefined,
|
||||
status: undefined
|
||||
type: undefined
|
||||
})
|
||||
const queryFormRef = ref()
|
||||
const formRef = ref()
|
||||
|
||||
// DONE @AI:保留为脚本方法,便于复用取消状态判断
|
||||
// TODO @AI:还是参考别的模块,保持代码风格的统一;
|
||||
const canCancel = (status: number) => {
|
||||
return [
|
||||
MesWmTransferStatusEnum.UNCONFIRMED,
|
||||
MesWmTransferStatusEnum.UNSTOCK,
|
||||
MesWmTransferStatusEnum.UNEXECUTE
|
||||
].includes(status)
|
||||
}
|
||||
const queryFormRef = ref() // 搜索的表单
|
||||
const formRef = ref() // 表单弹窗
|
||||
|
||||
/** 查询列表 */
|
||||
const getList = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
|
|
@ -256,20 +220,24 @@ const getList = async () => {
|
|||
}
|
||||
}
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
const handleQuery = () => {
|
||||
queryParams.pageNo = 1
|
||||
getList()
|
||||
}
|
||||
|
||||
/** 重置按钮操作 */
|
||||
const resetQuery = () => {
|
||||
queryFormRef.value.resetFields()
|
||||
handleQuery()
|
||||
}
|
||||
|
||||
/** 添加/修改操作 */
|
||||
const openForm = (type: string, id?: number) => {
|
||||
formRef.value.open(type, id)
|
||||
}
|
||||
|
||||
/** 提交按钮操作 */
|
||||
const handleSubmit = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认提交该转移单?')
|
||||
|
|
@ -279,6 +247,7 @@ const handleSubmit = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 到货确认按钮操作 */
|
||||
const handleConfirm = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认到货后,将进入待上架状态,是否继续?')
|
||||
|
|
@ -288,6 +257,7 @@ const handleConfirm = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 执行转移按钮操作 */
|
||||
const handleFinish = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认执行调拨?执行后将更新库存。')
|
||||
|
|
@ -297,6 +267,7 @@ const handleFinish = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 取消按钮操作 */
|
||||
const handleCancel = async (id: number) => {
|
||||
try {
|
||||
await message.confirm('确认取消该转移单?取消后不可恢复。')
|
||||
|
|
@ -306,6 +277,7 @@ const handleCancel = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 删除按钮操作 */
|
||||
const handleDelete = async (id: number) => {
|
||||
try {
|
||||
await message.delConfirm()
|
||||
|
|
@ -315,6 +287,7 @@ const handleDelete = async (id: number) => {
|
|||
} catch {}
|
||||
}
|
||||
|
||||
/** 导出按钮操作 */
|
||||
const handleExport = async () => {
|
||||
try {
|
||||
await message.exportConfirm()
|
||||
|
|
|
|||
Loading…
Reference in New Issue