#

luxiaotao1123

2022-09-26 64da17c397d02f8b1d19b9c46134eb8469957c46

#

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -31,4 +31,7 @@
    @Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
    Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);

    @Select("select loc_no from asr_loc_mast where crn_no = #{crnNo} order by lev1, bay1, row1")
    List<String> getDemoNextLoc(Integer crnNo);

}

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -58,4 +58,5 @@
     */
    Boolean isOutMost(String locNo);

    List<String> getDemoNextLoc(Integer crnNo);
}

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

@@ -58,4 +58,9 @@
        return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
    }

    @Override
    public List<String> getDemoNextLoc(Integer crnNo) {
        return this.baseMapper.getDemoNextLoc(crnNo);
    }

}

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

@@ -43,10 +43,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;

/**
@@ -2222,21 +2219,82 @@
    }


    public List<String> crn1DemoLocs = new ArrayList<String>(); public String crn1LastLoc = "";
    public List<String> crn2DemoLocs = new ArrayList<String>(); public String crn2LastLoc = "";
    public List<String> crn3DemoLocs = new ArrayList<String>(); public String crn3LastLoc = "";
    public synchronized void demo() {
        for (CrnSlave crn : slaveProperties.getCrn()) {
            // 获取堆垛机信息
            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) {
                continue;
        if (Cools.isEmpty(crn1DemoLocs)) {
            crn1DemoLocs = locMastService.getDemoNextLoc(1);
            }
            BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
            if (basCrnp == null) {
                log.error("{}号堆垛机尚未在数据库进行维护！", crn.getId());
        if (Cools.isEmpty(crn2DemoLocs)) {
            crn2DemoLocs = locMastService.getDemoNextLoc(2);
        }
        if (Cools.isEmpty(crn3DemoLocs)) {
            crn3DemoLocs = locMastService.getDemoNextLoc(3);
        }
        for (CrnSlave crn : slaveProperties.getCrn()) {
            if (!crn.getDemo()) {
                continue;
            }   // 必须为演示状态

//            CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
//            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
//            if (crnProtocol == null) {
//                continue;
//            }

            // 只有当堆垛机空闲 并且 无任务时才继续执行
//            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {

                String locNo = null;
                Iterator<String> iterator = crn1DemoLocs.iterator();
                if (crn.getId() == 1) {
                    iterator = crn1DemoLocs.iterator();
                } else if (crn.getId() == 2) {
                    iterator = crn2DemoLocs.iterator();
                } else if (crn.getId() == 3) {
                    iterator = crn3DemoLocs.iterator();
                }
                while (iterator.hasNext()) {
                    String next = iterator.next();
                    String lastLoc = "";
                    if (crn.getId() == 1) {
                        lastLoc = crn1LastLoc;
                    } else if (crn.getId() == 2) {
                        lastLoc = crn2LastLoc;
                    } else if (crn.getId() == 3) {
                        lastLoc = crn3LastLoc;
                    }
                    if (!Cools.isEmpty(lastLoc)) {
                        if (!lastLoc.substring(2, 7).equals(next.substring(2, 7)) || !Utils.getGroupRow(lastLoc).equals(Utils.getGroupRow(next))) {
                            locNo = next;
                            iterator.remove();
                            break;
                        } else {
                            iterator.remove();
                        }
                    } else {
                        locNo = next;
                        iterator.remove();
                        break;
            }

        }
                if (!Cools.isEmpty(locNo)) {
                    if (crn.getId() == 1) {
                        crn1LastLoc = locNo;
                    } else if (crn.getId() == 2) {
                        crn2LastLoc = locNo;
                    } else if (crn.getId() == 3) {
                        crn3LastLoc = locNo;
                    }
                }

                log.info("{}号堆垛机对{}库位进行演示", crn.getId(), locNo);

            }

//        }
    }

    /**
@@ -2250,77 +2308,79 @@
            CrnProtocol crnProtocol = crnThread.getCrnProtocol();
            if (crnProtocol == null) { continue; }

            log.info("{}号堆垛机正在演示", crn.getId());

            // 只有当堆垛机空闲 并且 无任务时才继续执行
            if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
                // 获取移库工作档信息
                WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getId());
                if (null != wrkMast) { continue; }

                LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
                LocMast loc = locMastService.queryDemoLoc(crn.getId());
                if (null == sourceLoc || null == loc) { continue; }

                String sourceLocNo = sourceLoc.getLocNo();
                String locNo = loc.getLocNo();

                // 获取工作号
                int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
                // 保存工作档
                wrkMast = new WrkMast();
                wrkMast.setWrkNo(workNo);
                wrkMast.setIoTime(new Date());
                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
                wrkMast.setIoType(11); // 入出库状态： 11.库格移载
                wrkMast.setIoPri(13D);
                wrkMast.setCrnNo(crn.getId());
                wrkMast.setSourceLocNo(sourceLocNo); // 源库位
                wrkMast.setLocNo(locNo); // 目标库位
                wrkMast.setFullPlt("N"); // 满板：Y
                wrkMast.setPicking("N"); // 拣料
                wrkMast.setExitMk("N"); // 退出
                wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
                wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
                wrkMast.setLinkMis("N");
                wrkMast.setAppeTime(new Date());
                wrkMast.setModiTime(new Date());
                int res = wrkMastMapper.insert(wrkMast);
                if (res == 0) {
                    throw new CoolException("保存工作档失败");
                }
                // 工作档明细保存
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
                for (LocDetl locDetl : locDetls) {
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(locDetl);
                    wrkDetl.setWrkNo(workNo);
                    wrkDetl.setIoTime(new Date());
                    wrkDetl.setAnfme(locDetl.getAnfme());
                    wrkDetl.setAppeTime(new Date());
                    wrkDetl.setModiTime(new Date());
                    if (!wrkDetlService.insert(wrkDetl)) {
                        throw new CoolException("保存工作档明细失败");
                    }
                }
                // 修改源库位状态
                if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
                    sourceLoc.setLocSts("R"); // R.出库预约
                    sourceLoc.setModiTime(new Date());
                    if (!locMastService.updateById(sourceLoc)){
                        throw new CoolException("更新源库位状态失败");
                    }
                } else {
                    throw new CoolException("源库位出库失败");
                }
                // 修改目标库位状态
                if (loc.getLocSts().equals("O")) {
                    loc.setLocSts("S"); // S.入库预约
                    loc.setModiTime(new Date());
                    if (!locMastService.updateById(loc)) {
                        throw new CoolException("更新目标库位状态失败");
                    }
                } else {
                    throw new CoolException("移转失败");
                }
//                // 获取移库工作档信息
//                WrkMast wrkMast = wrkMastMapper.selectLocMove(crn.getId());
//                if (null != wrkMast) { continue; }
//
//                LocMast sourceLoc = locMastService.queryDemoSourceLoc(crn.getId());
//                LocMast loc = locMastService.queryDemoLoc(crn.getId());
//                if (null == sourceLoc || null == loc) { continue; }
//
//                String sourceLocNo = sourceLoc.getLocNo();
//                String locNo = loc.getLocNo();
//
//                // 获取工作号
//                int workNo = commonService.getWorkNo(WorkNoType.PICK.type);
//                // 保存工作档
//                wrkMast = new WrkMast();
//                wrkMast.setWrkNo(workNo);
//                wrkMast.setIoTime(new Date());
//                wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
//                wrkMast.setIoType(11); // 入出库状态： 11.库格移载
//                wrkMast.setIoPri(13D);
//                wrkMast.setCrnNo(crn.getId());
//                wrkMast.setSourceLocNo(sourceLocNo); // 源库位
//                wrkMast.setLocNo(locNo); // 目标库位
//                wrkMast.setFullPlt("N"); // 满板：Y
//                wrkMast.setPicking("N"); // 拣料
//                wrkMast.setExitMk("N"); // 退出
//                wrkMast.setEmptyMk(sourceLoc.getLocSts().equals("D")?"Y":"N"); // 空板
//                wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
//                wrkMast.setLinkMis("N");
//                wrkMast.setAppeTime(new Date());
//                wrkMast.setModiTime(new Date());
//                int res = wrkMastMapper.insert(wrkMast);
//                if (res == 0) {
//                    throw new CoolException("保存工作档失败");
//                }
//                // 工作档明细保存
//                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocNo));
//                for (LocDetl locDetl : locDetls) {
//                    WrkDetl wrkDetl = new WrkDetl();
//                    wrkDetl.sync(locDetl);
//                    wrkDetl.setWrkNo(workNo);
//                    wrkDetl.setIoTime(new Date());
//                    wrkDetl.setAnfme(locDetl.getAnfme());
//                    wrkDetl.setAppeTime(new Date());
//                    wrkDetl.setModiTime(new Date());
//                    if (!wrkDetlService.insert(wrkDetl)) {
//                        throw new CoolException("保存工作档明细失败");
//                    }
//                }
//                // 修改源库位状态
//                if (sourceLoc.getLocSts().equals("D") || sourceLoc.getLocSts().equals("F")) {
//                    sourceLoc.setLocSts("R"); // R.出库预约
//                    sourceLoc.setModiTime(new Date());
//                    if (!locMastService.updateById(sourceLoc)){
//                        throw new CoolException("更新源库位状态失败");
//                    }
//                } else {
//                    throw new CoolException("源库位出库失败");
//                }
//                // 修改目标库位状态
//                if (loc.getLocSts().equals("O")) {
//                    loc.setLocSts("S"); // S.入库预约
//                    loc.setModiTime(new Date());
//                    if (!locMastService.updateById(loc)) {
//                        throw new CoolException("更新目标库位状态失败");
//                    }
//                } else {
//                    throw new CoolException("移转失败");
//                }

            }


 src/main/java/com/zy/core/MainProcess.java

@@ -39,6 +39,9 @@
                        continue;
                    }

                    // 演示
                    mainService.demo();


                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
@@ -63,10 +66,6 @@
                    mainService.ledReset();
                    // 穿梭车 ===>> 小车电量检测充电
                    mainService.loopSteCharge();


                    // 演示
                    mainService.demo();

                } catch (Exception e) {
                    e.printStackTrace();