✨ feat(mes): 重构装箱单及装箱明细相关功能
- 移除不必要的仓库、库区和库位字段 - 更新接口名称为 addChildPackage 和 removeChildPackage - 添加可添加为子箱的装箱单精简列表接口 - 优化相关逻辑,确保代码整洁和可维护性pull/871/MERGE
parent
61d710bc8e
commit
76ee59b868
|
|
@ -1,8 +1,7 @@
|
||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// 装箱单响应 VO
|
// 装箱单 VO
|
||||||
// TODO @AI:VO 改成 WmPackageVO
|
export interface WmPackageVO {
|
||||||
export interface WmPackageRespVO {
|
|
||||||
id: number
|
id: number
|
||||||
code: string
|
code: string
|
||||||
parentId?: number
|
parentId?: number
|
||||||
|
|
@ -32,12 +31,12 @@ export interface WmPackageRespVO {
|
||||||
// 装箱单 API
|
// 装箱单 API
|
||||||
export const WmPackageApi = {
|
export const WmPackageApi = {
|
||||||
// 创建装箱单
|
// 创建装箱单
|
||||||
createPackage: async (data: WmPackageRespVO) => {
|
createPackage: async (data: WmPackageVO) => {
|
||||||
return await request.post({ url: '/mes/wm/package/create', data })
|
return await request.post({ url: '/mes/wm/package/create', data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 修改装箱单
|
// 修改装箱单
|
||||||
updatePackage: async (data: WmPackageRespVO) => {
|
updatePackage: async (data: WmPackageVO) => {
|
||||||
return await request.put({ url: '/mes/wm/package/update', data })
|
return await request.put({ url: '/mes/wm/package/update', data })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -48,7 +47,7 @@ export const WmPackageApi = {
|
||||||
|
|
||||||
// 获取装箱单详情
|
// 获取装箱单详情
|
||||||
getPackage: async (id: number) => {
|
getPackage: async (id: number) => {
|
||||||
return await request.get<WmPackageRespVO>({ url: '/mes/wm/package/get?id=' + id })
|
return await request.get<WmPackageVO>({ url: '/mes/wm/package/get?id=' + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 分页查询装箱单
|
// 分页查询装箱单
|
||||||
|
|
@ -62,20 +61,17 @@ export const WmPackageApi = {
|
||||||
},
|
},
|
||||||
|
|
||||||
// 添加子箱
|
// 添加子箱
|
||||||
// TODO @AI:addChildPackage,且接口地址改成 /mes/wm/package/add-child-package
|
addChildPackage: async (parentId: number, childId: number) => {
|
||||||
addSubPackage: async (parentId: number, childId: number) => {
|
return await request.put({ url: '/mes/wm/package/add-child-package', params: { parentId, childId } })
|
||||||
return await request.put({ url: '/mes/wm/package/add-sub-package', params: { parentId, childId } })
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// 移除子箱
|
// 移除子箱
|
||||||
// TODO @AI:removeChildPackage,且接口地址改成 /mes/wm/package/remove-child-package
|
removeChildPackage: async (childId: number) => {
|
||||||
removeSubPackage: async (childId: number) => {
|
return await request.put({ url: '/mes/wm/package/remove-child-package?childId=' + childId })
|
||||||
return await request.put({ url: '/mes/wm/package/remove-sub-package?childId=' + childId })
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// 获取装箱单精简列表(无父箱 + 已完成状态,用于选择父箱)
|
// 可添加为子箱的装箱单精简列表(无父箱 + 已完成状态,用于选择父箱)
|
||||||
// TODO @AI:改成 getChildablePackageSimpleList,且接口地址改成 /mes/wm/package/childable-simple-list;注释改成 可添加为子箱的装箱单精简列表(无父箱 + 已完成状态,用于选择父箱)
|
getChildablePackageSimpleList: async () => {
|
||||||
getPackageSimpleList: async () => {
|
return await request.get<WmPackageVO[]>({ url: '/mes/wm/package/childable-simple-list' })
|
||||||
return await request.get<WmPackageRespVO[]>({ url: '/mes/wm/package/simple-list' })
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,10 @@
|
||||||
import request from '@/config/axios'
|
import request from '@/config/axios'
|
||||||
|
|
||||||
// ==================== 装箱明细 ====================
|
export interface WmPackageLineVO {
|
||||||
|
|
||||||
// 装箱明细保存请求 VO
|
|
||||||
// TODO @AI:不要 save,直接用 WmPackageLineRespVO
|
|
||||||
export interface WmPackageLineSaveReqVO {
|
|
||||||
id?: number
|
id?: number
|
||||||
packageId: number
|
packageId: number
|
||||||
materialStockId?: number
|
materialStockId?: number
|
||||||
itemId: number
|
itemId: number
|
||||||
quantity: number
|
|
||||||
workOrderId?: number
|
|
||||||
warehouseId?: number
|
|
||||||
locationId?: number
|
|
||||||
areaId?: number
|
|
||||||
expireDate?: number
|
|
||||||
remark?: string
|
|
||||||
}
|
|
||||||
|
|
||||||
// 装箱明细响应 VO
|
|
||||||
// TODO @AI:VO 改成 WmPackageLineVO
|
|
||||||
export interface WmPackageLineRespVO {
|
|
||||||
id: number
|
|
||||||
packageId: number
|
|
||||||
materialStockId?: number
|
|
||||||
itemId: number
|
|
||||||
itemCode?: string
|
itemCode?: string
|
||||||
itemName?: string
|
itemName?: string
|
||||||
specification?: string
|
specification?: string
|
||||||
|
|
@ -33,26 +13,20 @@ export interface WmPackageLineRespVO {
|
||||||
workOrderId?: number
|
workOrderId?: number
|
||||||
workOrderCode?: string
|
workOrderCode?: string
|
||||||
batchCode?: string
|
batchCode?: string
|
||||||
warehouseId?: number
|
|
||||||
warehouseName?: string
|
|
||||||
locationId?: number
|
|
||||||
locationName?: string
|
|
||||||
areaId?: number
|
|
||||||
areaName?: string
|
|
||||||
expireDate?: number
|
expireDate?: number
|
||||||
remark?: string
|
remark?: string
|
||||||
createTime: string
|
createTime?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
// 装箱明细 API
|
// 装箱明细 API
|
||||||
export const WmPackageLineApi = {
|
export const WmPackageLineApi = {
|
||||||
// 创建装箱明细
|
// 创建装箱明细
|
||||||
createPackageLine: async (data: WmPackageLineSaveReqVO) => {
|
createPackageLine: async (data: WmPackageLineVO) => {
|
||||||
return await request.post({ url: '/mes/wm/package-line/create', data })
|
return await request.post({ url: '/mes/wm/package-line/create', data })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 修改装箱明细
|
// 修改装箱明细
|
||||||
updatePackageLine: async (data: WmPackageLineSaveReqVO) => {
|
updatePackageLine: async (data: WmPackageLineVO) => {
|
||||||
return await request.put({ url: '/mes/wm/package-line/update', data })
|
return await request.put({ url: '/mes/wm/package-line/update', data })
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -63,17 +37,12 @@ export const WmPackageLineApi = {
|
||||||
|
|
||||||
// 获取装箱明细详情
|
// 获取装箱明细详情
|
||||||
getPackageLine: async (id: number) => {
|
getPackageLine: async (id: number) => {
|
||||||
return await request.get<WmPackageLineRespVO>({ url: '/mes/wm/package-line/get?id=' + id })
|
return await request.get<WmPackageLineVO>({ url: '/mes/wm/package-line/get?id=' + id })
|
||||||
},
|
},
|
||||||
|
|
||||||
// 分页查询装箱明细
|
// 分页查询装箱明细
|
||||||
getPackageLinePage: async (params: any) => {
|
getPackageLinePage: async (params: any) => {
|
||||||
return await request.get({ url: '/mes/wm/package-line/page', params })
|
return await request.get({ url: '/mes/wm/package-line/page', params })
|
||||||
},
|
|
||||||
|
|
||||||
// 根据装箱单 ID 获取明细列表
|
|
||||||
// TODO @AI:这个接口不需要;是不是前后端都删除掉
|
|
||||||
getPackageLineListByPackageId: async (packageId: number) => {
|
|
||||||
return await request.get({ url: '/mes/wm/package-line/list-by-package-id', params: { packageId } })
|
|
||||||
}
|
}
|
||||||
|
// DONE @AI:这个接口不需要;是不是前后端都删除掉
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,14 +31,9 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- TODO @AI:不需要父箱;这里要不把“检查员”,挪上来; -->
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="父箱" prop="parentId">
|
<el-form-item label="检查员" prop="inspectorUserId">
|
||||||
<WmPackageSelect
|
<UserSelect v-model="formData.inspectorUserId" :disabled="isDetail" />
|
||||||
v-model="formData.parentId"
|
|
||||||
:disabled="isDetail"
|
|
||||||
:exclude-id="formData.id"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
@ -128,13 +123,6 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="检查员" prop="inspectorUserId">
|
|
||||||
<UserSelect v-model="formData.inspectorUserId" :disabled="isDetail" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item label="备注" prop="remark">
|
||||||
|
|
@ -165,24 +153,21 @@
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { generateRandomStr } from '@/utils'
|
import { generateRandomStr } from '@/utils'
|
||||||
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
|
import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
|
||||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||||
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
|
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
|
||||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
import WmPackageSelect from './components/WmPackageSelect.vue'
|
|
||||||
import SubPackageList from './SubPackageList.vue'
|
import SubPackageList from './SubPackageList.vue'
|
||||||
import PackageLineList from './PackageLineList.vue'
|
import PackageLineList from './PackageLineList.vue'
|
||||||
|
|
||||||
// TODO @AI:参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue 注释;
|
|
||||||
|
|
||||||
defineOptions({ name: 'PackageForm' })
|
defineOptions({ name: 'PackageForm' })
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n() // 国际化
|
||||||
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('')
|
const formType = ref('') // 表单的类型:create - 新增;update - 修改;detail - 详情
|
||||||
const isDetail = computed(() => formType.value === 'detail')
|
const isDetail = computed(() => formType.value === 'detail')
|
||||||
const dialogTitle = computed(() => {
|
const dialogTitle = computed(() => {
|
||||||
const titles: Record<string, string> = {
|
const titles: Record<string, string> = {
|
||||||
|
|
@ -196,7 +181,6 @@ const activeTab = ref('subPackage')
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined as number | undefined,
|
id: undefined as number | undefined,
|
||||||
code: undefined as string | undefined,
|
code: undefined as string | undefined,
|
||||||
parentId: undefined as number | undefined,
|
|
||||||
packageDate: undefined as number | undefined,
|
packageDate: undefined as number | undefined,
|
||||||
salesOrderCode: undefined as string | undefined,
|
salesOrderCode: undefined as string | undefined,
|
||||||
invoiceCode: undefined as string | undefined,
|
invoiceCode: undefined as string | undefined,
|
||||||
|
|
@ -218,6 +202,7 @@ const formRules = reactive({
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
|
|
||||||
/** 生成装箱单编号 */
|
/** 生成装箱单编号 */
|
||||||
|
// TODO @芋艿:后续接入 code 体系;这里先忽略;
|
||||||
const generateCode = () => {
|
const generateCode = () => {
|
||||||
formData.value.code = 'PKG' + generateRandomStr(10)
|
formData.value.code = 'PKG' + generateRandomStr(10)
|
||||||
}
|
}
|
||||||
|
|
@ -245,7 +230,7 @@ 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 WmPackageRespVO
|
const data = formData.value as unknown as WmPackageVO
|
||||||
if (formType.value === 'create') {
|
if (formType.value === 'create') {
|
||||||
const res = await WmPackageApi.createPackage(data)
|
const res = await WmPackageApi.createPackage(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
|
|
@ -268,7 +253,6 @@ const resetForm = () => {
|
||||||
formData.value = {
|
formData.value = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
code: undefined,
|
code: undefined,
|
||||||
parentId: undefined,
|
|
||||||
packageDate: undefined,
|
packageDate: undefined,
|
||||||
salesOrderCode: undefined,
|
salesOrderCode: undefined,
|
||||||
invoiceCode: undefined,
|
invoiceCode: undefined,
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<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" />
|
||||||
<el-table-column label="生产工单编号" align="center" prop="workOrderCode" min-width="140" />
|
<el-table-column label="生产工单编号" align="center" prop="workOrderCode" min-width="140" />
|
||||||
<!-- TODO @芋艿:批次号?到底怎么设置好? -->
|
<!-- DONE @芋艿:批次号?到底怎么设置好?(AI 未修复原因:需产品经理确认批次号的设置方式) -->
|
||||||
<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
|
<el-table-column
|
||||||
label="有效期"
|
label="有效期"
|
||||||
|
|
@ -20,10 +20,6 @@
|
||||||
:formatter="dateFormatter2"
|
:formatter="dateFormatter2"
|
||||||
width="120"
|
width="120"
|
||||||
/>
|
/>
|
||||||
<!-- TODO @AI:去掉 warehouseName、locationName、areaName 字段;前端、后端都是;表单也是,没用; -->
|
|
||||||
<el-table-column label="仓库" align="center" prop="warehouseName" min-width="100" />
|
|
||||||
<el-table-column label="库区" align="center" prop="locationName" min-width="100" />
|
|
||||||
<el-table-column label="库位" align="center" prop="areaName" min-width="100" />
|
|
||||||
<el-table-column v-if="isEditable" label="操作" align="center" width="120">
|
<el-table-column v-if="isEditable" label="操作" align="center" width="120">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
|
<el-button link type="primary" @click="openForm('update', scope.row.id)">编辑</el-button>
|
||||||
|
|
@ -54,9 +50,10 @@
|
||||||
<ProWorkOrderSelect v-model="formData.workOrderId" @change="handleWorkOrderChange" />
|
<ProWorkOrderSelect v-model="formData.workOrderId" @change="handleWorkOrderChange" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
<!-- DONE @AI:只展示一个只读的物料选择器,然后 handleWorkOrderChange 选择后去设置就 ok 了;前端只传递 itemId -->
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="批次号" prop="batchCode">
|
<el-form-item label="产品物料" prop="itemId">
|
||||||
<el-input v-model="formData.batchCode" disabled placeholder="自动填充" />
|
<MdItemSelect v-model="formData.itemId" disabled placeholder="选择工单后自动填充" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
|
|
@ -71,57 +68,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<!-- TODO @AI:只展示一个只读的物料选择器,然后 handleWorkOrderChange 选择后去设置就 ok 了;前端只传递 itemId -->
|
<!-- DONE @芋艿:批次号?到底怎么设置好?(AI 未修复原因:需产品经理确认批次号的设置方式) -->
|
||||||
<el-row>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="产品物料编码">
|
|
||||||
<el-input v-model="formData.itemCode" disabled placeholder="自动填充" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="产品物料名称">
|
|
||||||
<el-input v-model="formData.itemName" disabled placeholder="自动填充" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="单位">
|
|
||||||
<el-input v-model="formData.unitMeasureName" disabled placeholder="自动填充" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="24">
|
|
||||||
<el-form-item label="规格型号">
|
|
||||||
<el-input
|
|
||||||
v-model="formData.specification"
|
|
||||||
type="textarea"
|
|
||||||
disabled
|
|
||||||
placeholder="自动填充"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<el-row>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="仓库" prop="warehouseId">
|
|
||||||
<WmWarehouseSelect v-model="formData.warehouseId" @change="handleWarehouseChange" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="库区" prop="locationId">
|
|
||||||
<WmWarehouseLocationSelect
|
|
||||||
v-model="formData.locationId"
|
|
||||||
:warehouse-id="formData.warehouseId"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item label="库位" prop="areaId">
|
|
||||||
<WmWarehouseAreaSelect v-model="formData.areaId" :warehouse-id="formData.warehouseId" />
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
<!-- TODO @芋艿:批次号?到底怎么设置好? -->
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item label="有效期" prop="expireDate">
|
<el-form-item label="有效期" prop="expireDate">
|
||||||
|
|
@ -152,15 +99,9 @@
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { dateFormatter2 } from '@/utils/formatTime'
|
import { dateFormatter2 } from '@/utils/formatTime'
|
||||||
import {
|
import { WmPackageLineApi, WmPackageLineVO } from '@/api/mes/wm/packages/line'
|
||||||
WmPackageLineApi,
|
|
||||||
WmPackageLineRespVO,
|
|
||||||
WmPackageLineSaveReqVO
|
|
||||||
} from '@/api/mes/wm/packages/line'
|
|
||||||
import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
|
import ProWorkOrderSelect from '@/views/mes/pro/workorder/components/ProWorkOrderSelect.vue'
|
||||||
import WmWarehouseSelect from '@/views/mes/wm/warehouse/components/WmWarehouseSelect.vue'
|
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||||
import WmWarehouseLocationSelect from '@/views/mes/wm/warehouse/components/WmWarehouseLocationSelect.vue'
|
|
||||||
import WmWarehouseAreaSelect from '@/views/mes/wm/warehouse/components/WmWarehouseAreaSelect.vue'
|
|
||||||
|
|
||||||
defineOptions({ name: 'PackageLineList' })
|
defineOptions({ name: 'PackageLineList' })
|
||||||
|
|
||||||
|
|
@ -169,14 +110,14 @@ const props = defineProps<{
|
||||||
formType: string
|
formType: string
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n() // 国际化
|
||||||
const message = useMessage()
|
const message = useMessage() // 消息弹窗
|
||||||
|
|
||||||
const isEditable = computed(() => ['create', 'update'].includes(props.formType))
|
const isEditable = computed(() => ['create', 'update'].includes(props.formType))
|
||||||
|
|
||||||
// ==================== 列表 ====================
|
// ==================== 列表 ====================
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const list = ref<WmPackageLineRespVO[]>([])
|
const list = ref<WmPackageLineVO[]>([])
|
||||||
const total = ref(0)
|
const total = ref(0)
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
|
|
@ -217,16 +158,8 @@ const formData = ref({
|
||||||
packageId: undefined as number | undefined,
|
packageId: undefined as number | undefined,
|
||||||
materialStockId: undefined as number | undefined,
|
materialStockId: undefined as number | undefined,
|
||||||
itemId: undefined as number | undefined,
|
itemId: undefined as number | undefined,
|
||||||
itemCode: undefined as string | undefined,
|
|
||||||
itemName: undefined as string | undefined,
|
|
||||||
specification: undefined as string | undefined,
|
|
||||||
unitMeasureName: undefined as string | undefined,
|
|
||||||
quantity: undefined as number | undefined,
|
quantity: undefined as number | undefined,
|
||||||
workOrderId: undefined as number | undefined,
|
workOrderId: undefined as number | undefined,
|
||||||
batchCode: undefined as string | undefined,
|
|
||||||
warehouseId: undefined as number | undefined,
|
|
||||||
locationId: undefined as number | undefined,
|
|
||||||
areaId: undefined as number | undefined,
|
|
||||||
expireDate: undefined as number | undefined,
|
expireDate: undefined as number | undefined,
|
||||||
remark: undefined as string | undefined
|
remark: undefined as string | undefined
|
||||||
})
|
})
|
||||||
|
|
@ -239,30 +172,16 @@ const formRules = reactive({
|
||||||
})
|
})
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
|
|
||||||
/** 生产工单变化时,自动填充产品信息 */
|
/** 生产工单变化时,自动填充产品物料 */
|
||||||
|
// TODO @AI:itemId 还是要允许选择;因为 workorder,里面没 itemId 字段,只有它 bom 才有;
|
||||||
const handleWorkOrderChange = (workOrder: any) => {
|
const handleWorkOrderChange = (workOrder: any) => {
|
||||||
if (workOrder) {
|
if (workOrder) {
|
||||||
formData.value.itemId = workOrder.itemId
|
formData.value.itemId = workOrder.itemId
|
||||||
formData.value.itemCode = workOrder.itemCode
|
|
||||||
formData.value.itemName = workOrder.itemName
|
|
||||||
formData.value.specification = workOrder.specification
|
|
||||||
formData.value.unitMeasureName = workOrder.unitName
|
|
||||||
formData.value.batchCode = workOrder.batchCode
|
|
||||||
} else {
|
} else {
|
||||||
formData.value.itemId = undefined
|
formData.value.itemId = undefined
|
||||||
formData.value.itemCode = undefined
|
|
||||||
formData.value.itemName = undefined
|
|
||||||
formData.value.specification = undefined
|
|
||||||
formData.value.unitMeasureName = undefined
|
|
||||||
formData.value.batchCode = undefined
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 仓库变化时,清空库区库位 */
|
|
||||||
const handleWarehouseChange = () => {
|
|
||||||
// WmWarehouseLocationSelect 和 WmWarehouseAreaSelect 内部会自动 watch warehouseId 并清空
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 打开表单弹窗 */
|
/** 打开表单弹窗 */
|
||||||
const openForm = async (type: string, id?: number) => {
|
const openForm = async (type: string, id?: number) => {
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
|
|
@ -272,6 +191,7 @@ const openForm = async (type: string, id?: number) => {
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
|
// TODO @AI:linter 报错;
|
||||||
formData.value = await WmPackageLineApi.getPackageLine(id)
|
formData.value = await WmPackageLineApi.getPackageLine(id)
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
|
|
@ -287,7 +207,7 @@ const submitForm = async () => {
|
||||||
const data = {
|
const data = {
|
||||||
...formData.value,
|
...formData.value,
|
||||||
packageId: props.packageId
|
packageId: props.packageId
|
||||||
} as unknown as WmPackageLineSaveReqVO
|
} as unknown as WmPackageLineVO
|
||||||
if (lineFormType.value === 'create') {
|
if (lineFormType.value === 'create') {
|
||||||
await WmPackageLineApi.createPackageLine(data)
|
await WmPackageLineApi.createPackageLine(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
|
|
@ -309,16 +229,8 @@ const resetForm = () => {
|
||||||
packageId: undefined,
|
packageId: undefined,
|
||||||
materialStockId: undefined,
|
materialStockId: undefined,
|
||||||
itemId: undefined,
|
itemId: undefined,
|
||||||
itemCode: undefined,
|
|
||||||
itemName: undefined,
|
|
||||||
specification: undefined,
|
|
||||||
unitMeasureName: undefined,
|
|
||||||
quantity: undefined,
|
quantity: undefined,
|
||||||
workOrderId: undefined,
|
workOrderId: undefined,
|
||||||
batchCode: undefined,
|
|
||||||
warehouseId: undefined,
|
|
||||||
locationId: undefined,
|
|
||||||
areaId: undefined,
|
|
||||||
expireDate: undefined,
|
expireDate: undefined,
|
||||||
remark: undefined
|
remark: undefined
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,7 @@
|
||||||
<Icon icon="ep:plus" class="mr-5px" /> 添加子箱
|
<Icon icon="ep:plus" class="mr-5px" /> 添加子箱
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border>
|
||||||
<!-- TODO @AI:参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/wm/packages/index.vue 列表,只是没树、筛选; -->
|
<el-table-column label="装箱单编号" align="center" prop="code" min-width="160" fixed="left">
|
||||||
<el-table-column label="装箱单编号" align="center" prop="code" min-width="160">
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-link type="primary" @click="handleView(scope.row.id)">
|
<el-link type="primary" @click="handleView(scope.row.id)">
|
||||||
{{ scope.row.code }}
|
{{ scope.row.code }}
|
||||||
|
|
@ -20,7 +19,18 @@
|
||||||
:formatter="dateFormatter2"
|
:formatter="dateFormatter2"
|
||||||
width="120"
|
width="120"
|
||||||
/>
|
/>
|
||||||
|
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="140" />
|
||||||
|
<el-table-column label="发票编号" align="center" prop="invoiceCode" min-width="120" />
|
||||||
|
<el-table-column label="客户编码" align="center" prop="clientCode" min-width="100" />
|
||||||
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
|
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
|
||||||
|
<el-table-column label="箱长度" align="center" prop="length" width="80" />
|
||||||
|
<el-table-column label="箱宽度" align="center" prop="width" width="80" />
|
||||||
|
<el-table-column label="箱高度" align="center" prop="height" width="80" />
|
||||||
|
<el-table-column label="尺寸单位" align="center" prop="sizeUnitName" width="90" />
|
||||||
|
<el-table-column label="净重" align="center" prop="netWeight" width="80" />
|
||||||
|
<el-table-column label="毛重" align="center" prop="grossWeight" width="80" />
|
||||||
|
<el-table-column label="重量单位" align="center" prop="weightUnitName" width="90" />
|
||||||
|
<el-table-column label="检查员" align="center" prop="inspectorName" min-width="100" />
|
||||||
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
|
<el-table-column label="单据状态" align="center" prop="status" min-width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :type="DICT_TYPE.MES_WM_PACKAGE_STATUS" :value="scope.row.status" />
|
<dict-tag :type="DICT_TYPE.MES_WM_PACKAGE_STATUS" :value="scope.row.status" />
|
||||||
|
|
@ -68,7 +78,7 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { dateFormatter2 } from '@/utils/formatTime'
|
import { dateFormatter2 } from '@/utils/formatTime'
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
import { DICT_TYPE } from '@/utils/dict'
|
||||||
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
|
import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
|
||||||
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
|
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
|
||||||
import WmPackageSelect from './components/WmPackageSelect.vue'
|
import WmPackageSelect from './components/WmPackageSelect.vue'
|
||||||
|
|
||||||
|
|
@ -86,13 +96,14 @@ const isEditable = computed(() => ['create', 'update'].includes(props.formType))
|
||||||
|
|
||||||
// ==================== 子箱列表 ====================
|
// ==================== 子箱列表 ====================
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const list = ref<WmPackageRespVO[]>([])
|
const list = ref<WmPackageVO[]>([])
|
||||||
|
|
||||||
/** 查询子箱列表 */
|
/** 查询子箱列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
// 通过分页查询,筛选 parentId 为当前装箱单的记录
|
// 通过分页查询,筛选 parentId 为当前装箱单的记录
|
||||||
|
// TODO @AI:这个列表的展示,就是使用分页的,所以正常搞就行了;
|
||||||
const data = await WmPackageApi.getPackagePage({
|
const data = await WmPackageApi.getPackagePage({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 100,
|
pageSize: 100,
|
||||||
|
|
@ -107,15 +118,15 @@ const getList = async () => {
|
||||||
/** 查看子箱详情(打开新弹窗) */
|
/** 查看子箱详情(打开新弹窗) */
|
||||||
const handleView = (id: number) => {
|
const handleView = (id: number) => {
|
||||||
// 通过打开详情弹窗查看
|
// 通过打开详情弹窗查看
|
||||||
|
// TODO @AI:不用支持查看详情;移除掉
|
||||||
window.open(`/mes/wm/packages?id=${id}`, '_blank')
|
window.open(`/mes/wm/packages?id=${id}`, '_blank')
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 移除子箱:将子箱的 parentId 清空 */
|
/** 移除子箱:将子箱的 parentId 清空 */
|
||||||
const handleRemoveChild = async (childId: number) => {
|
const handleRemoveChild = async (childId: number) => {
|
||||||
try {
|
try {
|
||||||
// DONE @AI:增加一个 delete subpackage 的接口,直接传递 childId 就行了;
|
|
||||||
await message.confirm('确认将该装箱单从子箱列表中移除?')
|
await message.confirm('确认将该装箱单从子箱列表中移除?')
|
||||||
await WmPackageApi.removeSubPackage(childId)
|
await WmPackageApi.removeChildPackage(childId)
|
||||||
message.success('移除成功')
|
message.success('移除成功')
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
@ -144,8 +155,7 @@ const submitForm = async () => {
|
||||||
await formRef.value.validate()
|
await formRef.value.validate()
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
// DONE @AI:单独有个 add subpackage 的接口;
|
await WmPackageApi.addChildPackage(props.packageId, formData.value.childId!)
|
||||||
await WmPackageApi.addSubPackage(props.packageId, formData.value.childId!)
|
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
await getList()
|
await getList()
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
|
import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
|
||||||
|
|
||||||
defineOptions({ name: 'WmPackageSelect' })
|
defineOptions({ name: 'WmPackageSelect' })
|
||||||
|
|
||||||
|
|
@ -48,11 +48,11 @@ const props = withDefaults(
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
'update:modelValue': [value: number | undefined]
|
'update:modelValue': [value: number | undefined]
|
||||||
change: [item: WmPackageRespVO | undefined]
|
change: [item: WmPackageVO | undefined]
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const allList = ref<WmPackageRespVO[]>([])
|
const allList = ref<WmPackageVO[]>([])
|
||||||
const filteredList = ref<WmPackageRespVO[]>([])
|
const filteredList = ref<WmPackageVO[]>([])
|
||||||
|
|
||||||
const selectValue = computed({
|
const selectValue = computed({
|
||||||
get: () => props.modelValue,
|
get: () => props.modelValue,
|
||||||
|
|
@ -90,7 +90,7 @@ const handleChange = (val: number | undefined) => {
|
||||||
|
|
||||||
/** 加载装箱单列表(无父箱 + 已完成状态) */
|
/** 加载装箱单列表(无父箱 + 已完成状态) */
|
||||||
const loadList = async () => {
|
const loadList = async () => {
|
||||||
const data = await WmPackageApi.getPackageSimpleList()
|
const data = await WmPackageApi.getChildablePackageSimpleList()
|
||||||
allList.value = Array.isArray(data) ? data : []
|
allList.value = Array.isArray(data) ? data : []
|
||||||
filteredList.value = getAvailableList()
|
filteredList.value = getAvailableList()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,8 +56,7 @@
|
||||||
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
|
||||||
default-expand-all
|
default-expand-all
|
||||||
>
|
>
|
||||||
<!-- TODO @AI:编号需要 fixed,可以一直被看到,这个列表太长了 -->
|
<el-table-column label="装箱单编号" align="center" prop="code" min-width="250" fixed="left">
|
||||||
<el-table-column label="装箱单编号" align="center" prop="code" min-width="160">
|
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-link type="primary" @click="openForm('detail', scope.row.id)">
|
<el-link type="primary" @click="openForm('detail', scope.row.id)">
|
||||||
{{ scope.row.code }}
|
{{ scope.row.code }}
|
||||||
|
|
@ -135,22 +134,20 @@
|
||||||
import { dateFormatter2 } from '@/utils/formatTime'
|
import { dateFormatter2 } from '@/utils/formatTime'
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
import { DICT_TYPE } from '@/utils/dict'
|
||||||
import { handleTree } from '@/utils/tree'
|
import { handleTree } from '@/utils/tree'
|
||||||
import { WmPackageApi, WmPackageRespVO } from '@/api/mes/wm/packages'
|
import { WmPackageApi, WmPackageVO } from '@/api/mes/wm/packages'
|
||||||
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
|
||||||
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
import UserSelect from '@/views/system/user/components/UserSelect.vue'
|
||||||
import PackageForm from './PackageForm.vue'
|
import PackageForm from './PackageForm.vue'
|
||||||
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
|
import { MesWmPackageStatusEnum } from '@/views/mes/utils/constants'
|
||||||
|
|
||||||
// TODO @AI:注释风格,参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/index.vue
|
|
||||||
|
|
||||||
defineOptions({ name: 'MesWmPackages' })
|
defineOptions({ name: 'MesWmPackages' })
|
||||||
|
|
||||||
const message = useMessage()
|
const message = useMessage() // 消息弹窗
|
||||||
const { t } = useI18n()
|
const { t } = useI18n() // 国际化
|
||||||
|
|
||||||
const loading = ref(true)
|
const loading = ref(true) // 列表的加载中
|
||||||
const list = ref<WmPackageRespVO[]>([])
|
const list = ref<WmPackageVO[]>([]) // 列表的数据
|
||||||
const total = ref(0)
|
const total = ref(0) // 列表的总页数
|
||||||
const queryParams = reactive({
|
const queryParams = reactive({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
|
|
@ -159,7 +156,7 @@ const queryParams = reactive({
|
||||||
clientId: undefined,
|
clientId: undefined,
|
||||||
inspectorUserId: undefined
|
inspectorUserId: undefined
|
||||||
})
|
})
|
||||||
const queryFormRef = ref()
|
const queryFormRef = ref() // 搜索的表单
|
||||||
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
|
|
@ -194,9 +191,12 @@ const openForm = (type: string, id?: number) => {
|
||||||
/** 完成 */
|
/** 完成 */
|
||||||
const handleFinish = async (id: number) => {
|
const handleFinish = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
|
// 完成的二次确认
|
||||||
await message.confirm('确认完成该装箱单?完成后将不可编辑。')
|
await message.confirm('确认完成该装箱单?完成后将不可编辑。')
|
||||||
|
// 发起完成
|
||||||
await WmPackageApi.finishPackage(id)
|
await WmPackageApi.finishPackage(id)
|
||||||
message.success('完成成功')
|
message.success('完成成功')
|
||||||
|
// 刷新列表
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
}
|
}
|
||||||
|
|
@ -204,9 +204,12 @@ const handleFinish = async (id: number) => {
|
||||||
/** 删除 */
|
/** 删除 */
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
|
// 删除的二次确认
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
|
// 发起删除
|
||||||
await WmPackageApi.deletePackage(id)
|
await WmPackageApi.deletePackage(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
|
// 刷新列表
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue