yys 1.完善销售下单，生成生产订单

云

5 天以前 d3a5c4420a7daf89bc9832f22ca8ed9d7e1adaf9

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

@@ -3,11 +3,15 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductStructureDto;
@@ -16,14 +20,21 @@
import com.ruoyi.production.service.ProductOrderService;
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.service.impl.StockInventoryServiceImpl;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.File;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

@@ -38,6 +49,9 @@

    @Autowired
    private ProductProcessRouteMapper productProcessRouteMapper;

    @Autowired
    private ProductStructureRecordMapper productStructureRecordMapper;

    @Autowired
    private ProcessRouteItemMapper processRouteItemMapper;
@@ -69,6 +83,9 @@
    @Autowired
    private StockInventoryServiceImpl stockInventoryService;

    @Autowired
    private CommonFileServiceImpl commonFileService;

    @Override
    public IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder) {
        IPage<ProductOrderDto> productOrderDtoIPage = productOrderMapper.pageProductOrder(page, productOrder);
@@ -76,11 +93,15 @@
            // 获取产品合格库存
            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            stockInventoryDto.setProductModelId(productOrderDto.getProductModelId());
            stockInventoryDto.setProductType(1);
            Page page1 = new Page<>(1,1);
            IPage<StockInventoryDto> stockInventoryDtoIPage = stockInventoryService.pagestockInventory(page1,stockInventoryDto);
            if(stockInventoryDtoIPage.getTotal() > 0){
                productOrderDto.setInventoryQuantity(stockInventoryDtoIPage.getRecords().get(0).getQualitity());
            }
            // 附件
            productOrderDto.setSalesLedgerFiles(commonFileService.getFileListByBusinessId(productOrderDto.getId()
            , FileNameType.PRODUCT_ORDER.getValue()));
        });
        return productOrderDtoIPage;
    }
@@ -95,46 +116,57 @@
        productProcessRoute.setProductOrderId(productOrder.getId());
        productProcessRoute.setBomId(processRoute.getBomId());
        productProcessRouteMapper.insert(productProcessRoute);
        // 绑定生产bom清单
        List<ProductStructureRecord> productStructureDtos = productOrder.getProductStructureRecords();
        productStructureDtos.forEach(item ->{
            item.setProductOrderId(productOrder.getId());
            productStructureRecordMapper.insert(item);
        });
        //新增生产订单下的工艺路线子表
        List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(new QueryWrapper<ProcessRouteItem>().lambda().eq(ProcessRouteItem::getRouteId, processRoute.getId()));
        List<ProductProcessRouteItem> processRouteItems = productOrder.getProcessRouteItems();
        // 生成当前日期的前缀：年月日
        String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
        for (ProcessRouteItem processRouteItem : processRouteItems) {
            ProductProcessRouteItem productProcessRouteItem = new ProductProcessRouteItem();
            productProcessRouteItem.setProductModelId(processRouteItem.getProductModelId());
            productProcessRouteItem.setProcessId(processRouteItem.getProcessId());
        for (ProductProcessRouteItem productProcessRouteItem : processRouteItems) {
            productProcessRouteItem.setProductModelId(productOrder.getProductModelId());
            productProcessRouteItem.setProductOrderId(productOrder.getId());
            productProcessRouteItem.setProductRouteId(productProcessRoute.getId());
            productProcessRouteItem.setDragSort(processRouteItem.getDragSort());
            int insert = productProcessRouteItemMapper.insert(productProcessRouteItem);
            if (insert > 0) {
                // 查询今日已存在的最大工单号
                ProductWorkOrder lastWorkOrder = productWorkOrderMapper.selectMax(datePrefix);
                int sequenceNumber = 1; // 默认序号
                if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
                    String lastNo = lastWorkOrder.getWorkOrderNo().toString();
                    if (lastNo.startsWith(datePrefix)) {
                        String seqStr = lastNo.substring(datePrefix.length());
                        try {
                            sequenceNumber = Integer.parseInt(seqStr) + 1;
                        } catch (NumberFormatException e) {
                            sequenceNumber = 1;
                        }
                    }
                }
                // 生成完整的工单号
                String workOrderNoStr = "GD" + String.format("%s%03d", datePrefix, sequenceNumber);
                String workOrderNoStr = getWorkOrderNoStr(lastWorkOrder, datePrefix); // 工单号
                ProductWorkOrder productWorkOrder = new ProductWorkOrder();
                productWorkOrder.setProductProcessRouteItemId(productProcessRouteItem.getId());
                productWorkOrder.setProductOrderId(productOrder.getId());
                ProductOrder order = productOrderMapper.selectById(productOrder.getId());
                productWorkOrder.setPlanQuantity(order.getQuantity());
                productWorkOrder.setPlanQuantity(BigDecimal.valueOf(productProcessRouteItem.getPlanNum()));
                productWorkOrder.setWorkOrderNo(workOrderNoStr);
                productWorkOrder.setPlanStartTime(productProcessRouteItem.getPlanStartTime());
                productWorkOrder.setPlanEndTime(productProcessRouteItem.getPlanEndTime());
                productWorkOrder.setStatus(1);
                productWorkOrder.setUserPower(productProcessRouteItem.getUserPower());
                productWorkOrderMapper.insert(productWorkOrder);
            }
        }
        return productOrderMapper.updateById(productOrder);
    }

    @NotNull
    private static String getWorkOrderNoStr(ProductWorkOrder lastWorkOrder, String datePrefix) {
        int sequenceNumber = 1; // 默认序号
        if (lastWorkOrder != null && lastWorkOrder.getWorkOrderNo() != null) {
            String lastNo = lastWorkOrder.getWorkOrderNo();
            if (lastNo.startsWith(datePrefix)) {
                String seqStr = lastNo.substring(datePrefix.length());
                try {
                    sequenceNumber = Integer.parseInt(seqStr) + 1;
                } catch (NumberFormatException e) {
                    sequenceNumber = 1;
                }
            }
        }
        // 生成完整的工单号
        String workOrderNoStr = "GD" + String.format("%s%03d", datePrefix, sequenceNumber);
        return workOrderNoStr;
    }

    @Override
@@ -148,27 +180,31 @@
    }

    @Override
    public Boolean addProductOrder(ProductOrder productOrder) {
    public Boolean addProductOrder(ProductOrder productOrder) throws IOException {
        String string = generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")));
        productOrder.setNpsNo(string);
        productOrder.setCompleteQuantity(BigDecimal.ZERO);
        productOrder.setStatus("待生产");
        this.save(productOrder);
        if (ObjectUtils.isNotEmpty(productOrder.getRouteId())) {
            this.bindingRoute(productOrder);
        }
        if(CollectionUtils.isNotEmpty(productOrder.getTempFileIds())){
            commonFileService.migrateTempFilesToFormal(productOrder.getId(), productOrder.getTempFileIds());
        }
        return true;
    }

    @Override
    public Boolean delete(Long[] ids) {

    @Transactional(rollbackFor = Exception.class)
    public Boolean delete(Long[] idList) {
        //批量查询productOrder
        List<ProductOrder> productOrders = productOrderMapper.selectList(
                new LambdaQueryWrapper<ProductOrder>()
                        .in(ProductOrder::getId, ids)
                        .in(ProductOrder::getId, Arrays.asList(idList))
        );
        if (!org.springframework.util.CollectionUtils.isEmpty(productOrders)) {

            List<Long> ids = productOrders.stream().map(ProductOrder::getId).collect(Collectors.toList());

            // 批量查询processRouteItems
            List<ProductProcessRouteItem> allRouteItems = productProcessRouteItemMapper.selectList(
@@ -204,7 +240,7 @@
                    // 删除产出表、投入表数据
                    if (!com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(productMainIds)) {
                        productionProductOutputMapper.deleteByProductMainIds(productMainIds);
                        productionProductInputMapper.deleteByProductMainIds(productMainIds);
                        productionProductInputMapper.deleteByProductMainIds(ids);
                        List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
                                new LambdaQueryWrapper<QualityInspect>()
                                        .in(QualityInspect::getProductMainId, productMainIds)
@@ -246,10 +282,42 @@
            // 批量删除productOrder
            productOrderMapper.delete(new LambdaQueryWrapper<ProductOrder>()
                    .in(ProductOrder::getId, ids));
            // 删除附件
            commonFileService.deleteByBusinessIds(ids, FileNameType.PRODUCT_ORDER.getValue());
            // 删除生产订单-物料清单
            productStructureRecordMapper.delete(new LambdaQueryWrapper<ProductStructureRecord>()
                    .in(ProductStructureRecord::getProductOrderId, ids));
        }

        return true;
    }

    @Override
    public Object startOrPause(ProductOrderDto item) {
        ProductOrder productOrder = productOrderMapper.selectById(item.getId());
        if(productOrder == null){
            throw new ServiceException("生产订单不存在");
        }
        int i;
        if(item.getOperation().equals(1)){
            i = 2;
        } else {
            i = 1;
        }
        productOrder.setStatus(item.getOperation() == 1 ? "生产中" : "待生产");
        productOrderMapper.updateById(productOrder);
        List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(new LambdaQueryWrapper<ProductWorkOrder>()
                .eq(ProductWorkOrder::getProductOrderId, productOrder.getId()));
        if(CollectionUtils.isNotEmpty(productWorkOrders)){

            productWorkOrders.forEach(productWorkOrder -> {
                productWorkOrder.setStatus(i);
                productWorkOrderMapper.updateById(productWorkOrder);
            });
        }
        return "操作成功";
    }

    //获取当前生产订单号
    public String getMaxOrderNoByDate(String datePrefix) {
        QueryWrapper<ProductOrder> queryWrapper = new QueryWrapper<>();