#

Administrator

昨天 16bd33b89e43278a1080a5f322356675522c84ee

 src/main/java/com/zy/asrs/task/WorkMastScheduler.java

@@ -106,16 +106,16 @@
                    }
                    Integer crnNo = wrkMast.getCrnNo();
                    //如果任务是移库任务时：该堆垛机已经下发任务给wcs后不再下发新的搬运任务
                    if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
                        if (!Cools.isEmpty(locMast)) {
                            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
                            if (!wrkMasts1.isEmpty()) {
                                continue;
                            }
                        }

                    }
//                    if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getLocNo())){
//                        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no", crnNo).eq("loc_no", wrkMast.getLocNo()));
//                        if (!Cools.isEmpty(locMast)) {
//                            List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", 12L,13L,14L));
//                            if (!wrkMasts1.isEmpty()) {
//                                continue;
//                            }
//                        }
//
//                    }

                    //源库位为冻结库位时禁止下发搬运任务给堆垛机
                    if (!Cools.isEmpty(wrkMast.getSourceLocNo())) {
@@ -137,12 +137,23 @@
                        }
                    }

                    //每个堆垛机只允许下发一个空托盘任务
                    if(wrkMast.getIoType()==110){
                        List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 110).in("wrk_sts", 12));
                        if (!wrkMasts1.isEmpty()) {
                            continue;
                        }
                    }

                    String wcsSourceLocNo = Cools.isEmpty(wrkMast.getSourceLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getSourceLocNo());
                    String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
                    Integer taskPri = wrkMast.getIoPri() == null ? null : wrkMast.getIoPri().intValue();
                    WorkTaskParams params = new WorkTaskParams();
                    //出库和移库
                    if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && !Cools.isEmpty(wrkMast.getStaNo()) && !wrkMast.getStaNo().equals("0")) {
//                        if(wrkMast.getIsSuplus() != null){
//                            wcsLocNo = wcsSourceLocNo;
//                        }
                        params.setType("out")
                                .setTaskNo(wrkMast.getWrkNo() + "")
                                .setSourceLocNo(wcsSourceLocNo)