订单功能完善

pang.jiabao

1 天以前 17080b28dc3fb0df12a5a4da76e10dd9203e5725

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

@@ -1,21 +1,18 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.entity.result.OrderNameListDto;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OpenService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +20,7 @@

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

@Slf4j
@Service("orderService")
@@ -36,6 +34,35 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private WrkDetlService wrkDetlService;

    @Override
    public List<OrderNameListDto> selectAllCombOrderNo() {
        List<Order> list = this.selectList(new EntityWrapper<Order>().orderBy("create_time",false));
        if (Cools.isEmpty(list)){
            return null;
        }
        ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
        for (Order order :list){
            DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_id", order.getDocType()));

            if (order.getSettle() >= 4) {
                continue;
            }

            if (docType.getPakin() == 1){
                OrderNameListDto orderNameListDto = new OrderNameListDto();
                orderNameListDto.setOrder_no(order.getOrderNo());
                orderNameListDtos.add(orderNameListDto);
            }
        }

        return orderNameListDtos;

    }

    @Override
    public Order selectByNo(String orderNo) {
@@ -59,7 +86,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()));
@@ -68,6 +95,16 @@
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
                complete = false;
                break;
            }
        }
        //当该订单明细数量==完成数量且>上报数量，上报状态为 否 或者 是 时都改成等待上报，定时器轮询等待上报进行上报
        for (OrderDetl orderDetl : orderDetls) {
            if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())&&
                    orderDetl.getQty()>(orderDetl.getUnits() == null ? 0 : orderDetl.getUnits())
                    &&orderDetl.getInspect()<2) {

                    orderDetl.setInspect(2);//等待上报
                    orderDetlService.updateById(orderDetl);
            }
        }
        if (complete) {
@@ -79,20 +116,31 @@
    }

    @Override
    public boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
    public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        try {
            List<DetlDto> detlDtos = new ArrayList<>();
            wrkDetls.forEach(wrkDetl -> {
                detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
            });
            // 生成入库单据
            String orderNo = "HAND" + snowflakeIdWorker.nextId();
            OpenOrderPakinParam openParam = new OpenOrderPakinParam();
            openParam.setOrderNo(orderNo);
            openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
            openParam.setOrderType("手动入库单");
            openParam.setOrderDetails(detlDtos);
            openService.pakinOrderCreate(openParam);
            if (pakin) {
                // 生成入库单据
                OpenOrderPakinParam openParam = new OpenOrderPakinParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动入库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakinOrderCreate(openParam);
            } else {
                // 生成出库单据
                OpenOrderPakoutParam openParam = new OpenOrderPakoutParam();
                openParam.setOrderNo(orderNo);
                openParam.setOrderTime(DateUtils.convert(wrkMast.getModiTime()));
                openParam.setOrderType("手动出库单");
                openParam.setOrderDetails(detlDtos);
                openService.pakoutOrderCreate(openParam);
            }

            Order order = this.selectByNo(orderNo);
            if (null == order) {
                throw new CoolException("生成单据失败");
@@ -105,9 +153,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;
@@ -121,4 +173,33 @@
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
    }

    @Override
    public List<Order> selectComplete() {
        return this.baseMapper.selectComplete();
    }

    @Override
    public List<Order> selectComplete8() {
        return this.baseMapper.selectComplete8();
    }

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

    @Override
    public List<Order> selectorderNoL(String orderNo) {
        return this.baseMapper.selectorderNoL(orderNo);
    }

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

}