#

vincentlu

8 天以前 aa11889dab7ffb8d0a4f9e5f62518c120349cc0d

#

 zy-acs-flow/src/page/sta/StaList.jsx

@@ -146,9 +146,9 @@
                    <ReferenceField source="code" label="table.field.sta.code" reference="code" link={false} sortable={false}>
                        <TextField source="data" />
                    </ReferenceField>
                    <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
                    {/* <ReferenceField source="staSts" label="table.field.sta.staSts" reference="staSts" link={false} sortable={false}>
                        <TextField source="name" />
                    </ReferenceField>
                    </ReferenceField> */}
                    <TextField source="name" label="table.field.sta.name" />
                    <NumberField source="capacity" label="table.field.sta.capacity" />
                    {/* <NumberField source="occCnt" label="table.field.sta.occCnt" /> */}

 zy-acs-flow/src/page/sta/rowSx.jsx

@@ -15,42 +15,35 @@
            backgroundColor: 'action.selected',
        };
    }
    if (record.staSts$ === '无货')
    if (record.connect)
        return {
            ...style,
            borderLeftColor: green[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.staSts$ === '有货')
        return {
            ...style,
            borderLeftColor: blue[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.staSts$ === '禁用')
    if (!record.connect)
        return {
            ...style,
            borderLeftColor: red[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.staSts$ === '放货预约')
    if (record.rsvInCnt && record.rsvInCnt > 0)
        return {
            ...style,
            borderLeftColor: blue[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.rsvOutCnt && record.rsvOutCnt > 0)
        return {
            ...style,
            borderLeftColor: orange[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.staSts$ === '取货预约')
        return {
            ...style,
            borderLeftColor: orange[500],
            borderLeftWidth: 5,
            borderLeftStyle: 'solid',
        };
    if (record.staSts$ === '其他')
    if (!record.statusBool)
        return {
            ...style,
            borderLeftColor: grey[500],

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/AutoRunScheduler.java

@@ -86,7 +86,7 @@
        param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        for (int i = 0; i < Math.min(agvModel.getBackpack(), stockList.size()) ; i++) {
            Sta stockSta = stockList.get(i);
            String staCode = stockSta.getCode$();
            String staCode = codeService.getCacheById(stockSta.getCode()).getData();

            Loc idleLoc = null;

@@ -144,7 +144,7 @@
        param.setBatch(String.valueOf(snowflakeIdWorker.nextId()).substring(13, 19));
        for (int i = 0; i < Math.min(agvModel.getBackpack(), idleList.size()) ; i++) {
            Sta idleSta = idleList.get(i);
            String staCode = idleSta.getCode$();
            String staCode = codeService.getCacheById(idleSta.getCode()).getData();

            Loc stockLoc = null;


 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvAreaDispatcher.java

@@ -1,10 +1,12 @@
package com.zy.acs.manager.core.service;

import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.entity.Loc;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.service.AreaAgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.LocService;
import com.zy.acs.manager.manager.service.StaService;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +29,8 @@
    private AreaGovernService areaGovernService;
    @Autowired
    private AreaAgvService areaAgvService;
    @Autowired
    private CodeService codeService;

    @PostConstruct
    public void init() {
@@ -42,19 +46,23 @@
        Sta destSta = null;
        if (null != task.getOriLoc()) {
            oriLoc = locService.getById(task.getOriLoc());
            return this.getAgvIdsByCode(oriLoc.getCode$());
            Code code = codeService.getCacheById(oriLoc.getCode());
            return this.getAgvIdsByCode(code.getData());
        }
        if (null != task.getOriSta()) {
            oriSta = staService.getById(task.getOriSta());
            return this.getAgvIdsByCode(oriSta.getCode$());
            Code code = codeService.getCacheById(oriSta.getCode());
            return this.getAgvIdsByCode(code.getData());
        }
        if (null != task.getDestLoc()) {
            destLoc = locService.getById(task.getDestLoc());
            return this.getAgvIdsByCode(destLoc.getCode$());
            Code code = codeService.getCacheById(destLoc.getCode());
            return this.getAgvIdsByCode(code.getData());
        }
        if (null != task.getDestSta()) {
            destSta = staService.getById(task.getDestSta());
            return this.getAgvIdsByCode(destSta.getCode$());
            Code code = codeService.getCacheById(destSta.getCode());
            return this.getAgvIdsByCode(code.getData());
        }
        return null;
    }

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

@@ -3,12 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.StaStsService;
import com.zy.acs.manager.manager.service.StaTypeService;
import com.zy.acs.manager.manager.service.ZoneService;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -103,40 +98,47 @@
    @ApiModelProperty(value= "备注")
    private String memo;

    public String getZoneId$(){
        ZoneService service = SpringUtils.getBean(ZoneService.class);
        Zone zone = service.getById(this.zoneId);
        if (!Cools.isEmpty(zone)){
            return String.valueOf(zone.getName());
        }
        return null;
    }
//    public String getZoneId$(){
//        ZoneService service = SpringUtils.getBean(ZoneService.class);
//        Zone zone = service.getById(this.zoneId);
//        if (!Cools.isEmpty(zone)){
//            return String.valueOf(zone.getName());
//        }
//        return null;
//    }
//
//    public String getStaType$(){
//        StaTypeService service = SpringUtils.getBean(StaTypeService.class);
//        StaType staType = service.getById(this.staType);
//        if (!Cools.isEmpty(staType)){
//            return String.valueOf(staType.getName());
//        }
//        return null;
//    }
//
//    public String getCode$(){
//        CodeService service = SpringUtils.getBean(CodeService.class);
//        Code code = service.getById(this.code);
//        if (!Cools.isEmpty(code)){
//            return String.valueOf(code.getUuid());
//        }
//        return null;
//    }
//
//    public String getStaSts$(){
//        StaStsService service = SpringUtils.getBean(StaStsService.class);
//        StaSts staSts = service.getById(this.staSts);
//        if (!Cools.isEmpty(staSts)){
//            return String.valueOf(staSts.getName());
//        }
//        return null;
//    }

    public String getStaType$(){
        StaTypeService service = SpringUtils.getBean(StaTypeService.class);
        StaType staType = service.getById(this.staType);
        if (!Cools.isEmpty(staType)){
            return String.valueOf(staType.getName());
    public Boolean getConnect() {
        if (Cools.isEmpty(this.autoing)) {
            return false;
        }
        return null;
    }

    public String getCode$(){
        CodeService service = SpringUtils.getBean(CodeService.class);
        Code code = service.getById(this.code);
        if (!Cools.isEmpty(code)){
            return String.valueOf(code.getUuid());
        }
        return null;
    }

    public String getStaSts$(){
        StaStsService service = SpringUtils.getBean(StaStsService.class);
        StaSts staSts = service.getById(this.staSts);
        if (!Cools.isEmpty(staSts)){
            return String.valueOf(staSts.getName());
        }
        return null;
        return this.autoing.equals("1");
    }

    public Boolean getStatusBool(){