修改梳齿架子状态

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

@@ -320,7 +320,9 @@ public class PipelineServiceImpl implements IPipelineService {
 			log.warn("没有可用的库位梳齿架子，物料箱：{}", task.getBoxBarcode());
 			return false;
 		}
-		String combLocationCode = combLocations.get(0).getLocationCode();
+
+		Location location = combLocations.get(0);
+		String combLocationCode = location.getLocationCode();
 		log.info("找到库位梳齿架子：{}", combLocationCode);
 
 		// 3. 两步操作
@@ -331,6 +333,15 @@ public class PipelineServiceImpl implements IPipelineService {
 		boolean agvSchedulingTask = iTaskExecuteRecordService.genAgvSchedulingTask
 				(taskTyp, Station.PICKUP_CONVEYOR_LINE, combLocationCode, AgvConstant.EQUIPMENT_TYPE_AGV, task);
 
+		if(agvSchedulingTask){
+			//修改梳齿架状态 防止重复送货
+			location.setLocationStatus(Location.STATUS_OCCUPIED);
+			boolean locationUpdate = locationService.updateById(location);
+			if(locationUpdate){
+				log.info("库位状态修改为占用：{}",combLocationCode);
+			}
+		}
+
 		//第二步 需要agv调用完成之后 给到mes通知接口
 		log.info("第二步：CTU将物料箱从梳齿架子送往库位,等待通知接口 进行CTU调用" );
 

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

@@ -156,6 +156,7 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
             if(Task.STATUS_CONVEYOR_END.equals(task.getTaskStatus())){
                 //判断是否需要调用ctu接口
                 containerToCtu(agvCallBack.getTaskCode());
+
             }
 
         }
@@ -385,6 +386,15 @@ public class  TaskExecuteRecordServiceImpl extends BaseServiceImpl<TaskExecuteRe
             if(!updateLocation){
                 log.error("库位状态修改失败，但CTU调度已成功，库位：{}", location.getId());
             }
+            // 10.将梳齿架子状态修改为空闲
+            Location location1 = locationService.selectByLocationCode(taskExecuteRecord.getEndPos(), 1);
+            location1.setLocationStatus(Location.STATUS_FREE);
+            boolean updateLocation1 = locationService.updateById(location1);
+            if(updateLocation1){
+                log.info("梳齿架子状态修改成功：{}", taskExecuteRecord.getEndPos());
+            }else {
+                log.error("梳齿架子状态修改失败：{}", taskExecuteRecord.getEndPos());
+            }
 
             log.info("CTU调度成功，taskCode：{}，from：{}，to：{}",
                     taskCode, taskExecuteRecord.getEndPos(), location.getLocationCode());