#

luxiaotao1123

2022-10-17 983c8fc9697223956db395af1b781ddb75c6e0b5

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

@@ -13,6 +13,7 @@
import com.zy.asrs.service.*;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.model.OrderMergeVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,7 +71,7 @@
                break;
            }
        }
        if (complete) {
        if (complete && wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo)) == 0) {
            // 出库订单重新整理明细
            DocType docType = docTypeService.selectById(order.getDocType());
            if (null != docType && docType.getPakout() == 1) {
@@ -84,6 +85,7 @@
                    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());
@@ -140,6 +142,10 @@
                    throw new CoolException("修改单据明细数量失败");
                }
            }
            // 工作档明细更新单据编号
            for (WrkDetl wrkDetl : wrkDetls) {
                wrkDetlService.updateOrderNo(orderNo, wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
            }
        } catch (Exception e) {
            log.error("", e);
            return false;
@@ -155,4 +161,23 @@
        orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", orderId));
    }

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

    @Override
    public List<OrderMergeVo> mergePreview(List<Long> ids) {
        List<OrderMergeVo> result = new ArrayList<>();
        for (Long orderId : ids) {
            Order order = this.selectById(orderId);
            // 获取所有未作业的明细
            List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
            for (OrderDetl orderDetl : orderDetls) {

            }
        }
        return result;
    }

}