修復

cp

2024-10-24 cc3185eaf94050d299cbd9d0c105eb3d1229996a

 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.domain.dto.DetlDto;
import com.zy.asrs.common.domain.dto.OrderNameListDto;
import com.zy.asrs.common.domain.param.OpenOrderPakinParam;
import com.zy.asrs.common.domain.param.OpenOrderPakoutParam;
import com.zy.asrs.common.wms.entity.*;
@@ -11,6 +12,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.DateUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SnowflakeIdWorker;
import com.zy.asrs.framework.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,11 @@
    private OrderDetlMapper orderDetlMapper;
    @Autowired
    private DocTypeService docTypeService;

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

    @Override
    public List<OrderDetl> selectWorkingDetls(Long orderId) {
@@ -117,7 +124,7 @@
        if (order.getSettle() >= 4L) {
            return;
        }
        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId));
        List<OrderDetl> orderDetls = orderDetlMapper.selectDetls(order.getId(),hostId);
        boolean complete = true;
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
@@ -125,35 +132,90 @@
                break;
            }
        }
        if (complete && wrkDetlService.count(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getOrderNo, orderNo).eq(WrkDetl::getHostId, hostId)) == 0) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.getById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()).eq(OrderDetl::getHostId, hostId))) {
                    throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                }
                List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNo(orderNo, hostId);
                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.save(orderDetl)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
            }

        if (complete) {
            if (!this.updateSettle(order.getId(), 4L, null, hostId)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
        }

    }

    @Override
    public List<OrderNameListDto> selectAllCombOrderNo(Long hostId) {
        List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
        if (Cools.isEmpty(list)){
            return null;
        }
        ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
        for (Order order :list){
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, 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 List<OrderNameListDto> selectAllorderNo(Long hostId) {
        List<Order> list = list(new LambdaQueryWrapper<Order>().eq(Order::getHostId, hostId).orderByDesc(Order::getCreateTime));
        if (Cools.isEmpty(list)){
            return null;
        }
        ArrayList<OrderNameListDto> orderNameListDtos = new ArrayList<>();
        for (Order order :list){
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));

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

        return orderNameListDtos;

    }

    @Override
    public List<String> selectAllOutOrderNo(String orderNo,Long hostId) {
        List<Order> list = list(new LambdaQueryWrapper<Order>()
                .eq(Order::getHostId, hostId)
                .like(Order::getOrderNo, orderNo)
                .orderByDesc(Order::getCreateTime)
        );
        if (Cools.isEmpty(orderNo) || orderNo.isEmpty()){
            list = list(new LambdaQueryWrapper<Order>()
                    .eq(Order::getHostId, hostId)
                    .orderByDesc(Order::getCreateTime)
            );
        }
        if (Cools.isEmpty(list)){
            return null;
        }
        ArrayList<String> orderNameListDtos = new ArrayList<>();
        for (Order order :list){
            DocType docType = docTypeService.getOne(new LambdaQueryWrapper<DocType>().eq(DocType::getDocId, order.getDocType()));

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

            if (docType.getPakout() == 1){
                orderNameListDtos.add(order.getOrderNo());
            }
        }

        return orderNameListDtos;

    }
}