#

lsh

2023-01-31 1192076b6eca2e4d96bc0647b8e9e76819e29612

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -304,10 +304,20 @@
                        case 104:
                        case 108:
                            staNo = 103;
                            BasDevp basDevp1 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                                    .eq("dev_no", 104).or().eq("dev_no", 108).or().eq("dev_no", 109).eq("loading", "Y"));
                            if (!Cools.isEmpty(basDevp1)){
                                continue;
                            }
                            break;
                        case 204:
                        case 208:
                            staNo = 203;
                            BasDevp basDevp2 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                                    .eq("dev_no", 204).or().eq("dev_no", 208).or().eq("dev_no", 209).eq("loading", "Y"));
                            if (!Cools.isEmpty(basDevp2)){
                                continue;
                            }
                            break;
                        default:
                            News.error("{}任务再入库失败，系统数据异常！", wrkMast.getWrkNo());
@@ -987,6 +997,14 @@
                continue;
            }

            if (wrkMast.getWrkSts() == 11 && (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107)){
                Integer sour = wrkMast.getStaNo();
                List<WrkMast> wrkMasts = wrkMastMapper.selectWrkStsAndIoType(sour);
                if (wrkMasts.size()!=0){
                    continue;
                }
            }

            // 判断是否已存在小车绑定任务
            BasSte basSte = basSteService.findByCrnNo(wrkMast.getCrnNo());
            if(basSte == null) continue;