13

zhang

2 天以前 55eb3d480594f4c0dd382eaeeb8548bf911d6ad7

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

@@ -43,9 +43,13 @@
    @Autowired
    private WaitPakinService waitPakinService;
    @Autowired
    private OrderService orderService;
    private OrderPakinService orderPakinService;
    @Autowired
    private OrderDetlService orderDetlService;
    private OrderPakoutService orderPakoutService;
    @Autowired
    private OrderDetlPakoutService orderDetlPakoutService;
    @Autowired
    private OrderDetlPakinService orderDetlPakinService;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
@@ -301,7 +305,7 @@
            // 关联组托
        } else {

            OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
            OrderPakin order = orderPakinService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", param.getOrderNo()));
            if (Cools.isEmpty(order) || order.getSettle() > 2) {
                throw new CoolException("单据编号已过期");
            }
@@ -310,12 +314,12 @@
            param.getCombMats().forEach(elem -> {

                // 订单明细数量校验
                OrderDetlPakout orderDetlPakout = orderDetlService.selectById(elem.getDetlId());
                OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectById(elem.getDetlId());
                if (elem.getAnfme() > orderDetlPakout.getEnableQty()) {
                    throw new CoolException(orderDetlPakout.getMatnr() + "入库数量不合法");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQtyById(orderDetlPakout.getId(), elem.getAnfme())) {
                if (!orderDetlPakinService.increaseWorkQtyById(orderDetlPakout.getId(), elem.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }

@@ -342,7 +346,7 @@
                }
            });

            orderService.updateSettle(order.getId(), 2L, userId);
            orderPakinService.updateSettle(order.getId(), 2L, userId);
        }

    }
@@ -358,7 +362,7 @@
        if (param.getCombMats().stream().anyMatch(obj -> obj.getAnfme() == null)) {
            throw new CoolException("入库物料数量不能为空");
        }
        OrderPakin order = orderService.selectByNo(param.getOrderNo());
        OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
@@ -384,7 +388,7 @@
        Date now = new Date();
        for (CombParam.CombMat combMat : param.getCombMats()) {
            // 订单明细数量校验
            OrderDetlPakout orderDetlPakout = orderDetlService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
            OrderDetlPakin orderDetlPakout = orderDetlPakinService.selectItem(order.getId(), combMat.getMatnr(), combMat.getBatch());
            if (Cools.isEmpty(orderDetlPakout)) {
                throw new CoolException("该单据中未找到对应物料明细");
            }
@@ -392,7 +396,7 @@
                throw new CoolException(orderDetlPakout.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
            if (!orderDetlPakinService.increaseWorkQty(order.getId(), combMat.getMatnr(), combMat.getBatch(), combMat.getAnfme())) {
                throw new CoolException("修改单据作业数量失败");
            }

@@ -515,12 +519,12 @@

        BasDevp sta = basDevpService.checkSiteStatus(staNo);
        //根据订单号生成出库任务工作档
        OrderPakin order = orderService.selectOne(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
        OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
        if (order.getSettle() != 1 && order.getSettle() != 2) {
            throw new CoolException("该订单已处理");
        }

        List<OrderDetlPakout> orderDetlPakouts = orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
        List<OrderDetlPakout> orderDetlPakouts = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", orderNo));
        Date now = new Date();
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            //查询所有库位状态为F的库位信息
@@ -553,7 +557,7 @@
                order.setSettle(2L);
                order.setUpdateBy(userId);
                order.setUpdateTime(now);
                if (!orderService.update(order, new EntityWrapper<OrderPakin>().eq("order_no", orderNo))) {
                if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", orderNo))) {
                    throw new CoolException("更新订单状态失败");
                }
                orderDetlPakout.setWorkQty(orderDetlPakout.getWorkQty() + curOutQty);
@@ -563,7 +567,7 @@
                if (!Cools.isEmpty(orderDetlPakout.getBatch())) {
                    wrapper.eq("batch", orderDetlPakout.getBatch());
                }
                if (!orderDetlService.update(orderDetlPakout, wrapper)) {
                if (!orderDetlPakoutService.update(orderDetlPakout, wrapper)) {
                    throw new CoolException("更新订单明细失败");
                }
            }