fix：优化刀具入库后是否自动进机床

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

@@ -1768,16 +1768,20 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         if(null == tray){
             return Lists.newArrayList();
         }
-        List<Long> productionresourceIds = productionresourceBizMapper.selectList(new LbqWrapper<Productionresource>().like(Productionresource::getCode,DictionaryKey.YJ_ZONE_XBK.get("plateAndClamp"))).stream().map(Productionresource::getId).collect(Collectors.toList());
+        List<Long> productionresourceIds = productionresourceBizMapper.selectList(new LbqWrapper<Productionresource>().like(Productionresource::getCode,DictionaryKey.YJ_ZONE_XBK.get("涡轴柔性加工单元"))).stream().map(Productionresource::getId).collect(Collectors.toList());
         //获取设备点位
         List<Long> startProductionresourcePositionIds = productionresourcePositionMapper.selectList(new LbqWrapper<ProductionresourcePosition>().in(ProductionresourcePosition::getResourceId, productionresourceIds).eq(ProductionresourcePosition::getStatus,"0")).stream().map(ProductionresourcePosition::getStorgeId).collect(Collectors.toList());
         //获取设备库位
         List<Long> stockIds = stockInfoMapper.selectList(new LbqWrapper<StockInfo>().in(StockInfo::getStorgeId,startProductionresourcePositionIds).eq(StockInfo::getGoodsType, "1").eq(StockInfo::getLockStatus, "1")).stream().map(StockInfo::getGoodsId).collect(Collectors.toList());
+
+        if(stockIds==null || stockIds.isEmpty()){
+            return null;
+        }
         //获取可用子盘
         List<Tray> trayList = trayService.list(new LbqWrapper<Tray>().eq(Tray::getCategoryType, tray.getCategoryType()).eq(Tray::getProductionType, tray.getProductionType()).eq(Tray::getFiveAxis, tray.getFiveAxis()).in(Tray::getId, stockIds));
 
         if(trayList.isEmpty() || trayList.size()==0){
-            throw new BizException("库存没有可用的子盘");
+            return null;
         }
         return trayList;
     }

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/TaskController.java

@@ -11,6 +11,7 @@ import com.github.zuihou.business.operationManagementCenter.entity.Plan;
 import com.github.zuihou.business.operationManagementCenter.entity.TTask;
 import com.github.zuihou.business.operationManagementCenter.service.PlanService;
 import com.github.zuihou.business.operationManagementCenter.service.TaskService;
+import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
@@ -257,7 +258,11 @@ public class TaskController extends SuperController<TaskService, Long, TTask, TT
     public R getValidTrayCount(@RequestBody Map<String,Object> map) {
         String clampNo = map.containsKey("clampNo")? map.get("clampNo").toString() : null;
         if(null == clampNo) return R.fail("数据传参有误");
-        return R.success(baseService.getValidTrayCount(map));
+        List<Tray> validTrayCount = baseService.getValidTrayCount(map);
+        if(validTrayCount ==null || validTrayCount.isEmpty()){
+            return R.fail("线边库没有工装可用，请耐心等待");
+        }
+        return R.success(validTrayCount);
     }
 
     /**