调整

zhangchao

2024-08-31 24a8bab265ca39cfe7bac4c276cedd7ff1bbe405

调整

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

@@ -79,19 +79,59 @@
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo);
                for (WrkDetl wrkDetl : wrkDetls) {
                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(wrkDetl);
                    orderDetl.setQty(orderDetl.getAnfme());
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(orderNo);
                    orderDetl.setStatus(1);
                    orderDetl.setCreateTime(order.getCreateTime());
                    orderDetl.setCreateBy(order.getCreateBy());
                    orderDetl.setUpdateTime(order.getUpdateTime());
                    orderDetl.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                if (orderDetls.size() == wrkDetls.size()) {
                    for (WrkDetl wrkDetl : wrkDetls) {
                        OrderDetl orderDetl = new OrderDetl();
                        orderDetl.sync(wrkDetl);
                        orderDetl.setQty(orderDetl.getAnfme());
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(orderNo);
                        orderDetl.setStatus(1);
                        orderDetl.setCreateTime(order.getCreateTime());
                        orderDetl.setCreateBy(order.getCreateBy());
                        orderDetl.setUpdateTime(order.getUpdateTime());
                        orderDetl.setUpdateBy(order.getUpdateBy());
                        if (!orderDetlService.insert(orderDetl)) {
                            throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                        }
                    }
                } else {
                    for (OrderDetl orderDetl : orderDetls) {
                        for (WrkDetl wrkDetl : wrkDetls) {
                            if (Cools.isEmpty(orderDetl.getBatch()) || Cools.isEmpty(wrkDetl.getBatch())) {
                                if (orderDetl.getMatnr().equals(wrkDetl.getMatnr())) {
                                    OrderDetl newOrderDetl = new OrderDetl();
                                    newOrderDetl.sync(wrkDetl);
                                    newOrderDetl.setQty(orderDetl.getAnfme());
                                    newOrderDetl.setOrderId(order.getId());
                                    newOrderDetl.setOrderNo(orderNo);
                                    newOrderDetl.setStatus(1);
                                    newOrderDetl.setCreateTime(order.getCreateTime());
                                    newOrderDetl.setCreateBy(order.getCreateBy());
                                    newOrderDetl.setUpdateTime(order.getUpdateTime());
                                    newOrderDetl.setUpdateBy(order.getUpdateBy());
                                    if (!orderDetlService.insert(newOrderDetl)) {
                                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                                    }
                                }
                            } else {
                                if (orderDetl.getMatnr().equals(wrkDetl.getMatnr()) && orderDetl.getBatch().equals(wrkDetl.getBatch())) {
                                    OrderDetl newOrderDetl = new OrderDetl();
                                    newOrderDetl.sync(wrkDetl);
                                    newOrderDetl.setQty(orderDetl.getAnfme());
                                    newOrderDetl.setOrderId(order.getId());
                                    newOrderDetl.setOrderNo(orderNo);
                                    newOrderDetl.setStatus(1);
                                    newOrderDetl.setCreateTime(order.getCreateTime());
                                    newOrderDetl.setCreateBy(order.getCreateBy());
                                    newOrderDetl.setUpdateTime(order.getUpdateTime());
                                    newOrderDetl.setUpdateBy(order.getUpdateBy());
                                    if (!orderDetlService.insert(newOrderDetl)) {
                                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                                    }
                                }
                            }
                        }
                    }
                }
            }
@@ -185,6 +225,7 @@
    public Order selectOrderMoveStatus() {
        return this.baseMapper.selectOrderMoveStatus();
    }

    @Override
    public Order selectOrderMoveStatusInitial() {
        return this.baseMapper.selectOrderMoveStatusInitial();