呼叫agv自动绑定，pda解绑

pang.jiabao

2024-11-07 a489f1aeefb1cccea10c785a84d3d833b1eef648

 src/main/java/com/zy/common/web/WcsController.java

@@ -17,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
@@ -52,6 +53,71 @@
    private WorkService workService;
    @Autowired
    private StaDescService staDescService;


    @Transactional
    public synchronized StartupDto getLocNo3(@RequestBody SearchLocParam param){
        log.info("收到WCS拣料入库接口请求====>>入参:{}", param);
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("未找到任务");
        }
        StartupDto dto = new StartupDto();
        // 获取目标站
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", wrkMast.getIoType() - 50)
                .eq("stn_no", 31002) // 作业站点 = 拣料出库的目标站
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)){
            throw new CoolException("未找到站点路径");
        }
        if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
            try {
                // 保存工作明细档历史档
                if (wrkMastService.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作明细档历史档失败");
                }
                // 保存工作主档历史档
                if (wrkMastService.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                    throw new CoolException("保存工作主档历史档失败");
                }

                Date now = new Date();
                // 堆垛机站点(目标站)
                Integer staNo = staDesc.getCrnStn();
                // 更新工作档数据状态
                wrkMast.setIoTime(now);
                wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                wrkMast.setStaNo(staNo); // 目标站
                wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                wrkMast.setSourceLocNo(""); // 源库位清空
                wrkMast.setModiTime(now);
                if (!wrkMastService.updateById(wrkMast)) {
                    throw new CoolException("更新工作档数据状态失败");
                }
                // 更新明细档io_time (历史档关联使用）
                wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
                // 修改库位状态 Q.拣料/盘点/并板再入库
                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                locMast.setLocSts("Q");
                locMast.setModiTime(new Date());
                if (!locMastService.updateById(locMast)) {
                    throw new CoolException("修改库位状态失败");
                }
                dto.setWorkNo(wrkMast.getWrkNo());
                dto.setLocNo(wrkMast.getLocNo());
                return dto;
            } catch (Exception e) {
                throw new CoolException("出错");
            }
        }else {

        }
        return dto;
    }

    @PostMapping("/pakin2/loc/v1")
    @ResponseBody
@@ -211,48 +277,59 @@
        if (Cools.isEmpty(param.getSourceStaNo())) {
            return R.error("源站编号不能为空");
        }
        List<WaitPakin> waitPakins = null;
        if (param.getIoType() == 1) {
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }
            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
                if (wrkMast != null && wrkMast.getIoType() == 103) {
                    return R.parse(CodeRes.PICK_600);
        WrkMast wrkMastPakin = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", param.getBarcode())
                .in("io_type", 103,53)
                .eq("wrk_sts",14));
        if (!Cools.isEmpty(wrkMastPakin)){
            StartupDto locNo3 = getLocNo3(param);
            return R.ok(locNo3);
        }else {
            List<WaitPakin> waitPakins = null;
            if (param.getIoType() == 1) {
                if (Cools.isEmpty(param.getBarcode())) {
                    return R.error("条码不能为空");
                }
                return R.parse(CodeRes.NO_COMB_700);
                waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
                if (Cools.isEmpty(waitPakins)) {
                    WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
                    if (wrkMast != null && wrkMast.getIoType() == 103) {
                        return R.parse(CodeRes.PICK_600);
                    }
                    return R.parse(CodeRes.NO_COMB_700);
                }
                int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
                int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
                if (countLoc > 0 || countWrk > 0) {
                    return R.error(CodeRes.EXIST_500);
                }
            }
            int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
            int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
            if (countLoc > 0 || countWrk > 0) {
                return R.error(CodeRes.EXIST_500);
            if (Cools.isEmpty(param.getLocType1())){
                return R.error("高低检测信号不能为空");
            }
        }
        if (Cools.isEmpty(param.getLocType1())){
            return R.error("高低检测信号不能为空");

            // 源站点状态检测
            BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
            sourceStaNo.setLocType1(param.getLocType1());
            LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

            StartupDto dto = null;
            switch (param.getIoType()) {
                case 1://满托盘入库
                    assert waitPakins != null;
                    dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
                    break;
                case 10://空托盘入库
                    dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                    break;
                default:
                    break;
            }
            log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
            return R.ok().add(dto);
        }

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType1(param.getLocType1());
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
                assert waitPakins != null;
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            default:
                break;
        }
        log.info("WCS入库接口返参:{},托盘码:{}", dto, param.getBarcode());
        return R.ok().add(dto);
    }

    @PostMapping("/auto/emptyIn/v1")
@@ -401,7 +478,7 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setFullPlt(dto.getSourceStaNo() == 1025?"Y":"N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板