| | |
| | | <KeyValuePair label={translate('common.field.status')} value={info?.agvStatus} /> |
| | | </Grid> |
| | | <Grid item xs={12}> |
| | | <KeyValuePair label={translate('table.field.agvDetail.vol')} value={info?.vol} /> |
| | | <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} /> |
| | | </Grid> |
| | | {/* <Grid item xs={12}> |
| | | <KeyValuePair label={translate('table.field.agvDetail.soc')} value={info?.soc} /> |
| | |
| | | agvDetail.setCode(code.getId()); |
| | | agvDetail.setStatus(AgvStatusType.IDLE.val); |
| | | agvDetail.setAgvAngle(workDirection); |
| | | agvDetail.setVol(5000); |
| | | agvDetail.setSoc(80); |
| | | |
| | | agvDetailService.updateById(agvDetail); |
| | | } |
| | |
| | | for (Agv agv : agvList) { |
| | | AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId()); |
| | | AgvModel agvModel = agvModelService.getByAgvId(agv.getId()); |
| | | if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus()) { |
| | | if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) { |
| | | continue; |
| | | } |
| | | if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) { |
| | |
| | | log.warn("[{}]号Agv未收到状态包......", agvNo); |
| | | return false; |
| | | } |
| | | if (agvDetail.getVol() == 0) { |
| | | if (null == agvDetail.getSoc() || agvDetail.getSoc() == 0) { |
| | | return false; |
| | | } |
| | | if (!agvDetail.getAgvStatus().equals(AgvStatusType.IDLE) && !agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) { |
| | |
| | | return false; |
| | | } |
| | | if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) { |
| | | if (agvDetail.getVol() < agvModel.getQuaBattery()) { |
| | | if (agvDetail.getSoc() < agvModel.getQuaBattery()) { |
| | | return false; |
| | | } |
| | | } |
| | |
| | | AgvModel agvModel = agvModelService.getByAgvId(agv.getId()); |
| | | AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId()); |
| | | if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) { |
| | | if (agvDetail.getVol() < agvModel.getQuaBattery()) { |
| | | if (agvDetail.getSoc() < agvModel.getQuaBattery()) { |
| | | return false; |
| | | } |
| | | } else { |
| | |
| | | </sql> |
| | | |
| | | <select id="selectMajorByAgvId" resultType="com.zy.acs.manager.manager.entity.AgvDetail"> |
| | | SELECT id, agv_id, pos, code, last_code, agv_angle, vol, backpack, status, deleted |
| | | SELECT id, agv_id, pos, code, last_code, agv_angle, vol,soc, backpack, status, deleted |
| | | FROM man_agv_detail |
| | | WHERE agv_id = #{agvId} |
| | | LIMIT 1 |