1

zhangc

2025-01-17 e609c7adf42ef6eea053ff33a8e59abaf0767df6

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

@@ -77,7 +77,7 @@
    @RequestMapping("/pick/again/auth")
    @ManagerAuth(memo = "再次拣料")
    public R pickAgain(@RequestBody PickParam pickParams) {
        if (pickParams == null || Cools.isEmpty(pickParams.getLocNo()) || Cools.isEmpty(pickParams.getLocNo())) {
        if (pickParams == null) {
            return R.error("缺少参数");
        }
        agvMobileService.pickAgain(pickParams, 1l);
@@ -177,6 +177,9 @@
            return R.error("缺少参数");
        }
        for (AgvMobileStartParam.Pda pda : params.getPad()) {
            if (pda == null || Cools.isEmpty(pda.getContainerCode())) {
                return R.error("缺少容器信息");
            }
            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0, 2)));
            workService.emptyPlateIn(pda.getDevNo(), pda.getContainerCode(), pda.getContainerType(), getUserId(), false);
        }
@@ -416,7 +419,7 @@

        AgvLocMast agvLocMastByContainerCode = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("barcode", containerCode));
        AgvLocMast agvLocMastByLocNo = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
        if (agvLocMastByLocNo==null){
        if (agvLocMastByLocNo == null) {
            return R.error("库位不存在");
        }
        String barcode1 = agvLocMastByLocNo.getBarcode();
@@ -553,7 +556,7 @@
                // 更新订单
                OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
                if (orderDetl == null) {
                    throw new CoolException("订单明细不存在");
                    throw new CoolException("调拨单明细不存在");
                }
                orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
                if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {