13

zhang

1 天以前 1c0dbad152362ac704a27ecfc5b5d08247385d87

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

@@ -1,6 +1,7 @@
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;
@@ -11,7 +12,6 @@
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@

@Slf4j
@Service("orderService")
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderPakin> implements OrderService {

    @Autowired
    private OrderDetlMapper orderDetlMapper;
@@ -38,8 +38,8 @@
    private WrkDetlService wrkDetlService;

    @Override
    public Order selectByNo(String orderNo) {
        List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("order_no", orderNo));
    public OrderPakin selectByNo(String orderNo) {
        List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("order_no", orderNo));
        if (Cools.isEmpty(orderList)) {
            return null;
        }
@@ -47,7 +47,7 @@
    }

    @Override
    public List<OrderDetl> selectWorkingDetls(Long orderId) {
    public List<OrderDetlPakout> selectWorkingDetls(Long orderId) {
        return orderDetlMapper.selectWorkingDetls(orderId);
    }

@@ -58,14 +58,14 @@

    @Override
    public void checkComplete(String orderNo) {
        Order order = this.selectByNo(orderNo);
        OrderPakin order = this.selectByNo(orderNo);
        if (Cools.isEmpty(order) || order.getSettle() >= 4L) {
            return;
        }
        List<OrderDetl> orderDetls = orderDetlMapper.selectList(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
        List<OrderDetlPakout> orderDetlPakouts = orderDetlMapper.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", order.getId()));
        boolean complete = true;
        for (OrderDetl orderDetl : orderDetls) {
            if (orderDetl.getAnfme() > orderDetl.getQty()) {
        for (OrderDetlPakout orderDetlPakout : orderDetlPakouts) {
            if (orderDetlPakout.getAnfme() > orderDetlPakout.getQty()) {
                complete = false;
                break;
            }
@@ -74,22 +74,22 @@
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
                if (!orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().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)) {
                    OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
                    orderDetlPakout.sync(wrkDetl);
                    orderDetlPakout.setQty(orderDetlPakout.getAnfme());
                    orderDetlPakout.setOrderId(order.getId());
                    orderDetlPakout.setOrderNo(orderNo);
                    orderDetlPakout.setStatus(1);
                    orderDetlPakout.setCreateTime(order.getCreateTime());
                    orderDetlPakout.setCreateBy(order.getCreateBy());
                    orderDetlPakout.setUpdateTime(order.getUpdateTime());
                    orderDetlPakout.setUpdateBy(order.getUpdateBy());
                    if (!orderDetlService.insert(orderDetlPakout)) {
                        throw new CoolException("重整出库订单【orderNo = " + order.getOrderNo() + "】明细失败");
                    }
                }
@@ -128,7 +128,7 @@
                openService.pakoutOrderCreate(openParam);
            }

            Order order = this.selectByNo(orderNo);
            OrderPakin order = this.selectByNo(orderNo);
            if (null == order) {
                throw new CoolException("生成单据失败");
            }
@@ -157,35 +157,36 @@
        if (!this.deleteById(orderId)) {
            throw new CoolException("删除单据失败");
        }
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
        orderDetlService.delete(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId));
    }

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

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

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

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

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

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