AGV任务修改、库位监控显示

xumiao
1 parent 2dd1f3e0
Showing 3 changed files with 5 additions and 1 deletions
src/main/java/com/huaheng/api/acs/controller/AgvTaskController.java
src/main/java/com/huaheng/api/acs/service/AcsServiceImpl.java
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
@@ -183,6 +183,9 @@ public class AgvTaskController extends BaseController {
             if(agvTask.getStatus().intValue()  <= QuantityConstant.TASK_STATUS_BUILD) {
                 continue;
             }
+            if(agvTask.getStatus().intValue()>=QuantityConstant.TASK_STATUS_RELEASE){
+                return AjaxResult.error("任务已经下发，不能删除");
+            }
             String containerCode = agvTask.getContainerCode();
             if (StringUtils.isEmpty(containerCode)) {
                 return AjaxResult.error("空托盘");
@@ -341,6 +341,7 @@ public class AcsServiceImpl extends ServiceImpl&lt;AcsMapper,AgvTask&gt; implements Ac
                 return AjaxResult.error("源点位未找到");
             }
             pointPositionService.updateStatus(agvTask.getFromPort(), QuantityConstant.STATUS_POSITION_EMPTY,agvTask.getWarehouseCode());
+            pointPositionService.setContainerCode(agvTask.getFromPort(),null,agvTask.getWarehouseCode());
         }
         if(StringUtils.isNotEmpty(agvTask.getToPort())){
             PointPosition desPosition = pointPositionService.getPositionByCode(agvTask.getToPort(), agvTask.getWarehouseCode());
@@ -272,7 +272,7 @@ public class LocationController extends BaseController {
     locationLambdaQueryWrapper.eq(StringUtils.isNotEmpty(row), Location::getIRow, row)
             .eq(StringUtils.isNotEmpty(line), Location::getIColumn, line)
             .eq(StringUtils.isNotEmpty(layer), Location::getILayer, layer)
-            .eq(Location::getIGrid, 1) //
+            .eq(Location::getIGrid, 0) //
             .eq(StringUtils.isNotEmpty(type), Location::getLocationType, type)
             .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
             .eq(StringUtils.isNotEmpty(type), Location::getZoneCode, type);