rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -1,6 +1,7 @@ package com.vincent.rsf.server.api.controller.pda; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.api.controller.params.OpStockParams; import com.vincent.rsf.server.api.service.AgvService; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; @@ -23,8 +24,18 @@ @Autowired private AgvService agvService; @ApiOperation("站点绑定查询") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/staBind/list") public R getStaBindList(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } return agvService.getStaBindList(params); } @PreAuthorize("hasAuthority('manager:basStation:list')") @ApiOperation("获取拖盘明细") @ApiOperation("站点绑定") @PostMapping("/AGV/staBind") public R getAGVStaBind(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { @@ -34,12 +45,12 @@ } @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") @ApiOperation("获取拖盘明细") @ApiOperation("站点解绑") @PostMapping("/AGV/staUnBind") public R getAGVStaUnBind(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); } return agvService.getAGVStaBind(params); return agvService.AGVStaUnBind(params); } } rsf-server/src/main/java/com/vincent/rsf/server/api/service/AgvService.java
@@ -6,4 +6,8 @@ public interface AgvService { R getAGVStaBind(Map<String, Object> params); R getStaBindList(Map<String, Object> params); R AGVStaUnBind(Map<String, Object> params); } rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/AgvServiceImpl.java
@@ -7,9 +7,11 @@ import com.vincent.rsf.server.api.service.AgvService; import com.vincent.rsf.server.manager.entity.BasStation; import com.vincent.rsf.server.manager.entity.WaitPakin; import com.vincent.rsf.server.manager.entity.WaitPakinItem; import com.vincent.rsf.server.manager.enums.PakinIOStatus; import com.vincent.rsf.server.manager.enums.StaUseStatusType; import com.vincent.rsf.server.manager.service.BasStationService; import com.vincent.rsf.server.manager.service.WaitPakinItemService; import com.vincent.rsf.server.manager.service.WaitPakinService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,6 +27,77 @@ private WaitPakinService waitPakinService; @Autowired private BasStationService basStationService; @Autowired private WaitPakinItemService waitPakinItemService; @Override public R AGVStaUnBind(Map<String, Object> params) { String sta = params.get("sta").toString(); if (Cools.isEmpty(sta)){ throw new CoolException("接驳位条码不能为空"); } BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, sta) .eq(BasStation::getUseStatus,StaUseStatusType.TYPE_F.type) ); if (Cools.isEmpty(basStation)){ throw new CoolException("未找到接驳站点信息，请检查站点状态"); } if (Cools.isEmpty(basStation.getBarcode())){ throw new CoolException("数据错误，接驳站无条码信息"); } WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() .eq(WaitPakin::getBarcode, basStation.getBarcode()) .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val) ); if (Cools.isEmpty(waitPakin)){ throw new CoolException("未找到组托数据,请检查状态"); } basStation.setBarcode(null); basStation.setUseStatus(StaUseStatusType.TYPE_O.type); if (!basStationService.updateById(basStation)){ throw new CoolException("更新站点状态失败"); } return R.ok("解绑成功"); } @Override public R getStaBindList(Map<String, Object> params) { String sta = params.get("sta").toString(); if (Cools.isEmpty(sta)){ throw new CoolException("接驳位条码不能为空"); } BasStation basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, sta) .eq(BasStation::getUseStatus,StaUseStatusType.TYPE_F.type) ); if (Cools.isEmpty(basStation)){ throw new CoolException("未找到接驳站点信息，请检查站点状态"); } if (Cools.isEmpty(basStation.getBarcode())){ throw new CoolException("数据错误，接驳站无条码信息"); } WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>() .eq(WaitPakin::getBarcode, basStation.getBarcode()) .eq(WaitPakin::getIoStatus,PakinIOStatus.PAKIN_IO_STATUS_DONE.val) ); if (Cools.isEmpty(waitPakin)){ throw new CoolException("未找到组托数据,请检查状态"); } List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId())); if (Cools.isEmpty(waitPakinItems)){ throw new CoolException("数据错误，未找到组托明细"); } return R.ok(Cools .add("barcode", basStation.getBarcode()) .add("list", waitPakinItems) ); } @Override @Transactional(rollbackFor = Exception.class) @@ -42,6 +115,8 @@ return R.ok("绑定成功"); } private BasStation checkStaStatus(String barcode, String sta){ if (Cools.isEmpty(barcode)){ throw new CoolException("容器码不能为空"); rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -12,13 +12,11 @@ import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams; import com.vincent.rsf.server.manager.controller.params.WaitPakinParam; import com.vincent.rsf.server.manager.entity.BasStation; import com.vincent.rsf.server.manager.entity.TaskItem; import com.vincent.rsf.server.manager.entity.WaitPakin; import com.vincent.rsf.server.manager.entity.WaitPakinItem; import com.vincent.rsf.server.manager.service.TaskItemService; import com.vincent.rsf.server.manager.service.TaskService; import com.vincent.rsf.server.manager.service.WaitPakinItemService; import com.vincent.rsf.server.manager.service.WaitPakinService; import com.vincent.rsf.server.manager.service.*; import com.vincent.rsf.server.system.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,6 +39,9 @@ @Autowired private WaitPakinItemService waitPakinItemService; @Autowired private BasStationService basStationService; @Autowired private TaskService taskService; @@ -112,6 +113,17 @@ if (Arrays.asList(ids).isEmpty()) { return R.error("参数不能为空！！"); } for (Long id : ids) { WaitPakin waitPakin = waitPakinService.getById(id); BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getBarcode, waitPakin.getBarcode()) ,false ); if (!Cools.isEmpty(isBarcodeSta)){ throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定"); } } return waitPakinService.removePakin(Arrays.asList(ids)); }
