Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

zhou zhou

2 天以前 d99a433c0d0e433e5cd8d216562a3fba5bd3fdd6

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

 rsf-admin/src/i18n/en.js

@@ -237,6 +237,7 @@
            },
            basStation: {
                stationName: 'stationName',
                stationId: 'stationId',
                inAble: 'inAble',
                outAble: 'outAble',
                type: 'Site Type',

 rsf-admin/src/i18n/zh.js

@@ -265,7 +265,8 @@
                areas: '可入库区',
            },
            basStation: {
                stationName: '站点名称',
                stationName: '站点编号',
                stationId: '站点名称',
                type: '站点类型',
                inAble: '能入',
                outAble: '能出',

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

@@ -97,6 +97,15 @@
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.basStation.stationId"
                                        source="stationId"
                                        parse={v => v}
                                        autoFocus
                                        validate={[required()]}
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                    <SelectInput
                                        label="table.field.basStation.type"
                                        source="type"

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

@@ -75,6 +75,14 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.basStation.stationId"
                                source="stationId"
                                parse={v => v}
                                autoFocus
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <SelectInput
                                label="table.field.basStation.type"
                                source="type"

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

@@ -68,6 +68,7 @@
    <DateInput label='common.time.before' source="timeEnd" />,

    <TextInput source="stationName" label="table.field.basStation.stationName" alwaysOn />,
    <TextInput source="stationId" label="table.field.basStation.stationId" alwaysOn />,
    <NumberInput source="inAble" label="table.field.basStation.inAble" />,
    <NumberInput source="outAble" label="table.field.basStation.outAble" />,
    <TextInput source="useStatus" label="table.field.basStation.useStatus" />,
@@ -134,6 +135,7 @@
                    <NumberField source="id" />
                    <TextField source="type$" label="table.field.basStation.type" />
                    <TextField source="stationName" label="table.field.basStation.stationName" />
                    <TextField source="stationId" label="table.field.basStation.stationId" />
                    <TextField source="useStatus$" label="table.field.basStation.useStatus" />
                    <TextField source="barcode" label="table.field.basStation.barcode" />
                    <FunctionField

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

@@ -41,9 +41,15 @@
    /**
     * 站点名称
     */
    @ApiModelProperty(value = "站点名称")
    @ApiModelProperty(value = "站点编号")
    private String stationName;

    /**
     * 站点名称
     */
    @ApiModelProperty(value = "站点名称")
    private String stationId;

    @ApiModelProperty("站点类型: {0:光电， 1:无光电}")
    private Integer type;


 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskCacheLocSchedules.java

@@ -70,5 +70,6 @@
    @Scheduled(cron = "0/5 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void complateOutStock() throws Exception {
        System.out.println("缓存区域自动生成空货架出库任务");
    }
}