agv判断修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -588,7 +588,8 @@ public class TaskWorkNode {
                 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.size() == 0 && "1".equals(agvEndStationStorge.getLockStatus())){
                     endAgvStation = agvStation;
                     break;
                 }

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

@@ -247,7 +247,7 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 // 遍历开始接驳位判断是否有可用的接驳位
                 for(Productionresource agvStation : agvStartStationsResources){
                     startProductionresourcePosition = productionresourcePositionMapper.selectOne(Wraps.<ProductionresourcePosition>lbQ().eq(ProductionresourcePosition::getResourceId, agvStation.getId()));
-                    List<StockInfo> agvStationMeterails = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().eq(StockInfo::getStorgeId,endProductionresourcePosition.getStorgeId()));
+                    List<StockInfo> agvStationMeterails = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().eq(StockInfo::getStorgeId,startProductionresourcePosition.getStorgeId()));
                     List<String> meterails = agvStationMeterails.stream().map(p -> p.getGoodsType()).collect(Collectors.toList());
                     agvStartStationStorge = storgeService.getById(startProductionresourcePosition.getStorgeId());
                     // 有托板但是没有托盘认为可放
@@ -281,8 +281,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                 }
 
                 if (null != agvStartStationStorge && null != agvEndStationStorge){
-                    storgeService.lockStorge(agvStartStationStorge, nextTaskNode.getId());
-                    storgeService.lockStorge(agvEndStationStorge, lastOperationTaskNode.getId());
+//                    storgeService.lockStorge(agvStartStationStorge, nextTaskNode.getId());
+//                    storgeService.lockStorge(agvEndStationStorge, lastOperationTaskNode.getId());
                     // 将agv相关的节点的目标节点地址更新进tasknode表
                     nextTaskNode.setTargetResourceId(startAgvStation.getId());
                     lastOperationTaskNode.setTargetResourceId(endAgvStation.getId());

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionResourceCenter/ProductionresourceBizMapper.xml

@@ -81,9 +81,8 @@
     <select id="selectResouces" resultType="com.github.zuihou.business.productionResourceCenter.entity.Productionresource">
         SELECT
             itp.*
-        FROM imcs_tenant_productionresource itp
-        LEFT JOIN imcs_z_zone_productionresource izzp
-        ON itp.id = izzp.resource_id
+        FROM imcs_tenant_productionresource itp,imcs_z_zone_productionresource izzp
+        where itp.id = izzp.resource_id
         <if test="resourceName != null and resourceName != ''">
             and itp.name like concat('%', #{resourceName}, '%')
         </if>