#

tqs

2023-02-02 996926db15b776bc3fd01837f317976e3e74b6cf

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

@@ -115,23 +115,25 @@
                Short workNo = staProtocol.getWorkNo();

                //20230201. 2号堆垛机有出库任务时，禁止新板入库
                if ( inSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
                    //有出库任务，退库到入库口
                    staProtocol.setWorkNo((short) 9999);
                    staProtocol.setStaNo((short)100);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    News.error("MainServiceImpl  generateStoreWrkFile"+"103为出库模式，禁止入库，退回入库口。！！！");
                    continue;
                }
                if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
                    //有出库任务，退库到入库口
                    staProtocol.setWorkNo((short) 9999);
                    staProtocol.setStaNo((short)200);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    News.error("MainServiceImpl  generateStoreWrkFile"+"203为出库模式，禁止入库，退回入库口。！！！");
                    continue;
                if (staProtocol.isLoading() && staProtocol.getWorkNo() == 9995) {
                    if ( inSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
                        //有出库任务，退库到入库口
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo((short)100);
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        News.error("MainServiceImpl  generateStoreWrkFile"+"103为出库模式，禁止入库，退回入库口。！！！");
                        continue;
                    }
                    if ( inSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
                        //有出库任务，退库到入库口
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo((short)200);
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        News.error("MainServiceImpl  generateStoreWrkFile"+"203为出库模式，禁止入库，退回入库口。！！！");
                        continue;
                    }
                }

                // 判断是否满足入库条件
@@ -836,7 +838,7 @@
            WrkMast one = wrkMastMapper.selectLocMoveData(slave.getId());
            if(!Cools.isEmpty(one)){
                News.error("入库 ===>> 存在移库未完成任务，不能入库。移库任务号={},堆垛机号={}", one.getWrkNo(), slave.getId());
                continue;
//                continue;
            }

            // 获取工作状态为 2,3,4,5,6 的入库工作档
@@ -1128,7 +1130,9 @@
                                    if (wrkMastMapper.updateById(waitWrkMast) == 0) {
                                        News.error("调整工作档优先级失败！工作号={}", waitWrkMast.getWrkNo());
                                    }
                                    flag = true;
                                    if (waitWrkMast.getWrkSts() != 17) {
                                        flag = true;
                                    }
                                    break;
                                }
                            }
@@ -1581,7 +1585,7 @@
                    if(deepLoc != null && !deepLoc.getLocSts().equals("F")
                            && !deepLoc.getLocSts().equals("D")
                            && !deepLoc.getLocSts().equals("O")
                            && (waitWrkMast!=null && waitWrkMast.getWrkSts()<17)){
                            && (waitWrkMast!=null && waitWrkMast.getWrkSts()<18)){
                        News.error("移库再回库时，深库位组深库位状态为作业中 ===>> deepLoc={},loc_sts={}", deepLoc.getLocNo(), deepLoc.getLocSts());
                        flag = true;
                        break;
@@ -3244,23 +3248,25 @@
                }

                //20230201. 2号堆垛机有出库任务时，禁止新板入库
                if ( emptyInSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
                    //有出库任务，退库到入库口
                    staProtocol.setWorkNo((short) 9999);
                    staProtocol.setStaNo((short)100);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    News.error("MainServiceImpl  storeEmptyPlt"+"103为出库模式，禁止入库，退回入库口。！！！");
                    continue;
                }
                if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
                    //有出库任务，退库到入库口
                    staProtocol.setWorkNo((short) 9999);
                    staProtocol.setStaNo((short)200);
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    News.error("MainServiceImpl  storeEmptyPlt"+"203为出库模式，禁止入库，退回入库口。！！！");
                    continue;
                if (staProtocol.isLoading() && staProtocol.getWorkNo() == 9995) {
                    if ( emptyInSta.getStaNo()==103 && devpThread.ioModeOf1F == IoModeType.PAKOUT_MODE) {
                        //有出库任务，退库到入库口
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo((short)100);
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        News.error("MainServiceImpl  storeEmptyPlt"+"103为出库模式，禁止入库，退回入库口。！！！");
                        continue;
                    }
                    if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
                        //有出库任务，退库到入库口
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo((short)200);
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        News.error("MainServiceImpl  storeEmptyPlt"+"203为出库模式，禁止入库，退回入库口。！！！");
                        continue;
                    }
                }

                // 站点条件判断
@@ -3838,8 +3844,18 @@
                if(Utils.getGroupRow(one.getLocNo()) != Utils.getGroupRow(shallowLoc.getLocNo())
                    || Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
                    || Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){
                    loc = one;
                    break;

                    boolean success = true;
                    List<String> insideLoc = Utils.getGroupInsideLoc(one.getLocNo());
                    for (String inside : insideLoc) {
                        if (!locMastService.selectById(inside).getLocSts().equals("O")) {
                            success = false; break;
                        }
                    }
                    if (success) {
                        loc = one;
                        break;
                    }
                }
            }