梳齿架状态修改

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java

@@ -181,7 +181,16 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService {
                     log.error("库位暂时没有空闲梳齿架子");
                     return;
                 }
-                String locationCode = locationList.get(0).getLocationCode();
+
+                Location location1 = locationList.get(0);
+                String locationCode = location1.getLocationCode();
+
+                //修改梳齿架状态 防止重复送货
+                location1.setLocationStatus(Location.STATUS_OCCUPIED);
+                boolean locationUpdate = locationService.updateById(location1);
+                if(locationUpdate){
+                    log.info("梳齿架状态修改为占用：{}",locationCode);
+                }
 
                 //调用ctu
                 AgvSchedulingTaskVO ctuSchedulingTask = taskExecuteRecordService.genCtuSchedulingTask(AgvConstant.CTU_TASK_TYP, AgvConstant.CTU_CTNR_TYP, firstTask.getBoxBarcode(), location.getLocationCode(),

blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/TaskExecuteRecordServiceImpl.java

@@ -346,8 +346,13 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
 
             Station station = stationService.getByStationCode(taskExecuteRecord.getEndPos());
 
-            // 3. 检查是否需要送到库位
+            /**
-            if(null == task.getLocationId() || null != station){
+             * 3. 检查是否需要送到库位
+             * 3.1 任务没有库位信息
+             * 3.2 执行记录的终点是 站点
+             * 3.3 执行记录的终点是 输送线终点
+             */
+            if(null == task.getLocationId() || null != station || DROPOFF_CONVEYOR_LINE.equals(taskExecuteRecord.getEndPos())){
                 log.info("任务{}不需要送到库位，直接完成", taskCode);
                 log.info("终点位置为站点信息:{}，直接完成",taskExecuteRecord.getEndPos());
 
@@ -602,6 +607,12 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
                     log.error("站点状态更新失败，但AGV调度已成功，stationId：{}", station.getId());
                 }
 
+                location.setLocationStatus(Location.STATUS_FREE);
+                boolean locationUpdate = locationService.updateById(location);
+                if(locationUpdate){
+                    log.info("梳齿架状态修改为空闲:{}",location.getLocationCode());
+                }
+
             } else {
                 log.error("AGV调度失败，taskCode：{}", taskCode);
             }