Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskNodeServiceImpl.java

@@ -355,7 +355,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                         if("1".equals(taskNode.getAutoNode().getCategory())){
                             taskNode.setInterfaceType(DictionaryKey.INTERFACETYPE_PLC);
                             //加工设备的设备ID来源于加工任务设备
-                            taskNode.setResourceId(taskNode.getTaskId());
+                            taskNode.setResourceId(t.getResourceId());
                             taskNode.setTargetResourceId(t.getResourceId());
                         }else if("3".equals(taskNode.getAutoNode().getCategory())){
                             String command = autoCode.getCommand();

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/RobotNodeServiceImpl.java

@@ -251,7 +251,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     List<String> meterails = agvStationMeterails.stream().map(p -> p.getGoodsType()).collect(Collectors.toList());
                     agvStartStationStorge = storgeService.getById(startProductionresourcePosition.getStorgeId());
                     // 有托板但是没有托盘认为可放
-                    if(meterails.contains("5") &&  !meterails.contains("2") && agvStartStationStorge.getStatus().equals("1")){
+                    if(meterails.contains("5") &&  !meterails.contains("2") && agvStartStationStorge.getStatus().equals("1") && "1".equals(agvStartStationStorge.getLockStatus())){
                         startAgvStation = agvStation;
                         break;
                     }
@@ -267,8 +267,14 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                     List<StockInfo> agvStationMeterails = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().eq(StockInfo::getStorgeId,endProductionresourcePosition.getStorgeId()));
                     List<String> meterails = agvStationMeterails.stream().map(p -> p.getGoodsType()).collect(Collectors.toList());
                     agvEndStationStorge = storgeService.getById(endProductionresourcePosition.getStorgeId());
-                    // 有托板但是没有托盘认为可放
-                    if(meterails.contains("5") && !meterails.contains("2") && agvEndStationStorge.getStatus().equals("1")){
+//                    // 有托板但是没有托盘认为可放
+//                    if(meterails.contains("5") && !meterails.contains("2") && agvEndStationStorge.getStatus().equals("1")){
+//                        endAgvStation = agvStation;
+//                        break;
+//                    }
+
+                    // 终点接驳位任何东西都不能有
+                    if(meterails.size() == 0 && "1".equals(agvEndStationStorge.getLockStatus())){
                         endAgvStation = agvStation;
                         break;
                     }

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -282,7 +282,7 @@
           itt.expect_start_time AS startTime,
           itt.expect_end_time AS endTime,
           itt.status,
-          imm.id AS meteriaId,
+          imm.id AS meterialId,
           imm.meterial_code AS meterialCode,
           imm.equipment_name AS equipmentName,
           imm.trade_mark AS tradeMark,