取货释放码头改为agv上报时取消

任务管理处理，从总任务控制改为单个任务控制

shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinPickupServiceImpl.java

@@ -141,7 +141,7 @@ public class BusinPickupServiceImpl extends ServiceImpl<BusinPickupMapper, Busin
         businPickup.setContainerId(bo.getContainerId());
         businPickup.setCreateTime(DateUtils.getNowDate());
         businPickup.setBranchId(2L);
-        businPickup.setCreateBy("Comair");
+        businPickup.setCreateBy(SecurityUtils.getUsername());
         Long puckupId = this.baseMapper.insertPuckup(businPickup);
         String taskType = bo.getTaskType();
 

shkj-wms/src/main/java/com/shkj/wms/service/impl/IBusinEnptyContainerServiceImpl.java

@@ -263,10 +263,11 @@ public class IBusinEnptyContainerServiceImpl extends ServiceImpl<BaseContainerMa
 
             businDataTask.setTaskStatus(TaskStatusEnum.wait_callback.getValue());
             iBusinDataTaskService.updateById(businDataTask);
-            //更改点位状态为空闲
-            BasePoint basePoint = basePointService.selectBasePointByPointNo(fromPoint);
-            basePoint.setIsOccupy("0");
-            basePointService.updateById(basePoint);
+            //2024-07-12 呼叫AGV成功后不释放点位，待AGV取货完成后，再释放点位信息
+//            //更改点位状态为空闲
+//            BasePoint basePoint = basePointService.selectBasePointByPointNo(fromPoint);
+//            basePoint.setIsOccupy("0");
+//            basePointService.updateById(basePoint);
             //更新货位状态为已分配
             if (locationVo!=null){
                 BaseLocation baseLocation = BeanUtil.toBean(locationVo,BaseLocation.class);
@@ -290,9 +291,7 @@ public class IBusinEnptyContainerServiceImpl extends ServiceImpl<BaseContainerMa
             }
             businDataTask.setExceptionMsg(booleanResult.getMsg());
             iBusinDataTaskService.updateById(businDataTask);
-
         }
-
         return booleanResult;
     }
 

shkj-wms/src/main/java/com/shkj/wms/third/rcs/RCSUtil.java

@@ -606,6 +606,7 @@ public class RCSUtil {
                 List<BusinPickup> businPickupList = businPickupMapper.selectList(pickupQueryWrapper);
                 if (businPickupList.size() > 0) {
                     BusinPickup businPickup = businPickupList.get(0);
+                    log.info("空治具回库时，释放码头点位信息："+JsonUtil.toJSONString(businPickup));
                     BasePoint basePoint = iBasePointService.selectBasePointById(Long.valueOf(businPickup.getPointNo()));
                     basePoint.setIsActive("1");
                     basePoint.setIsOccupy("0");
@@ -677,8 +678,6 @@ public class RCSUtil {
 
         //更新任务数据
         List<String> collect = agvMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).map(e -> e.getKey()).collect(Collectors.toList());
-        //log.error(collect.get(collect.size() - 1));
-        log.error(bo.getSn());
 
         businDataTask.setAgvNo(bo.getRobotId());
         businDataTask.setUpdateTime(DateUtils.getNowDate());