新增MES模块,包含供应商、客户、车辆和地磅数据记录管理功能,支持免密接口和数据同步。更新相关控制器、实体、服务和数据库配置,优化权限管理和数据字典支持,确保系统的灵活性和可扩展性。

This commit is contained in:
geht
2026-04-30 15:28:20 +08:00
parent 142a0bdaba
commit b03cbeff9b
121 changed files with 10540 additions and 424 deletions

View File

@@ -0,0 +1,7 @@
import { defHttp } from '/@/utils/http/axios';
enum Api {
list = '/xslmes/mesXslClientConnection/list',
}
export const list = (params) => defHttp.get({ url: Api.list, params });

View File

@@ -0,0 +1,31 @@
import { BasicColumn, FormSchema } from '/@/components/Table';
export const columns: BasicColumn[] = [
{ title: '来源', align: 'center', dataIndex: 'source', width: 80 },
{ title: '平台', align: 'center', dataIndex: 'platform', width: 80 },
{ title: '登录名', align: 'center', dataIndex: 'userName', width: 120, ellipsis: true },
{ title: '姓名', align: 'center', dataIndex: 'realName', width: 100, ellipsis: true },
{ title: '主机名', align: 'center', dataIndex: 'hostName', width: 160, ellipsis: true },
{ title: '设备ID', align: 'center', dataIndex: 'deviceId', width: 200, ellipsis: true },
{ title: 'IP', align: 'center', dataIndex: 'ip', width: 140 },
{ title: '会话ID', align: 'center', dataIndex: 'sessionId', width: 200, ellipsis: true },
{ title: '连接时间', align: 'center', dataIndex: 'connectTime', width: 170 },
{ title: '最后活跃', align: 'center', dataIndex: 'lastSeen', width: 170 },
];
export const searchFormSchema: FormSchema[] = [
{
label: '类型',
field: 'type',
component: 'Select',
defaultValue: 'all',
componentProps: {
options: [
{ label: '全部', value: 'all' },
{ label: 'STOMP', value: 'stomp' },
{ label: 'HTTP', value: 'http' },
],
},
colProps: { span: 6 },
},
];

View File

@@ -0,0 +1,34 @@
<template>
<div>
<BasicTable @register="registerTable">
<template #tableTitle>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="reload">刷新</a-button>
</template>
</BasicTable>
</div>
</template>
<script lang="ts" name="xslmes-mesXslClientConnection" setup>
import { BasicTable } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, searchFormSchema } from './MesXslClientConnection.data';
import { list } from './MesXslClientConnection.api';
const { tableContext } = useListPage({
tableProps: {
title: '客户端连接列表',
api: list,
columns,
canResize: true,
showIndexColumn: true,
formConfig: {
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: false,
},
actionColumn: undefined,
},
});
const [registerTable, { reload }] = tableContext;
</script>

View File

@@ -0,0 +1,45 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
const { createConfirm } = useMessage();
enum Api {
list = '/xslmes/mesXslWeightRecord/list',
save = '/xslmes/mesXslWeightRecord/add',
edit = '/xslmes/mesXslWeightRecord/edit',
deleteOne = '/xslmes/mesXslWeightRecord/delete',
deleteBatch = '/xslmes/mesXslWeightRecord/deleteBatch',
importExcel = '/xslmes/mesXslWeightRecord/importExcel',
exportXls = '/xslmes/mesXslWeightRecord/exportXls',
}
export const getExportUrl = Api.exportXls;
export const getImportUrl = Api.importExcel;
export const list = (params) => defHttp.get({ url: Api.list, params });
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 });
};

View File

@@ -0,0 +1,124 @@
import { BasicColumn, FormSchema } from '/@/components/Table';
export const columns: BasicColumn[] = [
{ title: '榜单号', align: 'center', dataIndex: 'billNo', width: 200 },
{
title: '称重日期',
align: 'center',
dataIndex: 'weighDate',
width: 110,
customRender: ({ text }) => (!text ? '' : text.length > 10 ? text.substring(0, 10) : text),
},
{ title: '进出方向', align: 'center', dataIndex: 'inoutDirection_dictText', width: 90 },
{ title: '车号', align: 'center', dataIndex: 'plateNumber', width: 120 },
{ title: '发货单位', align: 'center', dataIndex: 'senderUnit', width: 160, ellipsis: true },
{ title: '收货单位', align: 'center', dataIndex: 'receiverUnit', width: 160, ellipsis: true },
{ title: '货物名称', align: 'center', dataIndex: 'goodsName', width: 140, ellipsis: true },
{ title: '毛重(KG)', align: 'center', dataIndex: 'grossWeight', width: 100 },
{ title: '皮重(KG)', align: 'center', dataIndex: 'tareWeight', width: 100 },
{ title: '净重(KG)', align: 'center', dataIndex: 'netWeight', width: 100 },
{ title: '司机', align: 'center', dataIndex: 'driverName', width: 90 },
{ title: '手机号', align: 'center', dataIndex: 'driverPhone', width: 120 },
];
export const searchFormSchema: FormSchema[] = [
{ label: '榜单号', field: 'billNo', component: 'JInput', colProps: { span: 6 } },
{
label: '进出方向',
field: 'inoutDirection',
component: 'JDictSelectTag',
componentProps: { dictCode: 'xslmes_inout_direction' },
colProps: { span: 6 },
},
{ label: '车号', field: 'plateNumber', component: 'JInput', colProps: { span: 6 } },
{ label: '称重日期', field: 'weighDate', component: 'RangePicker', componentProps: { valueFormat: 'YYYY-MM-DD' }, colProps: { span: 8 } },
];
export const formSchema: FormSchema[] = [
{ label: '', field: 'id', component: 'Input', show: false },
{ label: '', field: 'vehicleId', component: 'Input', show: false },
{
label: '榜单号',
field: 'billNo',
component: 'Input',
componentProps: { disabled: true, placeholder: '保存后自动生成' },
},
{
label: '称重日期',
field: 'weighDate',
required: true,
component: 'DatePicker',
componentProps: { showTime: false, valueFormat: 'YYYY-MM-DD', placeholder: '请选择称重日期' },
},
{
label: '进出方向',
field: 'inoutDirection',
required: true,
component: 'Input',
slot: 'directionPicker',
defaultValue: '1',
},
{
label: '车号',
field: 'plateNumber',
component: 'Input',
slot: 'vehiclePicker',
},
{
label: '发货单位',
field: 'senderUnit',
component: 'Input',
componentProps: { placeholder: '进厂时自动带出供应商名称' },
},
{
label: '收货单位',
field: 'receiverUnit',
component: 'Input',
componentProps: { placeholder: '出厂时自动带出客户简称' },
},
{
label: '货物名称',
field: 'goodsName',
component: 'Input',
componentProps: { placeholder: '请输入货物名称' },
},
{
label: '毛重(KG)',
field: 'grossWeight',
component: 'Input',
slot: 'grossWeightInput',
},
{
label: '皮重(KG)',
field: 'tareWeight',
component: 'InputNumber',
componentProps: { disabled: true, min: 0, precision: 2, placeholder: '选车辆后自动带出', style: { width: '100%' } },
},
{
label: '净重(KG)',
field: 'netWeight',
component: 'InputNumber',
componentProps: { disabled: true, min: 0, precision: 2, placeholder: '自动计算(毛重-皮重)', style: { width: '100%' } },
},
{
label: '司机',
field: 'driverName',
component: 'Input',
componentProps: { placeholder: '选车辆后自动带出' },
},
{
label: '手机号',
field: 'driverPhone',
component: 'Input',
componentProps: { placeholder: '选车辆后自动带出' },
},
];
export const superQuerySchema = {
billNo: { title: '榜单号', order: 0, view: 'text' },
inoutDirection: { title: '进出方向', order: 1, view: 'list', dictCode: 'xslmes_inout_direction' },
plateNumber: { title: '车号', order: 2, view: 'text' },
weighDate: { title: '称重日期', order: 3, view: 'date' },
grossWeight: { title: '毛重(KG)', order: 4, view: 'number' },
netWeight: { title: '净重(KG)', order: 5, view: 'number' },
};

View File

@@ -0,0 +1,139 @@
<template>
<div>
<BasicTable @register="registerTable" :rowSelection="rowSelection">
<template #tableTitle>
<a-button type="primary" v-auth="'xslmes:mes_xsl_weight_record:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="'xslmes:mes_xsl_weight_record:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<j-upload-button type="primary" v-auth="'xslmes:mes_xsl_weight_record: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_weight_record: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>
<MesXslWeightRecordModal @register="registerModal" @success="handleSuccess" />
</div>
</template>
<script lang="ts" name="xslmes-mesXslWeightRecord" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useModal } from '/@/components/Modal';
import { useListPage } from '/@/hooks/system/useListPage';
import MesXslWeightRecordModal from './components/MesXslWeightRecordModal.vue';
import { columns, searchFormSchema, superQuerySchema } from './MesXslWeightRecord.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './MesXslWeightRecord.api';
const queryParam = reactive<any>({});
const checkedKeys = ref<Array<string | number>>([]);
const [registerModal, { openModal }] = useModal();
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '地磅数据记录',
api: list,
columns,
canResize: true,
formConfig: {
schemas: searchFormSchema,
autoSubmitOnEnter: true,
showAdvancedButton: true,
fieldMapToTime: [
['weighDate', ['weighDate_begin', 'weighDate_end'], 'YYYY-MM-DD'],
],
},
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: (params) => Object.assign(params, queryParam),
},
exportConfig: {
name: '地磅数据记录',
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess,
},
});
const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
const superQueryConfig = reactive(superQuerySchema);
function handleSuperQuery(params) {
Object.keys(params).forEach((k) => (queryParam[k] = params[k]));
reload();
}
function handleAdd() {
openModal(true, { isUpdate: false, showFooter: true });
}
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);
}
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
function getTableAction(record) {
return [
{
label: '编辑',
onClick: handleEdit.bind(null, record),
auth: 'xslmes:mes_xsl_weight_record:edit',
},
];
}
function getDropDownAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '删除',
popConfirm: {
title: '是否确认删除',
confirm: handleDelete.bind(null, record),
placement: 'topLeft',
},
auth: 'xslmes:mes_xsl_weight_record:delete',
},
];
}
</script>
<style lang="less" scoped>
:deep(.ant-picker-range) {
width: 100%;
}
</style>

View File

@@ -0,0 +1,65 @@
<template>
<BasicModal v-bind="$attrs" title="选择车辆" :width="920" @register="registerModal" @ok="handleOk">
<BasicTable @register="registerTable" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref } from 'vue';
import { BasicModal, useModalInner } from '/@/components/Modal';
import { BasicTable, useTable } from '/@/components/Table';
import { list as vehicleList } from '/@/views/xslmes/mesXslVehicle/MesXslVehicle.api';
const emit = defineEmits(['register', 'select']);
const selectedRow = ref<Recordable | null>(null);
const currentVehicleBelong = ref<string>('');
const [registerTable, { reload, clearSelectedRowKeys }] = useTable({
api: (params) => vehicleList({ ...params, vehicleBelong: currentVehicleBelong.value, status: '0' }),
columns: [
{ title: '车牌号', dataIndex: 'plateNumber', width: 120 },
{ title: '皮重(KG)', dataIndex: 'tareWeightKg', width: 100 },
{ title: '供应商名称', dataIndex: 'supplierName', width: 160, ellipsis: true },
{ title: '供应商简称', dataIndex: 'supplierShortName', width: 120 },
{ title: '客户简称', dataIndex: 'customerShortName', width: 140, ellipsis: true },
{ title: '司机', dataIndex: 'driverName', width: 90 },
{ title: '手机号', dataIndex: 'driverPhone', width: 120 },
],
rowKey: 'id',
useSearchForm: true,
formConfig: {
labelWidth: 80,
schemas: [
{ label: '车牌号', field: 'plateNumber', component: 'Input', colProps: { span: 8 } },
],
},
pagination: { pageSize: 10 },
canResize: false,
showIndexColumn: false,
immediate: false,
rowSelection: {
type: 'radio',
columnWidth: 48,
onChange: (_keys, rows) => {
selectedRow.value = rows?.[0] ?? null;
},
},
clickToRowSelect: true,
});
const [registerModal, { setModalProps }] = useModalInner((data) => {
selectedRow.value = null;
currentVehicleBelong.value = data?.vehicleBelong ?? '';
clearSelectedRowKeys();
reload();
});
function handleOk() {
if (!selectedRow.value) {
return;
}
emit('select', { ...selectedRow.value });
setModalProps({ open: false });
}
</script>

View File

@@ -0,0 +1,192 @@
<template>
<BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="900" @ok="handleSubmit">
<BasicForm @register="registerForm" name="MesXslWeightRecordForm">
<!-- 进出方向JDictSelectTag 带切换联动 -->
<template #directionPicker="{ model, field }">
<JDictSelectTag
v-model:value="model[field]"
dictCode="xslmes_inout_direction"
placeholder="请选择进出方向"
:disabled="isDetail"
@update:value="(v) => onDirectionChange(model, v)"
/>
</template>
<!-- 车号弹出选择车辆带出相关字段 -->
<template #vehiclePicker="{ model, field }">
<a-input-group compact style="display: flex; width: 100%">
<a-input v-model:value="model[field]" read-only placeholder="请先选择进出方向,再选择车辆" style="flex: 1" :disabled="isDetail" />
<a-button type="primary" :disabled="isDetail" @click="openVehicleSelect(model)">选择车辆</a-button>
<a-button v-if="model.vehicleId" :disabled="isDetail" @click="clearVehicle(model)">清除</a-button>
</a-input-group>
</template>
<!-- 毛重输入变化时自动更新净重 -->
<template #grossWeightInput="{ model, field }">
<a-input-number
v-model:value="model[field]"
:min="0"
:precision="2"
:disabled="isDetail"
placeholder="请输入毛重"
style="width: 100%"
@change="(val) => onGrossWeightChange(val, model)"
/>
</template>
</BasicForm>
<MesXslVehicleSelectModal @register="registerVehicleModal" @select="onVehicleSelect" />
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, computed, unref } from 'vue';
import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
import { BasicForm, useForm } from '/@/components/Form/index';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { useMessage } from '/@/hooks/web/useMessage';
import { formSchema } from '../MesXslWeightRecord.data';
import { saveOrUpdate } from '../MesXslWeightRecord.api';
import MesXslVehicleSelectModal from './MesXslVehicleSelectModal.vue';
const { createMessage } = useMessage();
const emit = defineEmits(['register', 'success']);
const isUpdate = ref(true);
const isDetail = ref(false);
const [registerVehicleModal, { openModal: openVehicleModal }] = useModal();
const [registerForm, { setProps, resetFields, setFieldsValue, validate, scrollToField, getFieldsValue }] = useForm({
labelWidth: 120,
schemas: formSchema,
showActionButtonGroup: false,
baseColProps: { span: 12 },
});
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 });
}
setProps({ disabled: !data?.showFooter });
});
const title = computed(() => (!unref(isUpdate) ? '新增' : unref(isDetail) ? '详情' : '编辑'));
/** 进出方向切换:清空车辆及关联字段 */
function onDirectionChange(model: Recordable, val: unknown) {
const v = val != null ? String(val) : '';
if (!v) return;
clearVehicleFields(model);
}
/** 选择车辆弹窗vehicleBelong=2(供应商)对应进厂,=1(客户)对应出厂 */
function openVehicleSelect(model: Recordable) {
const direction = model.inoutDirection;
if (!direction) {
createMessage.warning('请先选择进出方向');
return;
}
// 进厂(1)→供应商车辆(vehicleBelong=2);出厂(2)→客户车辆(vehicleBelong=1)
const vehicleBelong = direction === '1' ? '2' : '1';
openVehicleModal(true, { vehicleBelong });
}
/** 车辆选中回调:填充相关字段 */
function onVehicleSelect(vehicle: Recordable) {
const values = getFieldsValue() as Recordable;
const direction = values.inoutDirection;
const patch: Recordable = {
vehicleId: vehicle.id,
plateNumber: vehicle.plateNumber ?? '',
tareWeight: vehicle.tareWeightKg ?? null,
driverName: vehicle.driverName ?? '',
driverPhone: vehicle.driverPhone ?? '',
};
// 进厂(1)→发货单位=供应商;出厂(2)→收货单位=客户
if (direction === '1') {
patch.senderUnit = vehicle.supplierName ?? vehicle.supplierShortName ?? '';
patch.receiverUnit = '';
} else if (direction === '2') {
patch.receiverUnit = vehicle.customerShortName ?? '';
patch.senderUnit = '';
}
// 重新计算净重
const gross = values.grossWeight ?? null;
const tare = patch.tareWeight;
if (gross != null && tare != null) {
const net = Number(gross) - Number(tare);
patch.netWeight = net >= 0 ? net : 0;
}
setFieldsValue(patch);
}
/** 清除车辆信息 */
function clearVehicle(model: Recordable) {
clearVehicleFields(model);
setFieldsValue({
vehicleId: '',
plateNumber: '',
senderUnit: '',
receiverUnit: '',
tareWeight: null,
netWeight: null,
driverName: '',
driverPhone: '',
});
}
function clearVehicleFields(model: Recordable) {
model.vehicleId = '';
model.plateNumber = '';
model.senderUnit = '';
model.receiverUnit = '';
model.tareWeight = null;
model.netWeight = null;
model.driverName = '';
model.driverPhone = '';
}
/** 毛重变化:重新计算净重 */
function onGrossWeightChange(val: number | null, model: Recordable) {
const gross = val ?? 0;
const tare = model.tareWeight ?? 0;
const net = gross - tare;
setFieldsValue({ netWeight: net >= 0 ? net : 0 });
}
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>
<style lang="less" scoped>
:deep(.ant-input-number) {
width: 100%;
}
</style>