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

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

@@ -23,6 +23,7 @@ import com.github.zuihou.business.productionReadyCenter.dao.BomProcedureTrayMapp
 import com.github.zuihou.business.productionReadyCenter.entity.BBom;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedure;
 import com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTray;
+import com.github.zuihou.business.productionReadyCenter.service.BomProcedureTrayService;
 import com.github.zuihou.business.productionResourceCenter.dao.*;
 import com.github.zuihou.business.productionResourceCenter.entity.*;
 import com.github.zuihou.business.productionResourceCenter.service.*;
@@ -115,6 +116,8 @@ public class RobotNodeServiceImpl implements NodeOperationService {
 
     private List<ProductionresourcePosition> jbwList;
 
+    private BomProcedureTrayService procedureTrayService;
+
     private Long zoneId;
 
     private String zoneName;
@@ -197,16 +200,17 @@ public class RobotNodeServiceImpl implements NodeOperationService {
         List<StockInfo> flikustockInfos = null;//获取初始立库库存
 
         Storge currStore = null;
-        BBom bom = bBomMapper.selectOne(Wraps.<BBom>lbQ().eq(BBom::getId,task.getBomId()));
         // 人工序只有上下料
         if(taskNode.getCompleteBatchSort()==1){
+//            BBom bom = bBomMapper.selectOne(Wraps.<BBom>lbQ().eq(BBom::getId,task.getBomId()));
             List<Productionresource> productionresources = productionresourceBizMapper.selectList(Wraps.<Productionresource>lbQ().like(Productionresource::getName,"立库"));
             List<Long> productionresourceIds = productionresources.stream().map(t->t.getId()).collect(Collectors.toList());
             List<ProductionresourcePosition> startProductionresourcePositions = productionresourcePositionMapper.selectList(Wraps.<ProductionresourcePosition>lbQ().in(ProductionresourcePosition::getResourceId, productionresourceIds));
             List<Long> startProductionresourcePositionIds = startProductionresourcePositions.stream().map(t->t.getStorgeId()).collect(Collectors.toList());
-
+            List<BomProcedureTray>trayList = procedureTrayService.list(Wraps.<BomProcedureTray>lbQ().in(BomProcedureTray::getProcedureId, task.getProcedureId()));
+            List<Long>trayIdList = trayList.stream().map(t->t.getId()).collect(Collectors.toList());
             // 判断夹具是否有可用的，查询330个库位信息中是否还有夹具
-            flikustockInfos = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().eq(StockInfo::getGoodsId,bom.getTrayId()).in(StockInfo::getStorgeId,startProductionresourcePositionIds).orderByAsc(StockInfo::getStorgeId));
+            flikustockInfos = stockInfoMapper.selectList(Wraps.<StockInfo>lbQ().in(StockInfo::getGoodsId,trayIdList).in(StockInfo::getStorgeId,startProductionresourcePositionIds).orderByAsc(StockInfo::getStorgeId));
 //            if(flikustockInfos.size() <= 0){
 //                map.put("result", false);
 //                map.put("msg", DictionaryKey.NodeException.RUNNING_FALSE);
@@ -410,7 +414,9 @@ public class RobotNodeServiceImpl implements NodeOperationService {
                         msgUtil.redis_set(DemoCacheKey.YUNJIAN_CAMP + "_" + DemoLineConstant.YUNJIAN_TARGET_XBK_FLAG + nextTaskNode.getId(), targetxbk, 1, TimeUnit.DAYS);
 
                         //满足条件--机器人空闲，设备或线边库有一个空闲
-                        dataMap.put("Data", startStore);
+                        Map locationMap = new HashMap();
+                        locationMap.put("location",startStore);
+                        dataMap.put("Data", locationMap);
                         dataMap.put("method", "MoveRobotPosition");
                     }
                     dataMap.put("result", po);

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/DictionaryKey.java

@@ -122,7 +122,8 @@ public interface DictionaryKey {
         {
             put("智能生产保障系统", "CT_01,CT_02,CT_03");
             put("框体类加工单元", "KT_01,KT_02,KT_03");
-            put("舱体类加工单元", "BZ_01,BZ_02,BZ_03");
+            put("舱体类加工单元", "BZ_02,BZ_03");
+            put("利库", "BZ_01");
 //            put("质量中心机器人", "Qxianbianku");
 //            put("智能单元机器人", "Zxianbianku");
 //            put("柔性线机器人","Rxianbianku");