库区增加序号

chen.lin

10 小时以前 bb69d7a4bdfbb90cde19b3d828f490ab10f2bb43

库区增加序号

 rsf-admin/src/i18n/en.js

@@ -428,6 +428,7 @@
                name: "name",
                wareId: "ware",
                code: "code",
                sort: "Sort",
                shipperId: "shipperId",
                supplierId: "supplierId",
                flagMinus: "flagMinus",

 rsf-admin/src/i18n/zh.js

@@ -458,6 +458,7 @@
                type: "库区类型",
                wareId: "所属仓库",
                code: "库区编码",
                sort: "序号",
                shipperId: "货主",
                supplierId: "供应商",
                flagMinus: "允许负库存",

 rsf-admin/src/page/basicInfo/basContainer/BasContainerCreate.jsx

@@ -103,7 +103,7 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceArrayInput source="areas" reference="warehouseAreas">
                                    <ReferenceArrayInput source="areas" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                        <SelectArrayInput
                                            label="table.field.basStation.crossZoneArea"
                                            optionText="name"

 rsf-admin/src/page/basicInfo/basContainer/BasContainerEdit.jsx

@@ -131,7 +131,7 @@
                            <ReferenceArrayInput 
                                source="areas" 
                                reference="warehouseAreas"
                                sort={{ field: 'name', order: 'ASC' }}
                                sort={{ field: 'sort', order: 'ASC' }}
                                format={(value) => {
                                    // 从后端接收时：将 [{id, sort}] 转换为 [id, id, ...]
                                    if (!value || !Array.isArray(value)) return [];

 rsf-admin/src/page/basicInfo/basStation/BasStationCreate.jsx

@@ -148,7 +148,7 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceInput source="area" reference="warehouseAreas">
                                    <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                        <SelectInput
                                            label="table.field.basStation.area"
                                            optionText="name"
@@ -170,7 +170,7 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <ReferenceArrayInput source="areaIds" reference="warehouseAreas">
                                    <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                        <SelectArrayInput
                                            label="table.field.basStation.crossZoneArea"
                                            optionText="name"

 rsf-admin/src/page/basicInfo/basStation/BasStationEdit.jsx

@@ -122,7 +122,7 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>                            
                            <ReferenceInput source="area" reference="warehouseAreas">
                            <ReferenceInput source="area" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                <SelectInput 
                                    label="table.field.basStation.area"
                                    optionText="name"
@@ -144,7 +144,7 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}> 
                            <ReferenceArrayInput source="areaIds" reference="warehouseAreas">
                            <ReferenceArrayInput source="areaIds" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                <SelectArrayInput 
                                    label="table.field.basStation.crossZoneArea"
                                    optionText="name"

 rsf-admin/src/page/basicInfo/deviceSite/InitModal.jsx

@@ -160,12 +160,12 @@
                                />
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput source="areaIdStart" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                                <ReferenceInput source="areaIdStart" label="table.field.deviceBind.typeId" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }} filter={{}}>
                                    <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdStart')} />
                                </ReferenceInput>
                            </Grid>
                            <Grid item xs={6} display="flex" gap={1}>
                                <ReferenceInput source="areaIdEnd" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                                <ReferenceInput source="areaIdEnd" label="table.field.deviceBind.typeId" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }} filter={{}}>
                                    <AutocompleteInput optionValue="id" optionText="name" label={translate('table.field.deviceSite.areaIdEnd')} />
                                </ReferenceInput>
                            </Grid>

 rsf-admin/src/page/basicInfo/loc/BatchModal.jsx

@@ -155,6 +155,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                    >
                                        <AutocompleteInput
                                            label="table.field.loc.areaId"

 rsf-admin/src/page/basicInfo/loc/InitModal.jsx

@@ -138,6 +138,7 @@
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                    sort={{ field: 'sort', order: 'ASC' }}
                                    filter={{ warehouseId: formData.warehouseId }}
                                >
                                    <AutocompleteInput

 rsf-admin/src/page/basicInfo/loc/LocCreate.jsx

@@ -112,6 +112,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                        filter={{ warehouseId }}
                                    >
                                        <AutocompleteInput

 rsf-admin/src/page/basicInfo/loc/LocEdit.jsx

@@ -104,6 +104,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                        filter={{ warehouseId }}
                                    >
                                        <AutocompleteInput

 rsf-admin/src/page/basicInfo/loc/LocList.jsx

@@ -109,6 +109,7 @@
            source="areaId"
            label="table.field.loc.areaId"
            reference="warehouseAreas"
            sort={{ field: 'sort', order: 'ASC' }}
        >
            <AutocompleteInput
                label="table.field.loc.areaId"

 rsf-admin/src/page/basicInfo/locArea/LocAreaCreate.jsx

@@ -104,6 +104,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                    >
                                        <AutocompleteInput
                                            label="table.field.locArea.areaId"

 rsf-admin/src/page/basicInfo/locArea/LocAreaEdit.jsx

@@ -84,6 +84,7 @@
                            <ReferenceInput
                                source="areaId"
                                reference="warehouseAreas"
                                sort={{ field: 'sort', order: 'ASC' }}
                            >
                                <AutocompleteInput
                                    label="table.field.locArea.areaId"

 rsf-admin/src/page/basicInfo/locAreaMat/BindLocModal.jsx

@@ -159,6 +159,7 @@
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                    sort={{ field: 'sort', order: 'ASC' }}
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.areaId"

 rsf-admin/src/page/basicInfo/locAreaMat/BindMatnrModal.jsx

@@ -158,6 +158,7 @@
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                    sort={{ field: 'sort', order: 'ASC' }}
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.areaId"

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatCreate.jsx

@@ -124,6 +124,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                        filter={{ warehouseId }}
                                    >
                                        <AutocompleteInput

 rsf-admin/src/page/basicInfo/locAreaMat/LocAreaMatEdit.jsx

@@ -102,6 +102,7 @@
                            <ReferenceInput
                                source="areaId"
                                reference="warehouseAreas"
                                sort={{ field: 'sort', order: 'ASC' }}
                                filter={{ warehouseId }}
                            >
                                <AutocompleteInput

 rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaCreate.jsx

@@ -90,6 +90,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                    >
                                        <AutocompleteInput
                                            label="table.field.locAreaMatRela.areaId"

 rsf-admin/src/page/basicInfo/locAreaMatRela/LocAreaMatRelaEdit.jsx

@@ -70,6 +70,7 @@
                            <ReferenceInput
                                source="areaId"
                                reference="warehouseAreas"
                                sort={{ field: 'sort', order: 'ASC' }}
                            >
                                <AutocompleteInput
                                    label="table.field.locAreaMatRela.areaId"

 rsf-admin/src/page/basicInfo/matnr/BindModal.jsx

@@ -159,6 +159,7 @@
                                <ReferenceInput
                                    source="areaId"
                                    reference="warehouseAreas"
                                    sort={{ field: 'sort', order: 'ASC' }}
                                >
                                    <AutocompleteInput
                                        label="table.field.loc.areaId"

 rsf-admin/src/page/components/AreasSortInput.jsx

@@ -72,14 +72,21 @@
                    .map(id => Number(id))
                    .filter(id => !existingIds.has(id));
                
                // 为新增的ID创建排序项（默认排序为已有最大排序值+1）
                // 为新增的ID创建排序项（默认排序从库区的 sort 字段获取，如果没有则使用已有最大排序值+1）
                const maxSort = existingAreas.length > 0 
                    ? Math.max(...existingAreas.map(item => item.sort || 1), 0)
                    : 0;
                const newItems = newIds.map((id, index) => ({
                    id: id,
                    sort: maxSort + index + 1,
                }));
                const newItems = newIds.map((id, index) => {
                    // 从 areas 数组中查找对应库区的 sort 字段
                    const area = areas.find(a => a.id === id);
                    const defaultSort = area && area.sort !== undefined && area.sort !== null 
                        ? area.sort 
                        : (maxSort + index + 1);
                    return {
                        id: id,
                        sort: defaultSort,
                    };
                });
                
                // 合并已有项和新项
                const converted = [...existingAreas, ...newItems];

 rsf-admin/src/page/deviceBind/DeviceBindCreate.jsx

@@ -129,7 +129,7 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>                                    
                                    <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                                    <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }} filter={{}}>
                                        <AutocompleteInput optionValue="id" optionText="name" label="table.field.deviceBind.typeId" />
                                    </ReferenceInput>
                                </Grid>

 rsf-admin/src/page/deviceBind/DeviceBindEdit.jsx

@@ -108,7 +108,7 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" filter={{}}>
                            <ReferenceInput source="typeId" label="table.field.deviceBind.typeId" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }} filter={{}}>
                                <AutocompleteInput optionValue="id" optionText="name" label="table.field.deviceBind.typeId" />
                            </ReferenceInput>
                        </Stack>

 rsf-admin/src/page/locPreview/LocPreviewEdit.jsx

@@ -95,6 +95,7 @@
                                    <ReferenceInput
                                        source="areaId"
                                        reference="warehouseAreas"
                                        sort={{ field: 'sort', order: 'ASC' }}
                                        filter={{ warehouseId }}
                                    >
                                        <AutocompleteInput

 rsf-admin/src/page/locPreview/LocPreviewList.jsx

@@ -95,6 +95,7 @@
            source="areaId"
            label="table.field.loc.areaId"
            reference="warehouseAreas"
            sort={{ field: 'sort', order: 'ASC' }}
        >
            <AutocompleteInput
                label="table.field.loc.areaId"

 rsf-admin/src/page/stockManage/locRevise/LocReviseCreate.jsx

@@ -180,7 +180,7 @@
                                />
                            </Grid>
                            <Grid item md={2}>
                                <ReferenceInput source="areaId" reference="warehouseAreas">
                                <ReferenceInput source="areaId" reference="warehouseAreas" sort={{ field: 'sort', order: 'ASC' }}>
                                    <AutocompleteInput
                                        optionText='name'
                                        optionValue="id"

 rsf-admin/src/page/warehouseAreas/WarehouseAreasCreate.jsx

@@ -127,6 +127,11 @@
                    parse={v => v}
                    validate={[required()]}
                  />                
                  <NumberInput
                    label="table.field.warehouseAreas.sort"
                    source="sort"
                    parse={v => v}
                  />
                  {/* <SelectInput
                    label="table.field.warehouseAreas.flagLabelMange"
                    source="flagLabelMange"

 rsf-admin/src/page/warehouseAreas/WarehouseAreasEdit.jsx

@@ -115,6 +115,13 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.warehouseAreas.sort"
                                source="sort"
                                parse={v => v}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.warehouseAreas.flagMix"
                                source="flagMix"

 rsf-admin/src/page/warehouseAreas/WarehouseAreasList.jsx

@@ -164,6 +164,7 @@
                    <TextField source="code" label="table.field.warehouseAreas.code" />
                    <TextField source="name" label="table.field.warehouseAreas.name" />                   
                    <TextField source="type$" label="table.field.warehouseAreas.type"/>
                    <NumberField source="sort" label="table.field.warehouseAreas.sort" />
                    <TextField source="shipperId$" label="table.field.warehouseAreas.shipperId" />
                    <NumberField source="supplierId" label="table.field.warehouseAreas.supplierId" />
                    <TextField source="flagMix$" label="table.field.warehouseAreas.flagMix" sortable={false} />

 rsf-admin/src/page/warehouseAreas/WarehouseAreasPanel.jsx

@@ -60,6 +60,12 @@
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.warehouseAreas.sort" 
                                property={record.sort}
                            />
                        </Grid>
                        <Grid item xs={6}>
                            <PanelTypography
                                title="table.field.warehouseAreas.shipperId" 
                                property={record.shipperId$}
                            />

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java

@@ -107,6 +107,12 @@
    private Integer status;

    /**
     * 排序字段
     */
    @ApiModelProperty(value= "排序字段")
    private Integer sort;

    /**
     * 是否删除 1: 是  0: 否  
     */
    @ApiModelProperty(value= "是否删除 1: 是  0: 否  ")

 version/db/man_warehouse_areas_add_sort.sql

New file
@@ -0,0 +1,12 @@
-- 为 man_warehouse_areas 表添加 sort 排序字段
-- @author chen.lin
-- @time 2026-02-02

-- 添加 sort 字段，默认值为 NULL，允许为空
ALTER TABLE `man_warehouse_areas` 
ADD COLUMN `sort` INT(11) NULL DEFAULT NULL COMMENT '排序字段' AFTER `status`;

-- 为现有数据设置默认排序值（使用 id 作为初始排序值）
UPDATE `man_warehouse_areas` 
SET `sort` = `id` 
WHERE `sort` IS NULL;