1

zhang

15 小时以前 0217aa8926e634606fa5a021eee5164fe0b1da4d

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

@@ -49,10 +49,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -1047,7 +1044,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);
@@ -1135,6 +1132,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) {
@@ -1204,6 +1208,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;
                    }
                }

@@ -1304,7 +1316,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);
@@ -2069,8 +2081,9 @@
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, led.getDevpPlcId());
            // 命令集合
            List<LedCommand> commands = new ArrayList<>();
            // 工作档集合
            List<WrkMast> wrkMasts = new ArrayList<>();
//            // 工作档集合
//            List<WrkMast> wrkMasts = new ArrayList<>();
            List<Integer> workNoList = new ArrayList<>();
            for (Integer staNo : led.getStaArr()) {
                // 获取叉车站点
                StaProtocol staProtocol = devpThread.getStation().get(staNo);
@@ -2079,6 +2092,13 @@
                } else {
                    staProtocol = staProtocol.clone();
                }
                Integer wrkNo = null;
                Integer ioType = null;
                Integer targetStaNo = null;
                String sourceLocNo = null;
                String locNo = null;
                String barcode = null;

                // 获取工作档数据
                WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
//                if (null == wrkMast || wrkMast.getWrkSts() < 14 || wrkMast.getIoType() < 100) { continue; }
@@ -2092,17 +2112,28 @@
                    }

                    WrkMastLog wrkMastLog = wrkMastLogs.get(0);
                    wrkMast = new WrkMast();
                    wrkMast.sync(wrkMastLog);
                    wrkNo = wrkMastLog.getWrkNo();
                    ioType = wrkMastLog.getIoType();
                    sourceLocNo = wrkMastLog.getSourceLocNo();
                    locNo = wrkMastLog.getLocNo();
                    targetStaNo = wrkMastLog.getStaNo();
                    barcode = wrkMastLog.getBarcode();
                }else {
                    wrkNo = wrkMast.getWrkNo();
                    ioType = wrkMast.getIoType();
                    sourceLocNo = wrkMast.getSourceLocNo();
                    locNo = wrkMast.getLocNo();
                    targetStaNo = wrkMast.getStaNo();
                    barcode = wrkMast.getBarcode();
                }
                News.warnNoLog("" + mark + " - 0" + " - 开始执行:出库  ===>> 工作档信息写入led显示器");
                wrkMasts.add(wrkMast);
                workNoList.add(wrkNo);
                // 组装命令
                LedCommand ledCommand = new LedCommand();
                ledCommand.setWorkNo(wrkMast.getWrkNo());
                ledCommand.setIoType(wrkMast.getIoType());
                ledCommand.setWorkNo(wrkNo);
                ledCommand.setIoType(ioType);
                // 出库模式
                switch (wrkMast.getIoType()) {
                switch (ioType) {
                    case 1:
                        ledCommand.setTitle("全板入库");
                        break;
@@ -2135,30 +2166,16 @@
                        ledCommand.setTitle("并板入库");
                        break;
                    default:
                        News.error("" + mark + " - 1" + " - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkMast.getWrkNo(), wrkMast.getIoType());
                        News.error("" + mark + " - 1" + " - 任务入出库类型错误！！！[工作号：{}] [入出库类型：{}]", wrkNo, ioType);
                        break;
                }
                ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
                ledCommand.setLocNo(wrkMast.getLocNo());
                ledCommand.setStaNo(wrkMast.getStaNo());
                ledCommand.setBarcode(wrkMast.getBarcode());
                ledCommand.setSourceLocNo(sourceLocNo);
                ledCommand.setLocNo(locNo);
                ledCommand.setStaNo(targetStaNo);
                ledCommand.setBarcode(barcode);
//                ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());
//                    try{
//                        if (wrkMast.getIoType()>100){
//                            for (WrkDetl wrkDetl : wrkDetls){
//                                LocDetl locDetl = locDetlService.selectMatnrSpecs(wrkDetl.getMatnr(), wrkDetl.getSpecs(), wrkMast.getSourceLocNo());
//                                wrkDetl.setWeight(locDetl.getAnfme());
//                            }
//                        }else {
//                            for (WrkDetl wrkDetl : wrkDetls){
//                                wrkDetl.setWeight(wrkDetl.getAnfme());
//                            }
//                        }
//                    }catch (Exception e){
//                        log.error("工作档案明细输入电视机失败1：异常信息==》"+e);
//                    }
                if (ioType != 110 && ioType != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkNo);

                    if (!wrkDetls.isEmpty()) {
                        WrkDetl wrkDetl = wrkDetls.get(0);
@@ -2199,24 +2216,8 @@
                                , wrkDetl.getCstateid$()
                        ));

//                        wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
//                                wrkDetl.getMatnr()
//                                , wrkDetl.getMaktx()
//                                , wrkDetl.getAnfme()
//                                , wrkDetl.getWeight()
//                                , wrkDetl.getStockNum()
//                                , wrkDetl.getStockNum2()
//                                , wrkDetl.getSpecs()
//                                , wrkDetl.getSku()
//                                , wrkDetl.getZpallet()
//                                , wrkDetl.getModel()
//                                , wrkDetl.getSupp()
//                                , wrkDetl.getKpCstmrName()
//                                , wrkDetl.getOrderNo()
//                                , wrkDetl.getCstateid$()
//                        )));
                    }else {
                        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkMast.getWrkNo());
                        List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectTodayByWrkNo(wrkNo);
                        if(!wrkDetlLogs.isEmpty()) {
                            WrkDetlLog wrkDetlLog = wrkDetlLogs.get(0);

@@ -2230,7 +2231,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) {
@@ -2262,7 +2263,7 @@
                }
                commands.add(ledCommand);
            }
            Set<Integer> workNos = wrkMasts.stream().map(WrkMast::getWrkNo).collect(Collectors.toSet());
            Set<Integer> workNos = new HashSet<>(workNoList);
            // 获取LED线程
            LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, led.getId());
            // 相同工作号集合则过滤
@@ -2300,12 +2301,15 @@

            try {
                // 修改主档led标记
                for (WrkMast wrkMast : wrkMasts) {
                    wrkMast.setOveMk("Y");
                    wrkMast.setModiTime(new Date());
                    if (wrkMastMapper.updateById(wrkMast) == 0) {
                        News.errorNoLog("" + mark + " - 4" + " - 更新工作档失败");
                        throw new CoolException("更新工作档失败");
                for (Integer wrkNo : workNoList) {
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
                    if (wrkMast != null) {
                        wrkMast.setOveMk("Y");
                        wrkMast.setModiTime(new Date());
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            News.errorNoLog("" + mark + " - 4" + " - 更新工作档失败");
                            throw new CoolException("更新工作档失败");
                        }
                    }
                }

@@ -2440,8 +2444,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());
@@ -2449,8 +2452,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);
@@ -2470,6 +2478,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")) {