Revert "#"

zjj

2024-11-12 d763f91da2dee979ac6825569cf61e9f8816d0fe

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -88,6 +88,19 @@

    }

    @PostMapping("/agv/unbind")
    @ManagerAuth
    public R pdaAgvUnbind(@RequestBody Map<String,Object> map){

        String site = (String) map.get("site"); // 暂存位

        if (Cools.isEmpty(site)) {
            return R.parse("暂存位不能为空");
        }

        return mobileService.unbind(site);
    }

    private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
        List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
                //起始位
@@ -256,8 +269,22 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
        if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", combParam.getBarcode())
                .eq("io_type", 104)
                .eq("wrk_sts", 14));
        if (Cools.isEmpty(wrkMast)) {
            mobileService.comb(combParam, getUserId());
            return R.ok("组托成功");
        }else {
            mobileService.mergeComb(combParam, getUserId());
            return R.ok("并板成功");
        }


    }

    @RequestMapping("/pack/get/auth")