1

zhangchao

2024-11-19 18d68d8f70a6a434f6fda012299ae1b219c81ed7

 src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java

@@ -164,6 +164,12 @@
            if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", pick.getOrderNo()).eq("matnr", pick.getMatnr()).eq("three_code",pick.getThreeCode()))){
                throw new CoolException("修改订单明细失败，请联系管理员"+pick.getOrderNo()+pick.getMatnr());
            }
            Order order = orderService.selectByNo(orderDetl.getOrderNo());
            if (order.getSettle() == 1) {
                if (!orderService.updateSettle(order.getId(), 2L, userId)) {
                    throw new CoolException("再次拣料：更新订单状态失败！");
                }
            }
        }
        //  确认是否全部出库
        double totleWrkdetl = 0.0;
@@ -183,7 +189,7 @@
//        agvLocDetls.size() == 1


        return "组托成功，绑定站点成功";
        return "拣料成功";
    }

    /*
@@ -278,8 +284,13 @@
        if (Cools.isEmpty(mat)) {
            throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
        }
        OrderDetl orderDetl = orderDetlService.selectItem(orderNo, mat.getMatnr(), detlDto.getBatch(), detlDto.getCsocode());
        AgvWaitPakin waitPakin = new AgvWaitPakin();
        waitPakin.sync(mat);
        if (orderDetl != null) {
            waitPakin.setWeight(orderDetl.getWeight());
            waitPakin.setVolume(orderDetl.getVolume());
        }
        waitPakin.setOrderNo(orderNo);   // 单据编号
        waitPakin.setBatch(detlDto.getBatch());     // 序列码
        //waitPakin.setZpallet(zpallet);   // 货架码
@@ -838,7 +849,7 @@
                throw new CoolException("保存工作明细失败");
            }
            // 同步订单数量
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).in("source",18,31,34));
            OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", agvWrkDetl.getMatnr()).eq("three_code",agvWrkDetl.getThreeCode()).eq("order_no",agvWrkDetl.getOrderNo()).in("source",18,31,34));
            orderDetl.setQty(orderDetl.getQty() - agvWrkDetl.getAnfme());
            if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderDetl.getOrderNo()).eq("matnr", orderDetl.getMatnr()).eq("three_code",orderDetl.getThreeCode()))){
                throw new CoolException("修改订单明细失败，请联系管理员"+orderDetl.getOrderNo()+orderDetl.getMatnr());