四项库拣料回库时合并wrkdetl到locdetl

zyx

2024-03-06 ce6ddedce8c91482e6a4d6b8e015260d3a52e6a1

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

@@ -577,8 +577,9 @@
     */
    @PostMapping("/start")
    @ResponseBody
    @Transactional
    public R start(@RequestBody ReplenishmentParam param){

        log.info("start param: " + param.toString());
        String containerCode = param.getContainerCode();
        if(Cools.isEmpty(containerCode)){
            throw new CoolException("料箱码为空");
@@ -630,6 +631,8 @@
    @PostMapping("/current/containerCode")
    @ResponseBody
    public R move(@RequestBody ReplenishmentParam param){

        log.info("current containerCode: " + param.toString());

        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
@@ -686,6 +689,9 @@
    public R containerMove(@RequestBody ReplenishmentParam param){

        String devNo = param.getDevNo();
        if(Cools.isEmpty(currentContainerMap)){
            currentContainerMap = new HashMap<>();
        }
        String containerCode = currentContainerMap.get(devNo);

        AgvBasDevpDto agvBasDevpDto = new AgvBasDevpDto();
@@ -723,10 +729,10 @@
            agvBasDevpDto.setAgvWaitPakins(agvWaitPakinList);
        }

        System.out.println("currentContainerMap: " + currentContainerMap);
        //System.out.println("currentContainerMap: " + currentContainerMap);


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

        return R.ok(agvBasDevpDto);
    }