#出库修改完成数量变更修改工作数量

zjj

2023-06-09 34a93b4b34e056ac7c20891efe5630245dc9766c

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

@@ -19,6 +19,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

@Slf4j
@Service("orderService")
@@ -59,7 +60,7 @@
    @Override
    public void checkComplete(String orderNo) {
        Order order = this.selectByNo(orderNo);
        if (order.getSettle() >= 4L) {
        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
            return;
        }
        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
@@ -71,30 +72,13 @@
            }
        }
        if (complete) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
                    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() + "】明细失败");
                    }
            for (OrderDetl orderDetl : orderDetls) {
                //生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                if (orderDetl.getBatch().equals("")){
                    orderDetl.setBatch(null);
                    orderDetlService.updateById(orderDetl);
                }
            }

            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
@@ -140,9 +124,13 @@
                if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据明细数量失败");
                }
                // 修改订单作业数量
                if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
                    throw new CoolException("修改单据作业数量失败");
                }
            }
        } catch (Exception e) {
            log.error("", e);
            log.error("saveHandlerOrder===>>", e);
            return false;
        }
        return true;
@@ -161,4 +149,63 @@
        return this.baseMapper.selectComplete();
    }

    @Override
    public boolean addToLogTable(Order order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }

    /**
     *
     * @param orderNo
     *
     */
    @Override
    public void BackToInit(String orderNo) {
        Integer count = this.baseMapper.checkDetlWorkQtyLess0(orderNo);
        //如果所有明细的工作数量和完成量都小于等于0， 那么将主档更新为“待处理”状态
        if (count == 0 ){
            this.baseMapper.updateSettleTo1(orderNo);
        }
    }

    @Override
    public List<Order> selectInOrOutOrders(boolean inOrders) {
        if (inOrders) {
            return this.baseMapper.selectInOrOutOrders(1);

        }else {
            return this.baseMapper.selectInOrOutOrders(0);

        }
    }

    @Override
    public void checkSettleUpdate(Long orderId) {
        long settle = 1;
        Integer count = 0;
        List<OrderDetl> orderNo1 = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                .eq("order_id", orderId));
        for (int i = 0; i < orderNo1.size(); i++) {
            OrderDetl orderDetl = orderNo1.get(i);
            if (orderDetl.getQty() > 0){
                settle = 2;

            }
            if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())){
                count++;
            }

        }
        if (count == orderNo1.size()){
            settle = 4;
        }
        updateSettle(orderId,settle,1L);
    }

    @Override
    public List<Order> selectToBeHistoryOrder(boolean isERP) {
        int settle = isERP ? 6 : 4;
        return this.baseMapper.selectToBeHistoryOrder(settle);
    }

}