Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

2024-11-05 af11b74ea0ec26ed8765244b3f51fad5aca9142a

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

@@ -54,13 +54,13 @@
    @Autowired
    private StaDescService staDescService;

    @PostMapping
    @Transactional
    public synchronized R getLocNo3(@RequestBody SearchLocParam param){


    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)){
            return R.error("未找到任务");
            throw new CoolException("未找到任务");
        }
        StartupDto dto = null;
        // 获取目标站
@@ -70,7 +70,7 @@
                .eq("crn_no", wrkMast.getCrnNo()); // 堆垛机号
        StaDesc staDesc = staDescService.selectOne(wrapper);
        if (Cools.isEmpty(staDesc)){
            return R.error("未找到站点路径");
            throw new CoolException("未找到站点路径");
        }
        if (wrkMast.getWrkSts() == 14 && wrkMast.getIoType() == 103){
            try {
@@ -109,14 +109,14 @@
                }
                dto.setWorkNo(wrkMast.getWrkNo());
                dto.setLocNo(wrkMast.getLocNo());
                return R.ok(dto);
                return dto;
            } catch (Exception e) {
               return R.error(e.getMessage());
                throw new CoolException("出错");
            }
        }else {

        }
        return R.error();
        return dto;
    }

    @PostMapping("/pakin2/loc/v1")
@@ -277,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())
                .eq("io_type", 103)
                .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")