#

lsh

2024-12-13 fe2ac1e9580172bc3341553032fb2679e70fd42a

#

 src/main/java/com/zy/asrs/service/OrderPakinService.java

@@ -12,6 +12,8 @@

    OrderPakin selectByNo(String orderNo);

    List<OrderPakin> selectBySettle(Long settle);

    List<OrderDetlPakin> selectWorkingDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);

 src/main/java/com/zy/asrs/service/OrderPakoutService.java

@@ -12,6 +12,8 @@

    OrderPakout selectByNo(String orderNo);

    List<OrderPakout> selectBySettle(Long settle);

    List<OrderDetlPakout> selectWorkingDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -12,6 +12,8 @@

    Order selectByNo(String orderNo);

    List<Order> selectBySettle(Long settle);

    List<OrderDetl> selectWorkingDetls(Long orderId);

    boolean updateSettle(Long orderId, Long settle, Long userId);

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

@@ -14,16 +14,12 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.model.enumUtils.OrderEnumVo;
import com.zy.common.model.enumUtils.OrderInAndOutType;
import com.zy.common.model.enumUtils.OrderMethodVo;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -58,11 +54,7 @@
    @Transactional
    public void pakinOrderCreate(OpenOrderPakinParam param) {

        try{
            OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
        OrderInAndOutUtil.query(Boolean.TRUE,param.getOrderNo());

        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        Date now = new Date();
@@ -103,11 +95,9 @@
                now,    // 修改时间
                null    // 备注
        );
        try{
            OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }

        OrderInAndOutUtil.insertOrder(Boolean.TRUE,order);

        // 单据明细档
        List<DetlDto> list = new ArrayList<>();
        List<DetlDto> orderDetails = param.getOrderDetails();
@@ -138,11 +128,7 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            try{
                OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
            } catch (Exception e) {
                throw new CoolException(e.getMessage());
            }
            OrderInAndOutUtil.insertOrderDetl(Boolean.TRUE,order,orderDetl);
        }
    }

@@ -178,21 +164,24 @@
            }
        } else {
            // 所有订单
            List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
            List<Order> orders = orderService.selectBySettle(4L);
            for (Order order : orders) {
                OpenOrderCompeteResult result = new OpenOrderCompeteResult();
                results.add(result);
                result.setOrderNo(order.getOrderNo());
                result.setOrderTime(order.getOrderTime());
                result.setOrderType(order.getDocType$());
                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
//                List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.TRUE, order.getId());

                for (OrderDetl orderDetl : orderDetls) {
                    result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty()));
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
//                // 修改订单状态 4.完成 ===>> 6.已上报
//                if (!orderService.updateSettle(order.getId(), 6L, null)) {
//                    throw new CoolException("服务器内部错误，请联系管理员");
//                }
                OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 6L, null);
            }
        }
        return results;

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

@@ -47,6 +47,15 @@
    }

    @Override
    public List<OrderPakin> selectBySettle(Long settle) {
        List<OrderPakin> orderList = this.selectList(new EntityWrapper<OrderPakin>().eq("settle", settle));
        if (Cools.isEmpty(orderList)) {
            return null;
        }
        return orderList;
    }

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

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

@@ -47,6 +47,15 @@
    }

    @Override
    public List<OrderPakout> selectBySettle(Long settle) {
        List<OrderPakout> orderList = this.selectList(new EntityWrapper<OrderPakout>().eq("settle", settle));
        if (Cools.isEmpty(orderList)) {
            return null;
        }
        return orderList;
    }

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

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

@@ -47,6 +47,15 @@
    }

    @Override
    public List<Order> selectBySettle(Long settle) {
        List<Order> orderList = this.selectList(new EntityWrapper<Order>().eq("settle", settle));
        if (Cools.isEmpty(orderList)) {
            return null;
        }
        return orderList;
    }

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

 src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java

@@ -38,6 +38,11 @@
            return transformationOrder(orderPakin);
        }
        @Transactional
        public List<Order> selectBySettle(Long settle) {
            List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle);
            return transformationOrderList(orderPakinList);
        }
        @Transactional
        public List<OrderDetl> selectByOrderId(Long orderId) {
            List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
            return transformationOrderDetlList(orderDetlPakinList);
@@ -258,6 +263,11 @@
            return transformationOrder(orderPakout);
        }
        @Transactional
        public List<Order> selectBySettle(Long settle) {
            List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle);
            return transformationOrderList(orderPakoutList);
        }
        @Transactional
        public List<OrderDetl> selectByOrderId(Long orderId) {
            List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
            return transformationOrderDetlList(orderDetlPakoutList);