#

Junjie

昨天 e2cfde7a91a65fda94b83f4a399f7a57a5871345

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

@@ -708,9 +708,14 @@
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                            .eq("loc_no", wrkMast.getSourceLocNo()));

                    short staNo = wrkMast.getStaNo().shortValue();
                    if (wrkMast.getStaNo() == 1004) {
                        staNo = 2003;
                    }

                    // 下发站点信息
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    staProtocol.setStaNo(staNo);
                    staProtocol.setPalletSize(locMast.getLocType2());
                    if (!MessageQueue.offer(SlaveType.Devp, devpId, new Task(2, staProtocol))) {
                        continue;
@@ -1044,7 +1049,7 @@
                    News.warn("" + mark + " - 1" + " - 12" + " - // F、D  库位={},库位状态={}", shallowLoc.getLocNo(), shallowLoc.getLocSts());
                    // 此标记避免多次执行移库任务
                    if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())) {
                        if (moveLocForDeepLoc(slave, shallowLoc, mark)) {
                        if (moveLocForDeepLoc(slave, crnProtocol, shallowLoc, mark)) {
                            wrkMast.setUpdMk("Y");
                            wrkMast.setIoPri(14D);
                            wrkMastMapper.updateById(wrkMast);
@@ -1132,6 +1137,13 @@
            devpCheckTaskStackOver = Integer.parseInt(config2.getValue());
        }

        int outNumber = 13;
        Config config3 = configService.selectOne(new EntityWrapper<Config>()
                .eq("code", "fullBoardOutboundNumber"));
        if (config3 != null) {
            outNumber = Integer.parseInt(config3.getValue());
        }


        Integer devpWorkingCount = commonService.queryDevpWorkingCount();
        if (devpWorkingCount > devpTaskStackOver) {
@@ -1201,6 +1213,14 @@
                            News.error("" + mark + " - 2" + " - 检测存在1062站点，存在两笔工作中的任务，工作号={}" + wrkMast.getWrkNo());
                            continue;
                        }
                    }
                }else if (wrkMast.getIoType() == 101) {
                    List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
                            .in("wrk_sts", 12, 14)
                    );
                    if (!Cools.isEmpty(inWrkMasts) && inWrkMasts.size() >= outNumber) {
                        News.error("" + mark + " - 4" + " - 检测到全板出库的任务已经到达上线，工作号={}" + wrkMast.getWrkNo());
                        continue;
                    }
                }

@@ -1301,7 +1321,7 @@
//                            if (Cools.isEmpty(wrkMast.getUpdMk()) || "N".equals(wrkMast.getUpdMk())
//                                || Cools.isEmpty(waitWrkMast)) {
                            if (Cools.isEmpty(waitWrkMast)) {
                                if (moveLocForDeepLoc(slave, shallowLoc, mark)) {
                                if (moveLocForDeepLoc(slave, crnProtocol, shallowLoc, mark)) {
                                    wrkMast.setUpdMk("Y");
//                                    wrkMast.setIoPri(14D);
                                    wrkMastMapper.updateById(wrkMast);
@@ -2202,7 +2222,7 @@
                        ));

                    }else {
                        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkMast.getWrkNo());
                        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkNo);
                        if(!wrkDetlLogs.isEmpty()) {
                            WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);

@@ -2216,7 +2236,7 @@
                            }

                            List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
                                    .eq("loc_no", wrkMast.getSourceLocNo()));
                                    .eq("loc_no", sourceLocNo));
                            double totalAnfme = 0D;
                            double totalWeight = 0D;
                            for (LocDetl locDetl : locDetls) {
@@ -2429,8 +2449,7 @@
     * 因双深库位阻塞，对浅库位进行移转（立即执行版)
     * tip：同步
     */
    private synchronized boolean moveLocForDeepLoc(CrnSlave crn, LocMast shallowLoc, Integer mark) {

    private synchronized boolean moveLocForDeepLoc(CrnSlave crn, CrnProtocol crnProtocol, LocMast shallowLoc, Integer mark) {
        try {
            News.warnNoLog("" + mark + "moveLocForDeepLoc" + " - 0" + " - 开始执行:因双深库位阻塞，对浅库位进行移转（立即执行版)");
            List<Integer> rows = locMastService.queryDistinctRow(crn.getId());
@@ -2438,8 +2457,13 @@
            for (Integer row : rows) {
                if (Utils.isDeepLoc(slaveProperties, row)) {
                    loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

                    if (loc != null) {
                        if (crn.getId() == 1) {
                            if (Utils.getLaneByLocNo(loc.getLocNo()) != crnProtocol.getCrnLane()) {
                                continue;
                            }
                        }

                        if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
                            String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
                            LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
@@ -2459,6 +2483,12 @@
                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());

                        if (null != loc) {//对应深库位非在库状态,不能移库
                            if (crn.getId() == 1) {
                                if (Utils.getLaneByLocNo(loc.getLocNo()) != crnProtocol.getCrnLane()) {
                                    continue;
                                }
                            }

                            String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
                            LocMast deepLoc1 = locMastService.selectById(deepLoc);
                            if (!deepLoc1.getLocSts().equals("F") && !deepLoc1.getLocSts().equals("D")) {