feat(ProductionPrintOrder) 工序改为9位

buhuazhen

4 天以前 aeb7d490c7fa55ae4861a43d256a5a9cf649d39c

 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java

@@ -1,5 +1,7 @@
package com.ruoyi.production.service.impl;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,16 +17,21 @@
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.production.service.ProductProcessService;
import com.ruoyi.production.service.ProductWorkOrderService;
import com.ruoyi.production.service.ProductionPrintOrderService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

@Service
@@ -33,6 +40,10 @@

    private final ProductWorkOrderService productWorkOrderService;
    private final ProductProcessService productProcessService;

    @Autowired
    @Lazy
    private ProductionPrintOrderService  productionPrintOrderService;
    @Autowired
    private ProductOrderMapper productOrderMapper;
    @Autowired
@@ -60,7 +71,21 @@

    @Override
    public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
        return productOrderMapper.pageProductOrder(page, productOrder);
        IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(page, productOrder);
        // 填充印刷单信息
        List<ProductOrderDto> records = productOrderDtoIPage.getRecords();
        if (CollUtil.isNotEmpty(records)) {
            List<Long> orderIds = records.stream().map(ProductOrderDto::getId).collect(Collectors.toList());
            Map<Long, ProductionPrintOrder> collect = productionPrintOrderService.getListByOrders(orderIds).stream().collect(Collectors.toMap(ProductionPrintOrder::getProductOrderId, Function.identity()));
            records.forEach(record -> {
                ProductionPrintOrder productionPrintOrder = collect.get(record.getId());
                if (productionPrintOrder != null) {
                    productionPrintOrder.convertProductOrderDto(record);
                }
            });
        }

        return productOrderDtoIPage;
    }

    @Override
@@ -75,11 +100,14 @@
        productProcessRouteMapper.insert(productProcessRoute);
        //新增生产订单下的工艺路线子表
        List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
        Map<Long, ProductProcess> productProcessMap = productProcessService
                .list(new LambdaQueryWrapper<ProductProcess>().in(ProductProcess::getId, processRouteItems.stream().map(ProcessRouteItem::getProcessId).collect(Collectors.toList())))
                .stream()
                .collect(Collectors.toMap(ProductProcess::getId, productProcess -> productProcess));
        Map<Long, ProductProcess> productProcessMap = new HashMap<>();
        if(CollUtil.isNotEmpty(processRouteItems)){
            productProcessMap = productProcessService
                    .list(new LambdaQueryWrapper<ProductProcess>().in(ProductProcess::getId, processRouteItems.stream().map(ProcessRouteItem::getProcessId).collect(Collectors.toList())))
                    .stream()
                    .collect(Collectors.toMap(ProductProcess::getId, productProcess -> productProcess));

        }
        // 生成当前日期的前缀：年月日
        for (ProcessRouteItem processRouteItem : processRouteItems) {
            ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
@@ -96,7 +124,7 @@
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());
                productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder(null, productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
                productWorkOrder.setWorkOrderNo(productWorkOrderService.generateProductWorkOrder( productProcessMap.getOrDefault(productProcessRouteItem.getProcessId(), new ProductProcess()).getName(), productOrder.getNpsNo()));
                productWorkOrder.setStatus(1);
                productWorkOrderMapper.insert(productWorkOrder);
            }
@@ -152,6 +180,22 @@
        return true;
    }

    @Override
    public ProductWorkOrder startProduction(Long id) {
        LocalDateTime now = LocalDateTime.now();
        ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(id);
        productWorkOrder.setStartProductTime(now);
        Assert.notNull(productWorkOrder, "工单不存在");


        ProductWorkOrder needUpdate = new ProductWorkOrder();
        needUpdate.setId(id);
        needUpdate.setStartProductTime(now);
        productWorkOrderMapper.updateById(needUpdate);

        return productWorkOrder;
    }

    //获取当前生产订单号
    public String getMaxOrderNoByDate(String datePrefix) {
        QueryWrapper<ProductOrder> queryWrapper = new QueryWrapper<>();
@@ -169,8 +213,8 @@
        return "SC" + datePrefix + formatOrderSequence(datePrefix);
    }

    public String generateNextOrderByContractNo(String datePrefix, String contractNo) {
        return contractNo + formatOrderSequence(datePrefix);
    public String generateNextOrderByContractNo(String contractNo) {
        return contractNo + formatOrderSequenceByContractNo(contractNo);
    }

    private String formatOrderSequence(String datePrefix) {
@@ -189,4 +233,12 @@
        return String.format("%04d", sequence);
    }


    private String formatOrderSequenceByContractNo(String contractNo) {
        LambdaQueryWrapper<ProductOrder> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.likeRight(ProductOrder::getNpsNo, contractNo);
        Long count = productOrderMapper.selectCount(queryWrapper);
        return String.format("%04d", count+1);
    }

}