#

Junjie

2024-08-02 f7b699b0da8aa185edeb38dc1abaaf964ba41d95

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java

@@ -58,6 +58,12 @@
        return R.ok().add(waitPakinService.getById(id));
    }

    @PreAuthorize("hasAuthority('asrs:waitPakin:list')")
    @GetMapping("/waitPakin/orderDetlId/{orderDetlId}")
    public R getByOrderDetlId(@PathVariable("orderDetlId") Long orderDetlId) {
        return R.ok().add(waitPakinService.getByOrderDetlId(orderDetlId));
    }

    @PreAuthorize("hasAuthority('asrs:waitPakin:save')")
    @OperationLog("添加组托通知档")
    @PostMapping("/waitPakin/save")
@@ -77,8 +83,20 @@
            return R.error("托盘正在入库中");
        }

        if (!waitPakinService.save(waitPakin)) {
            return R.error("添加失败");
        //查询是否存在相同明细和托盘码的组托通知档
        WaitPakin waitPakin1 = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, waitPakin.getBarcode()).eq(WaitPakin::getDetlId, waitPakin.getDetlId()));
        if (waitPakin1 == null) {
            //不存在组托通知档，创建
            if (!waitPakinService.save(waitPakin)) {
                return R.error("添加失败");
            }
        }else {
            //存在组托通知档，更新
            waitPakin1.setAnfme(waitPakin1.getAnfme() + waitPakin.getAnfme());
            waitPakin1.setUpdateTime(new Date());
            if (!waitPakinService.updateById(waitPakin1)) {
                return R.error("添加失败");
            }
        }

        OrderDetl orderDetl = orderDetlService.getById(waitPakin.getDetlId());