*

lsh

9 天以前 de8bc1b7f3dd1ab615551193ba4c5d36293c1600

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

@@ -47,6 +47,15 @@
    }

    @Override
    public List<OrderPakout> selectBySettle(Long settle) {
        List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("settle", settle));
        if (Cools.isEmpty(orderList)) {
            return new ArrayList<>();
        }
        return orderList;
    }

    @Override
    public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
        return orderDetlMapper.selectWorkingDetls(orderId);
    }
@@ -107,7 +116,7 @@
        try {
            List<DetlDto> detlDtos = new ArrayList<>();
            wrkDetls.forEach(wrkDetl -> {
                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
            });
            String orderNo = "HAND" + snowflakeIdWorker.nextId();
            if (pakin) {
@@ -137,11 +146,13 @@
            }
            for (DetlDto detlDto : detlDtos) {
                // 修改订单明细数量
                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
                        ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据明细数量失败");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
                        ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }
            }
@@ -189,4 +200,13 @@
        return this.baseMapper.selectOrderMoveStatusInitial();
    }

    @Override
    public List<String> AllStatusSatisfyOrder(Integer moveSatus){
        return this.baseMapper.AllStatusSatisfyOrder(moveSatus);
    }

    @Override
    public boolean updateOrderStatus(String orderNo){
        return this.baseMapper.updateOrderStatus(orderNo);
    }
}