#

luxiaotao1123

2024-09-14 dd6ad6956fbbe97c0c8ed1e45898d163a461537a

#

 zy-acs-flow/src/page/agvDetail/AgvDetailList.jsx

@@ -141,41 +141,36 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <AgvDetailPanel />}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'uuid', 'updateBy', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="uuid" label="table.field.agvDetail.uuid" />
                    <ReferenceField source="agvId" label="table.field.agvDetail.agvId" reference="agv" link={false} sortable={false}>
                        <TextField source="uuid" />
                    </ReferenceField>
                    <TextField source="title" label="table.field.agvDetail.title" />
                    <TextField source="pos$" label="table.field.agvDetail.pos" sortable={false} />
                    <BooleanField source="posBool" label="table.field.agvDetail.pos" />
                    <ReferenceField source="code" label="table.field.agvDetail.code" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <ReferenceField source="lastCode" label="table.field.agvDetail.lastCode" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <TextField source="codeOffsert" label="table.field.agvDetail.codeOffsert" />
                    <NumberField source="straightVal" label="table.field.agvDetail.straightVal" />
                    {/* <NumberField source="straightVal" label="table.field.agvDetail.straightVal" /> */}
                    <NumberField source="agvAngle" label="table.field.agvDetail.agvAngle" />
                    <NumberField source="gyroAngle" label="table.field.agvDetail.gyroAngle" />
                    <NumberField source="encoderAngle" label="table.field.agvDetail.encoderAngle" />
                    {/* <NumberField source="gyroAngle" label="table.field.agvDetail.gyroAngle" /> */}
                    {/* <NumberField source="encoderAngle" label="table.field.agvDetail.encoderAngle" /> */}
                    <NumberField source="high" label="table.field.agvDetail.high" />
                    <NumberField source="sensorSts" label="table.field.agvDetail.sensorSts" />
                    {/* <NumberField source="sensorSts" label="table.field.agvDetail.sensorSts" /> */}
                    <NumberField source="vol" label="table.field.agvDetail.vol" />
                    <NumberField source="soc" label="table.field.agvDetail.soc" />
                    <NumberField source="soh" label="table.field.agvDetail.soh" />
                    <NumberField source="batteryFail" label="table.field.agvDetail.batteryFail" />
                    <TextField source="tempe" label="table.field.agvDetail.tempe" />
                    <TextField source="motorFail" label="table.field.agvDetail.motorFail" />
                    <TextField source="failSign" label="table.field.agvDetail.failSign" />
                    {/* <NumberField source="soh" label="table.field.agvDetail.soh" /> */}
                    {/* <NumberField source="batteryFail" label="table.field.agvDetail.batteryFail" /> */}
                    {/* <TextField source="tempe" label="table.field.agvDetail.tempe" /> */}
                    {/* <TextField source="motorFail" label="table.field.agvDetail.motorFail" /> */}
                    {/* <TextField source="failSign" label="table.field.agvDetail.failSign" /> */}
                    <NumberField source="bootTime" label="table.field.agvDetail.bootTime" />
                    <NumberField source="workTime" label="table.field.agvDetail.workTime" />
                    {/* <NumberField source="workTime" label="table.field.agvDetail.workTime" /> */}
                    <NumberField source="workDistance" label="table.field.agvDetail.workDistance" />
                    <NumberField source="tempQua" label="table.field.agvDetail.tempQua" />
                    <TextField source="password" label="table.field.agvDetail.password" />

                    <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
                        <TextField source="nickname" />
                    </ReferenceField>
@@ -184,7 +179,7 @@
                        <TextField source="nickname" />
                    </ReferenceField>
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />
                    {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
                    <TextField source="memo" label="common.field.memo" sortable={false} />
                    <WrapperField cellClassName="opt" label="common.field.opt">
                        <EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java

@@ -328,15 +328,15 @@
        return null;
    }

    public String getPos$(){
    public Boolean getPosBool(){
        if (null == this.pos){ return null; }
        switch (this.pos){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.status);
                return null;
        }
    }