限制优化

pjb

16 小时以前 2e5837667e60378a06c7d8d1a4b095c4ba6e2d06

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

@@ -326,7 +326,7 @@
    /**
     * 罐装线要桶数量减少
     */
    private void decreaseWantBucketCount(int site, int decrease) throws InterruptedException {
    private synchronized void decreaseWantBucketCount(int site, int decrease) throws InterruptedException {

        int siteNew;
        switch (site) {
@@ -363,6 +363,7 @@
        }

        log.info("自动出空桶减少罐装线要桶数成功，站点：{}，减少前：{}，减少数：{}，剩余要桶数：{}", site, count, decrease, remaining);
        Thread.sleep(700);
    }

    /**
@@ -1339,6 +1340,7 @@
                    wrkMast.setWorkNoOther(0); // 清空另一个任务号
                    // 修改成功后复位堆垛机
                    if (wrkMastMapper.updateById(wrkMast) > 0) {
                        log.info("{}号堆垛机任务完成，申请复位，任务号：{}",crnProtocol.getCrnNo(),crnProtocol.getTaskNo());
                        // 堆垛机复位
                        News.warnNoLog(""+mark+" - 2"+" - 修改成功后复位堆垛机 : 堆垛机号={}",crnThread.getCrnProtocol().getCrnNo());
                        crnThread.setResetFlag(true);
@@ -2215,7 +2217,8 @@
                    wrkMast.setWrkSts(15L);
                    wrkMast.setModiTime(new Date());
                    wrkMastService.updateById(wrkMast);
                } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035 || wrkMast.getStaNo() == 1024)) {
                } else if(wrkMast.getIoType() == 110 && (wrkMast.getStaNo() == 1002 || wrkMast.getStaNo() == 1020 ||wrkMast.getStaNo() == 1035
                        || wrkMast.getStaNo() == 1024 || wrkMast.getStaNo() == 1016|| wrkMast.getStaNo() == 1043)) {
                    if(wrkMast.getWrkSts() != 2 ){
                        log.warn("rgv放货完成110，rgv未复位:rgv号{}，任务号：{}，任务状态{}",wrkMast.getRgvNo(),wrkMast.getWrkNo(),wrkMast.getWrkSts());
                        continue;
@@ -2319,7 +2322,7 @@
                }

                // 站点条件判断
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.getWorkNo() == 0) {
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.getWorkNo() == 0 && staProtocol.isHigh()) {
                    if(site == 1019 && staProtocol.getHideWorkNo() != 0) {
                        WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getHideWorkNo()));
                        if(wrkMast1 != null && wrkMast1.getWrkSts() != 15) {
@@ -2327,6 +2330,10 @@
                            continue;
                        }
                    }
                    int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 10).eq("source_sta_no", site));
                    if (count >= 2) {
                        News.warn("限制{}空母托叠盘入库数小于2，当前：{}", site, count);
                    }
                    try {
                        SearchLocParam param = new SearchLocParam();
                        param.setIoType(10);