#巷道

zjj

1 天以前 a4112a5d31fa3a66daafdc009ff3b3047bb98f67

#巷道

 rsf-admin/src/i18n/en.js

@@ -771,6 +771,8 @@
                deviceCode: "deviceCode",
                deviceSite: "deviceSite",
                flagInit: "flagInit",
                wcsCode: "wcsCode",
                channel: "channel",
            },
            waitPakin: {
                code: "code",

 rsf-admin/src/i18n/zh.js

@@ -800,6 +800,7 @@
                deviceSite: "设备站点",
                flagInit: "是否初始化",
                wcsCode: "wcs编号",
                channel: "巷道",
            },
            waitPakin: {
                code: "编码",

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

@@ -157,7 +157,7 @@
                    <TextField source="target" label="table.field.deviceSite.target" />
                    <TextField source="label" label="table.field.deviceSite.label" />
                    <TextField source="device$" label="table.field.deviceSite.device" />
                    <TextField source="deviceCode" label="table.field.deviceSite.deviceCode" />
                    <TextField source="channel" label="table.field.deviceSite.channel" />
                    <TextField source="deviceSite" label="table.field.deviceSite.deviceSite" />
                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />

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

@@ -121,8 +121,8 @@
                            </Grid>
                            <Grid item xs={4}>
                                <TextInput
                                    label={translate("table.field.deviceSite.deviceCode")}
                                    name="deviceCode"
                                    label={translate("table.field.deviceSite.channel")}
                                    name="channel"
                                    size="small"
                                    type="number"
                                />

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java

@@ -31,4 +31,7 @@
    @ApiModelProperty("目标站点")
    private String target;

    @ApiModelProperty("巷道")
    private Integer channel;

}

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

@@ -105,6 +105,10 @@
    @TableLogic
    private Integer deleted;

    @ApiModelProperty(value= "巷道")
    private Integer channel;


    /**
     * 租户
     */

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java

@@ -60,7 +60,9 @@
                                .setDevice(param.getDeviceType())
                                .setDeviceSite(deviceSite)
                                .setTarget(target)
                                .setDeviceCode(param.getDeviceCode());
                                .setDeviceCode(param.getDeviceCode())
                                .setChannel(param.getChannel())
                                ;
                        deviceSites.add(site1);
                    }
                }