优化自动移库逻辑及调拨信息上报

zhangc

2025-01-01 6cfcb307f01b9550b6cd67321f2c1db345b4da19

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

@@ -21,7 +21,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -122,10 +121,10 @@

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
            case 1://满货架入库
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins, 2);
                break;
            case 10://空托盘入库
            case 10://空货架入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(), 2);
                break;
            case 103:// 拣料入库
@@ -138,7 +137,7 @@
            default:
                break;
        }
        log.info("/pakin/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        log.info("/pakin/loc/v1:"+dto + "======货架码:"+param.getBarcode());
        return R.ok().add(dto);
    }

@@ -200,10 +199,10 @@

        StartupDto dto = null;
        switch (param.getIoType()) {
            case 1://满托盘入库
            case 1://满货架入库
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mats, waitPakins);
                break;
            case 10://空托盘入库
            case 10://空货架入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                break;
            case 103:// 拣料入库
@@ -214,7 +213,7 @@
            default:
                break;
        }
        log.info("/pakin/loc/v1:"+dto + "======托盘码:"+param.getBarcode());
        log.info("/pakin/loc/v1:"+dto + "======货架码:"+param.getBarcode());
        return R.ok().add(dto);
    }

@@ -256,13 +255,13 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setBarcode(barcode); // 托盘码
        wrkMast.setBarcode(barcode); // 货架码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 货架类型
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
@@ -368,7 +367,7 @@
        wrkMast.setLinkMis("Y");
        wrkMast.setBarcode(barcode);
//        wrkMast.setSteNo(findSte(wrkMast.getLocNo()));
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 容器类型
        wrkMast.setCtnType(sourceStaNo.getCtnType()); // 货架类型
        // 操作人员数据
        wrkMast.setAppeTime(new Date());
        wrkMast.setModiTime(new Date());
@@ -490,7 +489,7 @@
            }

            List<LocDetl> locDetls1 = locDetlService.selectByLocNo(locMast.getLocNo());
            log.info("工作号：" + wrkMast.getWrkNo() + "，托盘码：" + wrkMast.getBarcode() + "，修改库位状态O=>Q成功，库存明细：" + JSON.toJSONString(locDetls1));
            log.info("工作号：" + wrkMast.getWrkNo() + "，货架码：" + wrkMast.getBarcode() + "，修改库位状态O=>Q成功，库存明细：" + JSON.toJSONString(locDetls1));
        } else {
            throw new CoolException(dto.getLocNo() + "目标库位已被占用");
        }
@@ -579,7 +578,7 @@

        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
            throw new CoolException("货架码为空");
        }

        if(!Character.isDigit(containerCode.charAt(0))){
@@ -591,14 +590,12 @@
        if(Cools.isEmpty(agvBasDevp) || !"O".equals(agvBasDevp.getLocSts())){
            throw new CoolException("当前站点不存在或者站点不为空");
        }

        AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectByContainerCode(containerCode);
        AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("barcode", containerCode));

        //拣料、盘点完成任务
        if(!Cools.isEmpty(agvWrkMast) && (agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107) && agvWrkMast.getWrkSts() == 205){
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());

            //生成拣料、盘点再入库任务
            List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
@@ -613,7 +610,7 @@
        //入库任务
        if (!Cools.isEmpty(agvWaitPakinService.selectByContainerCode(containerCode))){
            //绑定站点
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode);
            agvBasDevpService.updateLocStsAndBarcodeByDevNo(param.getDevNo(),"F",containerCode,agvWrkMast.getWhsType().shortValue());
            //生成工作档
            List<AgvBasDevp> agvBasDevpList = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("dev_no", param.getDevNo()));
            agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, null, true);
@@ -621,7 +618,7 @@
            return R.ok();
        }

        return R.error("没有查询到该料箱信息");
        return R.error("没有查询到该货架信息");

    }

@@ -633,9 +630,10 @@
            currentContainerMap = new HashMap<>();
        }

        String containerCode = param.getContainerCode();
        String containerCode = param.getContainerCode().split(";")[0];

        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
            throw new CoolException("货架码为空");
        }

        if(!Character.isDigit(containerCode.charAt(0))){
@@ -646,24 +644,28 @@
        String devNo = param.getDevNo();
        String currentContainerCode = currentContainerMap.get(devNo);

        //判断容器是否发生变化
        //判断货架是否发生变化
        if(!Cools.isEmpty(currentContainerCode) && !Cools.eq(containerCode,currentContainerCode)){
            //查询旧容器的工作档
            //查询旧货架的工作档
            AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(currentContainerCode);
            if(!Cools.isEmpty(agvWrkMast) && agvWrkMast.getIoType() == 101){
                //发送容器立场请求，完成工作档
                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
                agvWrkMastList.add(agvWrkMast);
                try {
                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
                    if(code == 0){
                        //将工作党状态改为容器离场
                        agvWrkMast.setWrkSts(206L);
                        agvWrkMastService.updateById(agvWrkMast);
                    }
                } catch (IOException e) {
                    log.error(e.getMessage());
                }
                //将工作党状态改为货架离场
                agvWrkMast.setWrkSts(206L);
                agvWrkMast.setModiTime(new Date());
                agvWrkMastService.updateById(agvWrkMast);
//                //发送货架立场请求，完成工作档
//                List<AgvWrkMast> agvWrkMastList = new ArrayList<>();
//                agvWrkMastList.add(agvWrkMast);
//                try {
//                    int code = agvWrkMastService.containerMoveOut(agvWrkMastList);
//                    if(code == 0){
//                        //将工作党状态改为货架离场
//                        agvWrkMast.setWrkSts(206L);
//                        agvWrkMastService.updateById(agvWrkMast);
//                    }
//                } catch (IOException e) {
//                    log.error(e.getMessage());
//                }
            }
        }

@@ -684,12 +686,12 @@

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();

        //查找该容器的工作档
        //查找该货架的工作档
        AgvWrkMast agvWrkMast = agvWrkMastService.selectByContainerCode(containerCode);
        if(!Cools.isEmpty(agvWrkMast)){
            List<AgvWrkDetl> agvWrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

            for (AgvWrkDetl agvWrkDetl : AgvWrkDetlList){
            for (AgvWrkDetl agvWrkDetl : agvWrkDetlList){
                agvWrkDetl.setVolume(agvWrkDetl.getAnfme());
                if(agvWrkMast.getIoType() == 103){
                    //寻找是否有相同物料的工作档明细，并返回数量之和
@@ -708,16 +710,21 @@
                }
            };


            return R.ok(agvWrkDetlList).add(agvWrkMast);
            agvBasDevpDto.setAgvWrkDetls(agvWrkDetlList);
            agvBasDevpDto.setAgvWrkMast(agvWrkMast);
        }
        //查找该容器的入库通知档
        //查找该货架的入库通知档
        List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", containerCode));
        if(!Cools.isEmpty(agvWaitPakinList)){
            return R.ok(agvWaitPakinList);
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        return R.error("没有该容器的出库、拣料、入库信息等");
        System.out.println("currentContainerMap: " + currentContainerMap);


        System.out.println("agvBasDevpDto: " + agvBasDevpDto);

        return R.ok(agvBasDevpDto);
    }

    private double getAllAnfmeInAgvWrkDetlList(List<AgvWrkDetl> agvWrkDetlList, AgvWrkDetl wd0) {