#

luxiaotao1123

2024-09-25 e5fb24c1fbfef2a7562963ab6df69090410c89b5

#

 zy-acs-flow/.env

@@ -1,5 +1,5 @@
# COOL_BASE_IP = '10.242.136.69'
# COOL_BASE_IP = 'localhost'
COOL_BASE_IP = '192.168.4.36'
COOL_BASE_IP = 'localhost'
# COOL_BASE_IP = '192.168.4.36'

COOL_BASE_PORT = 9090

 zy-acs-flow/src/i18n/en.js

@@ -484,6 +484,7 @@
                posType: "type",
                backpack: "backpack",
                state: "state",
                segDesc: "seg no",
            },
            jam: {
                uuid: "uuid",

 zy-acs-flow/src/i18n/zh.js

@@ -483,6 +483,7 @@
                posType: "作业类型",
                backpack: "背篓",
                state: "状态",
                segDesc: "作业编号",
            },
            jam: {
                uuid: "编号",

 zy-acs-flow/src/page/segment/SegmentList.jsx

@@ -30,6 +30,7 @@
    ReferenceArrayInput,
    AutocompleteInput,
    DeleteButton,
    FunctionField,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -117,7 +118,7 @@
                actions={(
                    <TopToolbar>
                        <FilterButton />
                        <MyCreateButton onClick={() => { setCreateDialog(true) }} />
                        {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
                        <SelectColumnsButton preferenceKey='segment' />
                        <MyExportButton />
                    </TopToolbar>
@@ -130,12 +131,15 @@
                    rowClick={(id, resource, record) => false}
                    expand={() => <SegmentPanel />}
                    expandSingle={true}
                    omit={['id', 'startNode', 'updateBy', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'startNode', 'statusBool', 'updateBy', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="segDesc" label="table.field.segment.segDesc" />
                    <TextField source="uuid" label="table.field.segment.uuid" />
                    <TextField source="groupId" label="table.field.segment.groupId" />
                    <NumberField source="travelId" label="table.field.segment.travelId" />
                    <ReferenceField source="travelId" label="table.field.segment.travelId" reference="travel" link={false} sortable={false}>
                        <TextField source="uuid" />
                    </ReferenceField>
                    <ReferenceField source="taskId" label="table.field.segment.taskId" reference="task" link={false} sortable={false}>
                        <TextField source="seqNum" />
                    </ReferenceField>
@@ -163,10 +167,10 @@
                    <DateField source="createTime" label="common.field.createTime" showTime />
                    <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' }} />
                        <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
                    </WrapperField>
                    {/* <FunctionField label="common.field.opt" cellClassName="opt" render={record => (
                        <>
                        </>
                    )} /> */}
                </StyledDatagrid>
            </List>
            <SegmentCreate

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

@@ -8,6 +8,7 @@
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
import com.zy.acs.manager.manager.service.TravelService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -181,6 +182,15 @@
//            null    // 备注
//    );

    public String getTravelId$(){
        TravelService service = SpringUtils.getBean(TravelService.class);
        Travel travel = service.getById(this.travelId);
        if (!Cools.isEmpty(travel)){
            return String.valueOf(travel.getUuid());
        }
        return null;
    }

    public String getTaskId$(){
        TaskService service = SpringUtils.getBean(TaskService.class);
        Task task = service.getById(this.taskId);
@@ -217,20 +227,6 @@
        return null;
    }

    public String getStatus$(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "正常";
            case 0:
                return "冻结";
            default:
                return String.valueOf(this.status);
        }
    }



    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
@@ -243,4 +239,9 @@
        }
    }

    public String getSegDesc() {

        return "";
    }

}