Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module
# Conflicts: # nl-module-wms/nl-module-wms-server/src/main/java/cn/code/nl/module/wms/framework/rpc/config/RpcConfiguration.java
This commit is contained in:
zhouz
@@ -3,7 +3,7 @@ VITE_BASE=/
|
||||
# 请求路径
|
||||
VITE_BASE_URL=http://127.0.0.1:48080
|
||||
# 接口地址
|
||||
VITE_GLOB_API_URL=http://127.0.0.1:48080/admin-api
|
||||
VITE_GLOB_API_URL=/admin-api
|
||||
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
|
||||
VITE_UPLOAD_TYPE=server
|
||||
|
||||
@@ -23,4 +23,4 @@ VITE_INJECT_APP_LOADING=true
|
||||
VITE_ARCHIVER=true
|
||||
|
||||
# 验证码的开关
|
||||
VITE_APP_CAPTCHA_ENABLE=true
|
||||
VITE_APP_CAPTCHA_ENABLE=true
|
||||
|
||||
@@ -5,7 +5,7 @@ import { requestClient } from '#/api/request';
|
||||
export namespace WmsGroupPlateApi {
|
||||
/** 组盘记录信息 */
|
||||
export interface GroupPlate {
|
||||
groupId: string;
|
||||
groupId?: number;
|
||||
vehicleCode: string; // 载具编码
|
||||
status?: string; // 状态
|
||||
materialId: string; // 物料id
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
import type { PageParam, PageResult } from '@vben/request';
|
||||
|
||||
import { requestClient } from '#/api/request';
|
||||
|
||||
export namespace WmsStorageVehicleInfoApi {
|
||||
/** 载具信息信息 */
|
||||
export interface StorageVehicleInfo {
|
||||
storageVehicleId?: number;
|
||||
storageVehicleCode?: string; // 载具编码
|
||||
storageVehicleName: string; // 载具名称
|
||||
oneCode: string; // 一维码
|
||||
twoCode: string; // 二维码
|
||||
isUsed?: boolean; // 是否启用
|
||||
storageVehicleType?: string; // 载具类型
|
||||
vehicleWidth: number; // 载具宽度
|
||||
vehicleLong: number; // 载具长度
|
||||
vehicleHeight: number; // 载具高度
|
||||
weigth: number; // 托盘重量
|
||||
overStructType?: string; // 载具是否超仓位
|
||||
occupyStructQty?: number; // 占仓位数
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/** 查询载具信息分页 */
|
||||
export function getStorageVehicleInfoPage(params: PageParam) {
|
||||
return requestClient.get<PageResult<WmsStorageVehicleInfoApi.StorageVehicleInfo>>(
|
||||
'/wms/storage-vehicle-info/page',
|
||||
{ params },
|
||||
);
|
||||
}
|
||||
|
||||
/** 查询载具信息详情 */
|
||||
export function getStorageVehicleInfo(id: number) {
|
||||
return requestClient.get<WmsStorageVehicleInfoApi.StorageVehicleInfo>(
|
||||
`/wms/storage-vehicle-info/get?id=${id}`,
|
||||
);
|
||||
}
|
||||
|
||||
/** 新增载具信息 */
|
||||
export function createStorageVehicleInfo(data: WmsStorageVehicleInfoApi.StorageVehicleInfo) {
|
||||
return requestClient.post('/wms/storage-vehicle-info/create', data);
|
||||
}
|
||||
|
||||
/** 修改载具信息 */
|
||||
export function updateStorageVehicleInfo(data: WmsStorageVehicleInfoApi.StorageVehicleInfo) {
|
||||
return requestClient.put('/wms/storage-vehicle-info/update', data);
|
||||
}
|
||||
|
||||
/** 删除载具信息 */
|
||||
export function deleteStorageVehicleInfo(id: number) {
|
||||
return requestClient.delete(`/wms/storage-vehicle-info/delete?id=${id}`);
|
||||
}
|
||||
|
||||
/** 批量删除载具信息 */
|
||||
export function deleteStorageVehicleInfoList(ids: number[]) {
|
||||
return requestClient.delete(
|
||||
`/wms/storage-vehicle-info/delete-list?ids=${ids.join(',')}`,
|
||||
);
|
||||
}
|
||||
|
||||
/** 批量生成载具信息 */
|
||||
export interface BatchCreateStorageVehicleInfoReqVO {
|
||||
storageVehicleType: string;
|
||||
storageVehicleTypeLabel: string;
|
||||
count: number;
|
||||
}
|
||||
|
||||
/** 批量生成载具信息 */
|
||||
export function batchCreateStorageVehicleInfo(data: BatchCreateStorageVehicleInfoReqVO) {
|
||||
return requestClient.post<number[]>('/wms/storage-vehicle-info/batch-create', data);
|
||||
}
|
||||
|
||||
/** 导出载具信息 */
|
||||
export function exportStorageVehicleInfo(params: any) {
|
||||
return requestClient.download('/wms/storage-vehicle-info/export-excel', { params });
|
||||
}
|
||||
|
||||
|
||||
@@ -1,186 +1,186 @@
|
||||
<script lang="ts" setup>
|
||||
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||
import type { WmsGroupPlateApi } from '#/api/wms/groupplate';
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { confirm, Page, useVbenModal } from '@vben/common-ui';
|
||||
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
|
||||
|
||||
import { message } from 'antdv-next';
|
||||
|
||||
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||
import {
|
||||
deleteGroupPlate,
|
||||
deleteGroupPlateList,
|
||||
exportGroupPlate,
|
||||
getGroupPlatePage,
|
||||
} from '#/api/wms/groupplate';
|
||||
import { $t } from '#/locales';
|
||||
|
||||
import { useGridColumns, useGridFormSchema } from './data';
|
||||
import Form from './modules/form.vue';
|
||||
|
||||
const [FormModal, formModalApi] = useVbenModal({
|
||||
connectedComponent: Form,
|
||||
destroyOnClose: true,
|
||||
});
|
||||
|
||||
/** 刷新表格 */
|
||||
function handleRefresh() {
|
||||
gridApi.query();
|
||||
}
|
||||
|
||||
/** 创建组盘记录 */
|
||||
function handleCreate() {
|
||||
formModalApi.setData(null).open();
|
||||
}
|
||||
|
||||
/** 编辑组盘记录 */
|
||||
function handleEdit(row: WmsGroupPlateApi.GroupPlate) {
|
||||
formModalApi.setData(row).open();
|
||||
}
|
||||
|
||||
/** 删除组盘记录 */
|
||||
async function handleDelete(row: WmsGroupPlateApi.GroupPlate) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.id]),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteGroupPlate(row.id!);
|
||||
message.success($t('ui.actionMessage.deleteSuccess', [row.id]));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
/** 批量删除组盘记录 */
|
||||
async function handleDeleteBatch() {
|
||||
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deletingBatch'),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteGroupPlateList(checkedIds.value);
|
||||
checkedIds.value = [];
|
||||
message.success($t('ui.actionMessage.deleteSuccess'));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
const checkedIds = ref<number[]>([]);
|
||||
function handleRowCheckboxChange({
|
||||
records,
|
||||
}: {
|
||||
records: WmsGroupPlateApi.GroupPlate[];
|
||||
}) {
|
||||
checkedIds.value = records.map((item) => item.id!);
|
||||
}
|
||||
|
||||
/** 导出表格 */
|
||||
async function handleExport() {
|
||||
const data = await exportGroupPlate(await gridApi.formApi.getValues());
|
||||
downloadFileFromBlobPart({ fileName: '组盘记录.xls', source: data });
|
||||
}
|
||||
|
||||
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
formOptions: {
|
||||
schema: useGridFormSchema(),
|
||||
},
|
||||
gridOptions: {
|
||||
columns: useGridColumns(),
|
||||
height: 'auto',
|
||||
keepSource: true,
|
||||
proxyConfig: {
|
||||
ajax: {
|
||||
query: async ({ page }, formValues) => {
|
||||
return await getGroupPlatePage({
|
||||
pageNo: page.currentPage,
|
||||
pageSize: page.pageSize,
|
||||
...formValues,
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
rowConfig: {
|
||||
keyField: 'id',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
refresh: true,
|
||||
search: true,
|
||||
},
|
||||
} as VxeTableGridOptions<WmsGroupPlateApi.GroupPlate>,
|
||||
gridEvents: {
|
||||
checkboxAll: handleRowCheckboxChange,
|
||||
checkboxChange: handleRowCheckboxChange,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Page auto-content-height>
|
||||
<FormModal @success="handleRefresh" />
|
||||
<Grid table-title="组盘记录列表">
|
||||
<template #toolbar-tools>
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('ui.actionTitle.create', ['组盘记录']),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.ADD,
|
||||
auth: ['wms:group-plate:create'],
|
||||
onClick: handleCreate,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.export'),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.DOWNLOAD,
|
||||
auth: ['wms:group-plate:export'],
|
||||
onClick: handleExport,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.deleteBatch'),
|
||||
type: 'primary',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:group-plate:delete'],
|
||||
disabled: isEmpty(checkedIds),
|
||||
onClick: handleDeleteBatch,
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
<template #actions="{ row }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('common.edit'),
|
||||
type: 'link',
|
||||
icon: ACTION_ICON.EDIT,
|
||||
auth: ['wms:group-plate:update'],
|
||||
onClick: handleEdit.bind(null, row),
|
||||
},
|
||||
{
|
||||
label: $t('common.delete'),
|
||||
type: 'link',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:group-plate:delete'],
|
||||
popConfirm: {
|
||||
title: $t('ui.actionMessage.deleteConfirm', [row.id]),
|
||||
confirm: handleDelete.bind(null, row),
|
||||
},
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
</Grid>
|
||||
</Page>
|
||||
</template>
|
||||
<script lang="ts" setup>
|
||||
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||
import type { WmsGroupPlateApi } from '#/api/wms/groupplate';
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { confirm, Page, useVbenModal } from '@vben/common-ui';
|
||||
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
|
||||
|
||||
import { message } from 'antdv-next';
|
||||
|
||||
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||
import {
|
||||
deleteGroupPlate,
|
||||
deleteGroupPlateList,
|
||||
exportGroupPlate,
|
||||
getGroupPlatePage,
|
||||
} from '#/api/wms/groupplate';
|
||||
import { $t } from '#/locales';
|
||||
|
||||
import { useGridColumns, useGridFormSchema } from './data';
|
||||
import Form from './modules/form.vue';
|
||||
|
||||
const [FormModal, formModalApi] = useVbenModal({
|
||||
connectedComponent: Form,
|
||||
destroyOnClose: true,
|
||||
});
|
||||
|
||||
/** 刷新表格 */
|
||||
function handleRefresh() {
|
||||
gridApi.query();
|
||||
}
|
||||
|
||||
/** 创建组盘记录 */
|
||||
function handleCreate() {
|
||||
formModalApi.setData(null).open();
|
||||
}
|
||||
|
||||
/** 编辑组盘记录 */
|
||||
function handleEdit(row: WmsGroupPlateApi.GroupPlate) {
|
||||
formModalApi.setData(row).open();
|
||||
}
|
||||
|
||||
/** 删除组盘记录 */
|
||||
async function handleDelete(row: WmsGroupPlateApi.GroupPlate) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.groupId]),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteGroupPlate(row.groupId!);
|
||||
message.success($t('ui.actionMessage.deleteSuccess', [row.groupId]));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
/** 批量删除组盘记录 */
|
||||
async function handleDeleteBatch() {
|
||||
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deletingBatch'),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteGroupPlateList(checkedIds.value);
|
||||
checkedIds.value = [];
|
||||
message.success($t('ui.actionMessage.deleteSuccess'));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
const checkedIds = ref<number[]>([]);
|
||||
function handleRowCheckboxChange({
|
||||
records,
|
||||
}: {
|
||||
records: WmsGroupPlateApi.GroupPlate[];
|
||||
}) {
|
||||
checkedIds.value = records.map((item) => item.groupId!);
|
||||
}
|
||||
|
||||
/** 导出表格 */
|
||||
async function handleExport() {
|
||||
const data = await exportGroupPlate(await gridApi.formApi.getValues());
|
||||
downloadFileFromBlobPart({ fileName: '组盘记录.xls', source: data });
|
||||
}
|
||||
|
||||
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
formOptions: {
|
||||
schema: useGridFormSchema(),
|
||||
},
|
||||
gridOptions: {
|
||||
columns: useGridColumns(),
|
||||
height: 'auto',
|
||||
keepSource: true,
|
||||
proxyConfig: {
|
||||
ajax: {
|
||||
query: async ({ page }, formValues) => {
|
||||
return await getGroupPlatePage({
|
||||
pageNo: page.currentPage,
|
||||
pageSize: page.pageSize,
|
||||
...formValues,
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
rowConfig: {
|
||||
keyField: 'groupId',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
refresh: true,
|
||||
search: true,
|
||||
},
|
||||
} as VxeTableGridOptions<WmsGroupPlateApi.GroupPlate>,
|
||||
gridEvents: {
|
||||
checkboxAll: handleRowCheckboxChange,
|
||||
checkboxChange: handleRowCheckboxChange,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Page auto-content-height>
|
||||
<FormModal @success="handleRefresh" />
|
||||
<Grid table-title="组盘记录列表">
|
||||
<template #toolbar-tools>
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('ui.actionTitle.create', ['组盘记录']),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.ADD,
|
||||
auth: ['wms:group-plate:create'],
|
||||
onClick: handleCreate,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.export'),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.DOWNLOAD,
|
||||
auth: ['wms:group-plate:export'],
|
||||
onClick: handleExport,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.deleteBatch'),
|
||||
type: 'primary',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:group-plate:delete'],
|
||||
disabled: isEmpty(checkedIds),
|
||||
onClick: handleDeleteBatch,
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
<template #actions="{ row }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('common.edit'),
|
||||
type: 'link',
|
||||
icon: ACTION_ICON.EDIT,
|
||||
auth: ['wms:group-plate:update'],
|
||||
onClick: handleEdit.bind(null, row),
|
||||
},
|
||||
{
|
||||
label: $t('common.delete'),
|
||||
type: 'link',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:group-plate:delete'],
|
||||
popConfirm: {
|
||||
title: $t('ui.actionMessage.deleteConfirm', [row.groupId]),
|
||||
confirm: handleDelete.bind(null, row),
|
||||
},
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
</Grid>
|
||||
</Page>
|
||||
</template>
|
||||
|
||||
@@ -115,7 +115,7 @@ const [Modal, modalApi] = useVbenModal({
|
||||
// 提交表单
|
||||
const data = (await formApi.getValues()) as WmsGroupPlateApi.GroupPlate;
|
||||
try {
|
||||
await (formData.value?.id ? updateGroupPlate(data) : createGroupPlate(data));
|
||||
await (formData.value?.groupId ? updateGroupPlate(data) : createGroupPlate(data));
|
||||
// 关闭并提示
|
||||
await modalApi.close();
|
||||
emit('success');
|
||||
@@ -131,12 +131,12 @@ const [Modal, modalApi] = useVbenModal({
|
||||
}
|
||||
// 加载数据
|
||||
const data = modalApi.getData<WmsGroupPlateApi.GroupPlate>();
|
||||
if (!data || !data.id) {
|
||||
if (!data || !data.groupId) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getGroupPlate(data.id);
|
||||
formData.value = await getGroupPlate(data.groupId);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
|
||||
@@ -0,0 +1,359 @@
|
||||
import type { VbenFormSchema } from '#/adapter/form';
|
||||
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||
import type { WmsStorageVehicleInfoApi } from '#/api/wms/storagevehicleinfo';
|
||||
|
||||
import { getRangePickerDefaultProps } from '#/utils';
|
||||
import {getDictOptions} from "@vben/hooks";
|
||||
import {DICT_TYPE} from "@vben/constants";
|
||||
|
||||
/** 新增/修改的表单 */
|
||||
export function useFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
{
|
||||
fieldName: 'storageVehicleId',
|
||||
component: 'Input',
|
||||
dependencies: {
|
||||
triggerFields: [''],
|
||||
show: () => false,
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'storageVehicleCode',
|
||||
label: '载具编码',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
disabled: true,
|
||||
placeholder: '后台自动生成',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'storageVehicleName',
|
||||
label: '载具名称',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
placeholder: '请输入载具名称',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'oneCode',
|
||||
label: '一维码',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
placeholder: '请输入一维码',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'twoCode',
|
||||
label: '二维码',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
placeholder: '请输入二维码',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'isUsed',
|
||||
label: '是否启用',
|
||||
rules: 'required',
|
||||
component: 'RadioGroup',
|
||||
componentProps: {
|
||||
options: getDictOptions(DICT_TYPE.COMMON_TRUE_FALSE, 'boolean'),
|
||||
buttonStyle: 'solid',
|
||||
optionType: 'button',
|
||||
},
|
||||
defaultValue: true,
|
||||
},
|
||||
{
|
||||
fieldName: 'storageVehicleType',
|
||||
label: '载具类型',
|
||||
rules: 'required',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
options: getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE),
|
||||
placeholder: '请选择载具类型',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleWidth',
|
||||
label: '载具宽度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
placeholder: '请输入载具宽度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleLong',
|
||||
label: '载具长度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
placeholder: '请输入载具长度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleHeight',
|
||||
label: '载具高度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
placeholder: '请输入载具高度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'weigth',
|
||||
label: '托盘重量',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
placeholder: '请输入托盘重量',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'overStructType',
|
||||
label: '载具是否超仓位',
|
||||
rules: 'required',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
options: getDictOptions(DICT_TYPE.WMS_OVER_STRUCT_TYPE),
|
||||
placeholder: '请选择载具是否超仓位',
|
||||
},
|
||||
defaultValue: '00'
|
||||
},
|
||||
{
|
||||
fieldName: 'occupyStructQty',
|
||||
label: '占仓位数',
|
||||
rules: 'required',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
placeholder: '请输入占仓位数',
|
||||
},
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
/** 列表的搜索表单 */
|
||||
export function useGridFormSchema(): VbenFormSchema[] {
|
||||
return [
|
||||
{
|
||||
fieldName: 'storageVehicleCode',
|
||||
label: '载具编码',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
placeholder: '请输入载具编码',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'storageVehicleName',
|
||||
label: '载具名称',
|
||||
component: 'Input',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
placeholder: '请输入载具名称',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'isUsed',
|
||||
label: '是否启用',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
options: [],
|
||||
placeholder: '请选择是否启用',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'storageVehicleType',
|
||||
label: '载具类型',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
options: getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE),
|
||||
placeholder: '请选择载具类型',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleWidth',
|
||||
label: '载具宽度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
allowClear: true,
|
||||
placeholder: '请输入载具宽度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleLong',
|
||||
label: '载具长度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
allowClear: true,
|
||||
placeholder: '请输入载具长度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'vehicleHeight',
|
||||
label: '载具高度',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
allowClear: true,
|
||||
placeholder: '请输入载具高度',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'weigth',
|
||||
label: '托盘重量',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
allowClear: true,
|
||||
placeholder: '请输入托盘重量',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'overStructType',
|
||||
label: '载具是否超仓位',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
allowClear: true,
|
||||
options: getDictOptions(DICT_TYPE.WMS_OVER_STRUCT_TYPE, 'boolean'),
|
||||
placeholder: '请选择载具是否超仓位',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'occupyStructQty',
|
||||
label: '占仓位数',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 0,
|
||||
allowClear: true,
|
||||
placeholder: '请输入占仓位数',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'createTime',
|
||||
label: '创建时间',
|
||||
component: 'RangePicker',
|
||||
componentProps: {
|
||||
...getRangePickerDefaultProps(),
|
||||
allowClear: true,
|
||||
},
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
/** 列表的字段 */
|
||||
export function useGridColumns(): VxeTableGridOptions<WmsStorageVehicleInfoApi.StorageVehicleInfo>['columns'] {
|
||||
return [
|
||||
{ type: 'checkbox', width: 40 },
|
||||
{
|
||||
field: 'storageVehicleCode',
|
||||
title: '载具编码',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'storageVehicleName',
|
||||
title: '载具名称',
|
||||
minWidth: 120,
|
||||
},
|
||||
// {
|
||||
// field: 'oneCode',
|
||||
// title: '一维码',
|
||||
// minWidth: 120,
|
||||
// },
|
||||
// {
|
||||
// field: 'twoCode',
|
||||
// title: '二维码',
|
||||
// minWidth: 120,
|
||||
// },
|
||||
{
|
||||
field: 'isUsed',
|
||||
title: '是否启用',
|
||||
minWidth: 120,
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.COMMON_TRUE_FALSE },
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'storageVehicleType',
|
||||
title: '载具类型',
|
||||
minWidth: 120,
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.WMS_VEHICLE_TYPE },
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'vehicleWidth',
|
||||
title: '载具宽度',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'vehicleLong',
|
||||
title: '载具长度',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'vehicleHeight',
|
||||
title: '载具高度',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'weigth',
|
||||
title: '托盘重量',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'overStructType',
|
||||
title: '载具是否超仓位',
|
||||
minWidth: 120,
|
||||
cellRender: {
|
||||
name: 'CellDict',
|
||||
props: { type: DICT_TYPE.WMS_OVER_STRUCT_TYPE },
|
||||
},
|
||||
},
|
||||
{
|
||||
field: 'occupyStructQty',
|
||||
title: '占仓位数',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'extId',
|
||||
title: '外部标识',
|
||||
minWidth: 120,
|
||||
},
|
||||
{
|
||||
field: 'createTime',
|
||||
title: '创建时间',
|
||||
minWidth: 120,
|
||||
formatter: 'formatDateTime',
|
||||
},
|
||||
{
|
||||
field: 'updateTime',
|
||||
title: '更新时间',
|
||||
minWidth: 120,
|
||||
formatter: 'formatDateTime',
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
width: 200,
|
||||
fixed: 'right',
|
||||
slots: { default: 'actions' },
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
@@ -0,0 +1,205 @@
|
||||
<script lang="ts" setup>
|
||||
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
|
||||
import type { WmsStorageVehicleInfoApi } from '#/api/wms/storagevehicleinfo';
|
||||
|
||||
import { ref } from 'vue';
|
||||
|
||||
import { confirm, Page, useVbenModal } from '@vben/common-ui';
|
||||
import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
|
||||
|
||||
import { message } from 'antdv-next';
|
||||
|
||||
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
|
||||
import {
|
||||
deleteStorageVehicleInfo,
|
||||
deleteStorageVehicleInfoList,
|
||||
exportStorageVehicleInfo,
|
||||
getStorageVehicleInfoPage,
|
||||
} from '#/api/wms/storagevehicleinfo';
|
||||
import { $t } from '#/locales';
|
||||
|
||||
import { useGridColumns, useGridFormSchema } from './data';
|
||||
import BatchForm from './modules/batch-form.vue';
|
||||
import Form from './modules/form.vue';
|
||||
|
||||
const [FormModal, formModalApi] = useVbenModal({
|
||||
connectedComponent: Form,
|
||||
destroyOnClose: true,
|
||||
});
|
||||
|
||||
const [BatchFormModal, batchFormModalApi] = useVbenModal({
|
||||
connectedComponent: BatchForm,
|
||||
destroyOnClose: true,
|
||||
});
|
||||
|
||||
/** 刷新表格 */
|
||||
function handleRefresh() {
|
||||
gridApi.query();
|
||||
}
|
||||
|
||||
/** 创建载具信息 */
|
||||
function handleCreate() {
|
||||
formModalApi.setData(null).open();
|
||||
}
|
||||
|
||||
/** 批量生成载具信息 */
|
||||
function handleBatchCreate() {
|
||||
batchFormModalApi.open();
|
||||
}
|
||||
|
||||
/** 编辑载具信息 */
|
||||
function handleEdit(row: WmsStorageVehicleInfoApi.StorageVehicleInfo) {
|
||||
formModalApi.setData(row).open();
|
||||
}
|
||||
|
||||
/** 删除载具信息 */
|
||||
async function handleDelete(row: WmsStorageVehicleInfoApi.StorageVehicleInfo) {
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deleting', [row.storageVehicleId]),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteStorageVehicleInfo(row.storageVehicleId!);
|
||||
message.success($t('ui.actionMessage.deleteSuccess', [row.storageVehicleId]));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
/** 批量删除载具信息 */
|
||||
async function handleDeleteBatch() {
|
||||
await confirm($t('ui.actionMessage.deleteBatchConfirm'));
|
||||
const hideLoading = message.loading({
|
||||
content: $t('ui.actionMessage.deletingBatch'),
|
||||
duration: 0,
|
||||
});
|
||||
try {
|
||||
await deleteStorageVehicleInfoList(checkedIds.value);
|
||||
checkedIds.value = [];
|
||||
message.success($t('ui.actionMessage.deleteSuccess'));
|
||||
handleRefresh();
|
||||
} finally {
|
||||
hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
const checkedIds = ref<number[]>([]);
|
||||
function handleRowCheckboxChange({
|
||||
records,
|
||||
}: {
|
||||
records: WmsStorageVehicleInfoApi.StorageVehicleInfo[];
|
||||
}) {
|
||||
checkedIds.value = records.map((item) => item.id!);
|
||||
}
|
||||
|
||||
/** 导出表格 */
|
||||
async function handleExport() {
|
||||
const data = await exportStorageVehicleInfo(await gridApi.formApi.getValues());
|
||||
downloadFileFromBlobPart({ fileName: '载具信息.xls', source: data });
|
||||
}
|
||||
|
||||
|
||||
const [Grid, gridApi] = useVbenVxeGrid({
|
||||
formOptions: {
|
||||
schema: useGridFormSchema(),
|
||||
},
|
||||
gridOptions: {
|
||||
columns: useGridColumns(),
|
||||
height: 'auto',
|
||||
keepSource: true,
|
||||
proxyConfig: {
|
||||
ajax: {
|
||||
query: async ({ page }, formValues) => {
|
||||
return await getStorageVehicleInfoPage({
|
||||
pageNo: page.currentPage,
|
||||
pageSize: page.pageSize,
|
||||
...formValues,
|
||||
});
|
||||
},
|
||||
},
|
||||
},
|
||||
rowConfig: {
|
||||
keyField: 'storageVehicleId',
|
||||
isHover: true,
|
||||
},
|
||||
toolbarConfig: {
|
||||
refresh: true,
|
||||
search: true,
|
||||
},
|
||||
} as VxeTableGridOptions<WmsStorageVehicleInfoApi.StorageVehicleInfo>,
|
||||
gridEvents: {
|
||||
checkboxAll: handleRowCheckboxChange,
|
||||
checkboxChange: handleRowCheckboxChange,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Page auto-content-height>
|
||||
<FormModal @success="handleRefresh" />
|
||||
<BatchFormModal @success="handleRefresh" />
|
||||
<Grid table-title="载具信息列表">
|
||||
<template #toolbar-tools>
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('ui.actionTitle.create', ['载具信息']),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.ADD,
|
||||
auth: ['wms:storage-vehicle-info:create'],
|
||||
onClick: handleCreate,
|
||||
},
|
||||
{
|
||||
label: '批量生成',
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.ADD,
|
||||
auth: ['wms:storage-vehicle-info:create'],
|
||||
onClick: handleBatchCreate,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.export'),
|
||||
type: 'primary',
|
||||
icon: ACTION_ICON.DOWNLOAD,
|
||||
auth: ['wms:storage-vehicle-info:export'],
|
||||
onClick: handleExport,
|
||||
},
|
||||
{
|
||||
label: $t('ui.actionTitle.deleteBatch'),
|
||||
type: 'primary',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:storage-vehicle-info:delete'],
|
||||
disabled: isEmpty(checkedIds),
|
||||
onClick: handleDeleteBatch,
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
<template #actions="{ row }">
|
||||
<TableAction
|
||||
:actions="[
|
||||
{
|
||||
label: $t('common.edit'),
|
||||
type: 'link',
|
||||
icon: ACTION_ICON.EDIT,
|
||||
auth: ['wms:storage-vehicle-info:update'],
|
||||
onClick: handleEdit.bind(null, row),
|
||||
},
|
||||
{
|
||||
label: $t('common.delete'),
|
||||
type: 'link',
|
||||
danger: true,
|
||||
icon: ACTION_ICON.DELETE,
|
||||
auth: ['wms:storage-vehicle-info:delete'],
|
||||
popConfirm: {
|
||||
title: $t('ui.actionMessage.deleteConfirm', [row.id]),
|
||||
confirm: handleDelete.bind(null, row),
|
||||
},
|
||||
},
|
||||
]"
|
||||
/>
|
||||
</template>
|
||||
</Grid>
|
||||
</Page>
|
||||
</template>
|
||||
@@ -0,0 +1,90 @@
|
||||
<script lang="ts" setup>
|
||||
import { computed, ref } from 'vue';
|
||||
|
||||
import { useVbenModal } from '@vben/common-ui';
|
||||
|
||||
import { message } from 'antdv-next';
|
||||
|
||||
import { useVbenForm } from '#/adapter/form';
|
||||
import { batchCreateStorageVehicleInfo } from '#/api/wms/storagevehicleinfo';
|
||||
import type { BatchCreateStorageVehicleInfoReqVO } from '#/api/wms/storagevehicleinfo';
|
||||
import { $t } from '#/locales';
|
||||
import {getDictOptions} from "@vben/hooks";
|
||||
import {DICT_TYPE} from "@vben/constants";
|
||||
|
||||
const emit = defineEmits(['success']);
|
||||
|
||||
const [Form, formApi] = useVbenForm({
|
||||
commonConfig: {
|
||||
componentProps: {
|
||||
class: 'w-full',
|
||||
},
|
||||
formItemClass: 'col-span-2',
|
||||
labelWidth: 100,
|
||||
},
|
||||
layout: 'horizontal',
|
||||
schema: [
|
||||
{
|
||||
fieldName: 'storageVehicleType',
|
||||
label: '载具类型',
|
||||
rules: 'required',
|
||||
component: 'Select',
|
||||
componentProps: {
|
||||
options: getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE),
|
||||
placeholder: '请选择载具类型',
|
||||
},
|
||||
},
|
||||
{
|
||||
fieldName: 'count',
|
||||
label: '生成数量',
|
||||
rules: 'required',
|
||||
component: 'InputNumber',
|
||||
componentProps: {
|
||||
class: '!w-full',
|
||||
min: 1,
|
||||
placeholder: '请输入生成数量',
|
||||
},
|
||||
defaultValue: 1,
|
||||
},
|
||||
],
|
||||
showDefaultActions: false,
|
||||
});
|
||||
|
||||
const [Modal, modalApi] = useVbenModal({
|
||||
async onConfirm() {
|
||||
const { valid } = await formApi.validate();
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
const formValues = await formApi.getValues();
|
||||
// 找到选中类型的 label
|
||||
const dictOptions = getDictOptions(DICT_TYPE.WMS_VEHICLE_TYPE);
|
||||
const selected = dictOptions.find((opt) => opt.value === formValues.storageVehicleType);
|
||||
const data: BatchCreateStorageVehicleInfoReqVO = {
|
||||
storageVehicleType: formValues.storageVehicleType,
|
||||
storageVehicleTypeLabel: selected?.label || formValues.storageVehicleType,
|
||||
count: formValues.count,
|
||||
};
|
||||
await batchCreateStorageVehicleInfo(data);
|
||||
await modalApi.close();
|
||||
emit('success');
|
||||
message.success($t('ui.actionMessage.operationSuccess'));
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
}
|
||||
},
|
||||
async onOpenChange(isOpen: boolean) {
|
||||
if (!isOpen) {
|
||||
return;
|
||||
}
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Modal title="批量生成载具信息">
|
||||
<Form class="mx-4" />
|
||||
</Modal>
|
||||
</template>
|
||||
@@ -0,0 +1,82 @@
|
||||
<script lang="ts" setup>
|
||||
import type { WmsStorageVehicleInfoApi } from '#/api/wms/storagevehicleinfo';
|
||||
|
||||
import { computed, ref } from 'vue';
|
||||
|
||||
import { useVbenModal } from '@vben/common-ui';
|
||||
|
||||
import { message } from 'antdv-next';
|
||||
|
||||
import { useVbenForm } from '#/adapter/form';
|
||||
import { createStorageVehicleInfo, getStorageVehicleInfo, updateStorageVehicleInfo } from '#/api/wms/storagevehicleinfo';
|
||||
import { $t } from '#/locales';
|
||||
|
||||
import { useFormSchema } from '../data';
|
||||
|
||||
const emit = defineEmits(['success']);
|
||||
const formData = ref<WmsStorageVehicleInfoApi.StorageVehicleInfo>();
|
||||
const getTitle = computed(() => {
|
||||
return formData.value?.storageVehicleId
|
||||
? $t('ui.actionTitle.edit', ['载具信息'])
|
||||
: $t('ui.actionTitle.create', ['载具信息']);
|
||||
});
|
||||
|
||||
const [Form, formApi] = useVbenForm({
|
||||
commonConfig: {
|
||||
componentProps: {
|
||||
class: 'w-full',
|
||||
},
|
||||
formItemClass: 'col-span-2',
|
||||
labelWidth: 80,
|
||||
},
|
||||
layout: 'horizontal',
|
||||
schema: useFormSchema(),
|
||||
showDefaultActions: false,
|
||||
});
|
||||
|
||||
const [Modal, modalApi] = useVbenModal({
|
||||
async onConfirm() {
|
||||
const { valid } = await formApi.validate();
|
||||
if (!valid) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
// 提交表单
|
||||
const data = (await formApi.getValues()) as WmsStorageVehicleInfoApi.StorageVehicleInfo;
|
||||
try {
|
||||
await (formData.value?.storageVehicleId ? updateStorageVehicleInfo(data) : createStorageVehicleInfo(data));
|
||||
// 关闭并提示
|
||||
await modalApi.close();
|
||||
emit('success');
|
||||
message.success($t('ui.actionMessage.operationSuccess'));
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
}
|
||||
},
|
||||
async onOpenChange(isOpen: boolean) {
|
||||
if (!isOpen) {
|
||||
formData.value = undefined;
|
||||
return;
|
||||
}
|
||||
// 加载数据
|
||||
const data = modalApi.getData<WmsStorageVehicleInfoApi.StorageVehicleInfo>();
|
||||
if (!data || !data.storageVehicleId) {
|
||||
return;
|
||||
}
|
||||
modalApi.lock();
|
||||
try {
|
||||
formData.value = await getStorageVehicleInfo(data.storageVehicleId);
|
||||
// 设置到 values
|
||||
await formApi.setValues(formData.value);
|
||||
} finally {
|
||||
modalApi.unlock();
|
||||
}
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Modal :title="getTitle">
|
||||
<Form class="mx-4" />
|
||||
</Modal>
|
||||
</template>
|
||||
@@ -21,7 +21,7 @@ function getClassTypeLabel(classType?: string): string {
|
||||
if (!classTypeLabelMap[classType]) {
|
||||
const dictOptions = getDictOptions(DICT_TYPE.WMS_STRATEGY_CLASS_TYPE);
|
||||
for (const opt of dictOptions) {
|
||||
classTypeLabelMap[opt.value] = opt.label;
|
||||
classTypeLabelMap[String(opt.value)] = opt.label;
|
||||
}
|
||||
}
|
||||
return classTypeLabelMap[classType] || classType;
|
||||
|
||||
@@ -285,6 +285,8 @@ const WMS_DICT = {
|
||||
WMS_LOCK_TYPE: 'wms_lock_type', // WMS 锁定类型
|
||||
WMS_STRATEGY_CLASS_TYPE: 'wms_strategy_class_type', // WMS 处理类类型
|
||||
WMS_GROUP_PLATE_STATUS: 'wms_group_plate_status', // 组盘记录
|
||||
WMS_VEHICLE_TYPE: 'wms_vehicle_type', // 载具类型
|
||||
WMS_OVER_STRUCT_TYPE: 'wms_over_struct_type', // 是否超限
|
||||
} as const;
|
||||
|
||||
/** ========== TASK - 任务管理模块 ========== */
|
||||
|
||||
Reference in New Issue
Block a user