chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增MES库区管理功能，包含免密接口、数据处理逻辑及相关控制器、服务和实体的实现。支持库区的增删改查操作，优化用户体验并增强系统的实时数据同步能力。

Browse Source
This commit is contained in:
geht
2026-05-12 14:06:07 +08:00
parent cffe32d896
commit b737dddb2a
74 changed files with 4937 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
jeecgboot-vue3/src/views/xslmes/mesXslWarehouseArea/MesXslWarehouseArea.api.ts Normal file
View File

@@ -0,0 +1,71 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
const { createConfirm } = useMessage();
enum Api {
list = '/xslmes/mesXslWarehouseArea/list',
checkAreaCode = '/xslmes/mesXslWarehouseArea/checkAreaCode',
queryById = '/xslmes/mesXslWarehouseArea/queryById',
save = '/xslmes/mesXslWarehouseArea/add',
edit = '/xslmes/mesXslWarehouseArea/edit',
updateStatus = '/xslmes/mesXslWarehouseArea/updateStatus',
deleteOne = '/xslmes/mesXslWarehouseArea/delete',
deleteBatch = '/xslmes/mesXslWarehouseArea/deleteBatch',
importExcel = '/xslmes/mesXslWarehouseArea/importExcel',
exportXls = '/xslmes/mesXslWarehouseArea/exportXls',
batchAdd = '/xslmes/mesXslWarehouseArea/batchAdd',
}
export const getExportUrl = Api.exportXls;
export const getImportUrl = Api.importExcel;
export const list = (params) => defHttp.get({ url: Api.list, params });
export const queryById = (params: { id: string }) => defHttp.get({ url: Api.queryById, params });
/** 库区编码唯一性校验（同租户；编辑传 dataId） */
export const checkAreaCode = (params: { areaCode: string; dataId?: string }) =>
defHttp.get(
{ url: Api.checkAreaCode, params },
{
successMessageMode: 'none',
errorMessageMode: 'none',
}
);
export const deleteOne = (params, handleSuccess) => {
return defHttp.delete({ url: Api.deleteOne, params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
};
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({ url: Api.deleteBatch, data: params }, { joinParamsToUrl: true }).then(() => {
handleSuccess();
});
},
});
};
export const saveOrUpdate = (params, isUpdate) => {
const url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url, params });
};
/** 批量添加库区（同一仓库下一次性创建多条） */
export const batchAddAreas = (params: any[]) => defHttp.post({ url: Api.batchAdd, params });
/** 启用/停用：status 0 启用 1 停用（字典 xslmes_unit_status） */
export const updateStatus = (params: { id: string; status: string }, handleSuccess?: () => void) => {
return defHttp.post({ url: Api.updateStatus, params }, { joinParamsToUrl: true }).then(() => {
handleSuccess?.();
});
};

131
jeecgboot-vue3/src/views/xslmes/mesXslWarehouseArea/MesXslWarehouseArea.data.ts Normal file
View File

@@ -0,0 +1,131 @@
import { BasicColumn, FormSchema } from '/@/components/Table';
import { checkAreaCode } from './MesXslWarehouseArea.api';
export const columns: BasicColumn[] = [
{ title: 'ID', align: 'center', dataIndex: 'id', width: 280, ellipsis: true, defaultHidden: true },
{ title: '库区编码', align: 'center', dataIndex: 'areaCode', width: 120 },
{ title: '库区名称', align: 'center', dataIndex: 'areaName', width: 160 },
{ title: '所属仓库', align: 'center', dataIndex: 'warehouseName', width: 160 },
{ title: '仓库分类', align: 'center', dataIndex: 'warehouseCategory_dictText', width: 140 },
{ title: '最大存放量', align: 'center', dataIndex: 'maxCapacity', width: 110 },
{ title: '实际存放量', align: 'center', dataIndex: 'actualCapacity', width: 110 },
{ title: '状态', align: 'center', dataIndex: 'status_dictText', width: 90 },
{ title: '备注', align: 'center', dataIndex: 'remark', width: 200, ellipsis: true },
{ title: '创建人', align: 'center', dataIndex: 'createBy', width: 100 },
{
title: '创建时间',
align: 'center',
dataIndex: 'createTime',
width: 165,
customRender: ({ text }) => (!text ? '' : String(text).length > 19 ? String(text).substring(0, 19) : text),
},
{ title: '租户ID', align: 'center', dataIndex: 'tenantId', width: 90, defaultHidden: true },
];
export const searchFormSchema: FormSchema[] = [
{ label: '库区编码', field: 'areaCode', component: 'JInput', colProps: { span: 6 } },
{ label: '库区名称', field: 'areaName', component: 'JInput', colProps: { span: 6 } },
{
label: '所属仓库',
field: 'warehouseId',
component: 'JSearchSelect',
componentProps: { dict: 'mes_xsl_warehouse,warehouse_name,id', async: true, placeholder: '请搜索仓库' },
colProps: { span: 6 },
},
{
label: '状态',
field: 'status',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_unit_status' },
colProps: { span: 6 },
},
];
export const formSchema: FormSchema[] = [
{ label: '', field: 'id', component: 'Input', show: false },
{ label: '', field: 'warehouseName', component: 'Input', show: false },
{
label: '库区编码',
field: 'areaCode',
required: true,
component: 'Input',
componentProps: { placeholder: '同租户内唯一，不可与已有库区重复' },
dynamicRules: ({ model }) => [
{ required: true, message: '请输入库区编码' },
{
validator: async (_rule, value) => {
const v = value == null ? '' : String(value).trim();
if (!v) return Promise.resolve();
try {
await checkAreaCode({ areaCode: v, dataId: model?.id });
return Promise.resolve();
} catch (e: any) {
const msg = e?.response?.data?.message || e?.message || '该库区编码已存在';
return Promise.reject(msg);
}
},
trigger: 'blur',
},
],
},
{
label: '库区名称',
field: 'areaName',
required: true,
component: 'Input',
componentProps: { placeholder: '请输入库区名称' },
},
{
label: '所属仓库',
field: 'warehouseId',
required: true,
component: 'Input',
slot: 'warehousePicker',
},
{
label: '仓库分类',
field: 'warehouseCategory',
component: 'JDictSelectTag',
componentProps: { dictCode: 'sys_category,name,id', disabled: true, placeholder: '选择仓库后自动带出' },
},
{
label: '最大存放量',
field: 'maxCapacity',
component: 'InputNumber',
componentProps: { placeholder: '请输入最大存放量', style: { width: '100%' }, min: 0 },
},
{
label: '实际存放量',
field: 'actualCapacity',
component: 'InputNumber',
componentProps: { placeholder: '请输入实际存放量', style: { width: '100%' }, min: 0 },
},
{
label: '备注',
field: 'remark',
component: 'InputTextArea',
componentProps: { placeholder: '请输入备注', rows: 3 },
},
{
label: '状态',
field: 'status',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_unit_status', placeholder: '请选择状态' },
},
{
label: '租户ID',
field: 'tenantId',
component: 'InputNumber',
componentProps: { placeholder: '租户ID，可空', style: { width: '100%' } },
},
];
export const superQuerySchema = {
areaCode: { title: '库区编码', order: 0, view: 'text' },
areaName: { title: '库区名称', order: 1, view: 'text' },
warehouseName: { title: '所属仓库', order: 2, view: 'text' },
warehouseCategory: { title: '仓库分类', order: 3, view: 'list', dictCode: 'sys_category,name,id' },
status: { title: '状态', order: 4, view: 'list', dictCode: 'xslmes_unit_status' },
maxCapacity: { title: '最大存放量', order: 5, view: 'number' },
actualCapacity: { title: '实际存放量', order: 6, view: 'number' },
};

146
jeecgboot-vue3/src/views/xslmes/mesXslWarehouseArea/MesXslWarehouseAreaList.vue Normal file
View File

@@ -0,0 +1,146 @@
<template>
<div>
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<template #tableTitle>
<a-button type="primary" v-auth="'xslmes:mes_xsl_warehouse_area:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'xslmes:mes_xsl_warehouse_area:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'xslmes:mes_xsl_warehouse_area:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
<a-menu-item key="1" @click="batchHandleDelete">
<Icon icon="ant-design:delete-outlined" />
删除
</a-menu-item>
</a-menu>
</template>
<a-button v-auth="'xslmes:mes_xsl_warehouse_area:deleteBatch'">
批量操作
<Icon icon="mdi:chevron-down" />
</a-button>
</a-dropdown>
<super-query :config="superQueryConfig" @search="handleSuperQuery" />
</template>
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
</BasicTable>
<MesXslWarehouseAreaModal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="xslmes-mesXslWarehouseArea" setup>
import { reactive } from 'vue';
import { BasicTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import MesXslWarehouseAreaModal from './components/MesXslWarehouseAreaModal.vue';
import { columns, searchFormSchema, superQuerySchema } from './MesXslWarehouseArea.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, updateStatus } from './MesXslWarehouseArea.api';
import Icon from '/@/components/Icon';
import type { Recordable } from '/@/types/global';
const [registerModal, { openModal }] = useModal();
const { tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '库区管理',
api: list,
columns,
canResize: true,
formConfig: {
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
},
actionColumn: {
width: 260,
fixed: 'right',
},
},
exportConfig: {
name: '库区管理',
url: getExportUrl,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
const superQueryConfig = reactive(superQuerySchema);
function handleAdd() {
openModal(true, { isUpdate: false, showFooter: true, record: {} });
}
function handleEdit(record: Recordable) {
openModal(true, { record, isUpdate: true, showFooter: true });
}
function handleDetail(record: Recordable) {
openModal(true, { record, isUpdate: true, showFooter: false });
}
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
function isRecordEnabled(record: Recordable) {
return record.status === '0' || record.status === 0;
}
async function handleToggleStatus(record: Recordable, status: string) {
await updateStatus({ id: record.id, status }, handleSuccess);
}
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
function handleSuccess() {
selectedRowKeys.value = [];
reload();
}
function handleSuperQuery(params) {
Object.assign({}, params);
reload();
}
function getTableAction(record) {
const enabled = isRecordEnabled(record);
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'xslmes:mes_xsl_warehouse_area:edit',
},
{
label: '启用',
ifShow: !enabled,
onClick: handleToggleStatus.bind(null, record, '0'),
auth: 'xslmes:mes_xsl_warehouse_area:updateStatus',
},
{
label: '停用',
ifShow: enabled,
onClick: handleToggleStatus.bind(null, record, '1'),
auth: 'xslmes:mes_xsl_warehouse_area:updateStatus',
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
},
auth: 'xslmes:mes_xsl_warehouse_area:delete',
},
];
}
function getDropDownAction(record) {
return [{ label: '详情', onClick: handleDetail.bind(null, record) }];
}
</script>

94
jeecgboot-vue3/src/views/xslmes/mesXslWarehouseArea/components/MesXslWarehouseAreaModal.vue Normal file
View File

@@ -0,0 +1,94 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="680" @ok="handleSubmit">
<BasicForm @register="registerForm">
<template #warehousePicker="{ model, field }">
<JSearchSelect
v-model:value="model[field]"
dict="mes_xsl_warehouse,warehouse_name,id"
:async="true"
placeholder="请搜索并选择仓库"
:disabled="isDetail"
@change="(v) => onWarehouseChange(model, v)"
/>
</template>
</BasicForm>
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, computed, unref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicForm, useForm, JSearchSelect } from '/@/components/Form';
import { formSchema } from '../MesXslWarehouseArea.data';
import { saveOrUpdate } from '../MesXslWarehouseArea.api';
import { defHttp } from '/@/utils/http/axios';
const emit = defineEmits(['register', 'success']);
const isUpdate = ref(true);
const isDetail = ref(false);
const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField }] = useForm({
labelWidth: 120,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 24 },
});
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
await resetFields();
setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
isUpdate.value = !!data?.isUpdate;
isDetail.value = !data?.showFooter;
if (unref(isUpdate)) {
await setFieldsValue({ ...data.record });
} else {
await setFieldsValue({ status: '0' });
}
setProps({ disabled: !data?.showFooter });
});
const title = computed(() => (!unref(isUpdate) ? '新增库区' : unref(isDetail) ? '库区详情' : '编辑库区'));
async function onWarehouseChange(model: any, val: unknown) {
const id = val != null && val !== '' ? String(val) : '';
if (!id) {
model.warehouseName = '';
await setFieldsValue({ warehouseName: '', warehouseCategory: undefined });
return;
}
try {
const wh = await defHttp.get({ url: '/xslmes/mesXslWarehouse/queryById', params: { id } });
if (wh) {
await setFieldsValue({
warehouseName: wh.warehouseName || '',
warehouseCategory: wh.warehouseCategory || undefined,
});
}
} catch {
// ignore
}
}
async function handleSubmit() {
try {
const values = await validate();
setModalProps({ confirmLoading: true });
await saveOrUpdate(values, unref(isUpdate));
closeModal();
emit('success');
} catch (e: any) {
if (e?.errorFields) {
const firstField = e.errorFields[0];
if (firstField) {
scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(e);
} finally {
setModalProps({ confirmLoading: false });
}
}
</script>