#

luxiaotao1123

2022-10-17 c8630dc9c82a3b44cf33a3db73accec4018c8fbb

 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,8 +12,8 @@
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 com.zy.common.model.OrderDto;
import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -174,6 +175,18 @@
            // 获取所有未作业的明细
            List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
            for (OrderDetl orderDetl : orderDetls) {
                Double leave = orderDetl.getAnfme() - orderDetl.getQty();
                OrderMergeVo vo = new OrderMergeVo(orderDetl.getMatnr(), orderDetl.getBatch(), leave);
                OrderDto orderDto = new OrderDto(orderDetl.getOrderNo(), null, leave);
                if (OrderMergeVo.has(result, vo)) {
                    OrderMergeVo exist = OrderMergeVo.find(result, vo.getMatnr(), vo.getBatch());
                    assert exist != null;
                    exist.setAnfme(exist.getAnfme() + vo.getAnfme());
                    exist.getOrderDtos().add(orderDto);
                } else {
                    vo.getOrderDtos().add(orderDto);
                    result.add(vo);
                }

            }
        }