自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zyx
2024-04-12 b922fe4d80f7e278b1ff958c4c95626b27cf8266 
 src/main/java/com/zy/asrs/controller/AgvMobileController.java


@@ -1,13 +1,19 @@


package com.zy.asrs.controller;




import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.mapper.Wrapper;


import com.core.common.Cools;


import com.core.common.R;


import com.zy.asrs.entity.AgvBasDevp;


import com.zy.asrs.entity.AgvLocDetl;


import com.zy.asrs.entity.param.AgvMobileStartPakin;


import com.zy.asrs.entity.param.AgvMobileStartParam;


import com.zy.asrs.entity.param.CombParam;


import com.zy.asrs.service.*;


import com.zy.common.web.BaseController;


import lombok.Synchronized;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


@@ -36,6 +42,8 @@


    private AgvLocMastService agvLocMastService;


    @Autowired


    private OrderDetlService orderDetlService;


    @Autowired


    private AgvLocDetlService agvLocDetlService;






    /*


@@ -43,8 +51,9 @@


     */


    @PostMapping("/comb/auth")


    public R comb(@RequestBody CombParam combParam){


        String message = agvMobileService.comb(combParam, 1l);


        return R.ok(message);


        agvMobileService.comb(combParam, getUserId());




        return R.ok();


    }




    /*


@@ -54,7 +63,7 @@


    public R combBinding(@RequestBody Map<String,Object> map){


        String barcode = map.get("barcode").toString();


        String stationCode = map.get("stationCode").toString();


        Short containerType = Short.valueOf(map.get("containerType").toString());


        Short containerType = Short.valueOf(barcode.substring(0,2));


        agvMobileService.combBinding(barcode,stationCode,containerType);


        return R.ok("托盘绑定站点成功");


    }


@@ -97,6 +106,23 @@


    }




    /*


    启动入库，组托 + 生产工作档


    */


    @PostMapping("/start/pakin/auth")


    @Synchronized


    @Transactional


    public R startPakin(@RequestBody AgvMobileStartPakin params){


        // 组托


        params.getCombParams().forEach(combParam -> {


            agvMobileService.comb(combParam,getUserId());


        });


        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));


        workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);




        return R.ok("生成工作档成功");


    }




    /*


    入库


     */


    @PostMapping("/pakin/empty/auth")


@@ -105,7 +131,7 @@




        for (AgvMobileStartParam.Pda pda : params.getPad()) {


            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));


            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());


            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);


        }




        return R.ok();


@@ -131,10 +157,33 @@


    @PostMapping("/pakout/empty/container/selector/auth")


    public R containerType(@RequestBody HashMap<String,String> params){




        Short locType = Short.valueOf(params.get("locType"));


        String devNo = params.get("devNo");


        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);




        return R.ok(agvLocMastService.queryContainerTypeByLocType1(locType));


        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));




    }


    


    /*


    查询库存 入库订单与销售单号


     */


    @PostMapping("/query/locDetl/v1")


    public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){




        String orderNo = params.get("orderNo");


        String threeCode = params.get("threeCode");


        String matnr = params.get("matnr");




        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr);




//        wrapper.eq("orderNo",orderNo);




        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);




        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);




        return R.ok(agvLocDetls);


    }






}