feat(stock): 完善成品库存维度解析和生产投料扣减逻辑 - 在电压参数解析中增加非成品情况下的空值返回 - 在工艺路线成品类别判断中增加非成...

liding

4 天以前 579d785db5254ad64b02eb58cb696c2447821dd3

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

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

import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -37,7 +40,6 @@
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -53,6 +55,8 @@
    private static final String PROCESS_VOLTAGE_SORT = "电压分选";
    private static final String PROCESS_OPTICAL_INSPECTION = "光检外观";
    private static final String PROCESS_PACKAGING = "包装";
    private static final String INPUT_WEIGHT_PARAMETER = "投入重量/数量";
    private static final String INPUT_WEIGHT_FIELD = "inputWeight";
    private static final Object PRODUCT_MAIN_NO_LOCK = new Object();

    private IQualityInspectService qualityInspectService;
@@ -99,6 +103,10 @@

        BigDecimal reportQty = dto.getQuantity();
        BigDecimal scrapQty = dto.getScrapQty() == null ? BigDecimal.ZERO : dto.getScrapQty();
        BigDecimal bomInputQty = dto.getInputWeight();
        if (bomInputQty == null) {
            bomInputQty = resolveInputWeight(dto.getOtherData());
        }
        if (reportQty == null || reportQty.compareTo(BigDecimal.ZERO) <= 0) {
            throw new ServiceException("报工数量必须大于0");
        }
@@ -107,6 +115,9 @@
        }
        if (scrapQty.compareTo(reportQty) > 0) {
            throw new ServiceException("报废数量不能大于报工数量");
        }
        if (bomInputQty == null || bomInputQty.compareTo(BigDecimal.ZERO) < 0) {
            throw new ServiceException("产品结构投入数量不能小于0");
        }

        // 第二步：加载当前工序、工单、工艺路线和订单数据，并校验基础关联关系
@@ -193,9 +204,9 @@

            BigDecimal previousCompleteQty =
                    previousWorkOrder.getCompleteQuantity() == null ? BigDecimal.ZERO : previousWorkOrder.getCompleteQuantity();
            if (currentReportedQty.add(reportQty).compareTo(previousCompleteQty) > 0) {
                throw new ServiceException("本次报工数量超过上道工序可流转数量");
            }
//            if (currentReportedQty.add(reportQty).compareTo(previousCompleteQty) > 0) {
//                throw new ServiceException("本次报工数量超过上道工序可流转数量");
//            }

            List<ProductProcessRouteItem> previousItems = productProcessRouteItemMapper.selectList(
                    Wrappers.<ProductProcessRouteItem>lambdaQuery()
@@ -239,10 +250,10 @@
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
        }
        if (productWorkOrder.getPlanQuantity() != null
                && currentWorkOrderReportedQty.add(reportQty).compareTo(productWorkOrder.getPlanQuantity()) > 0) {
            throw new ServiceException("本次报工数量超过工单可报数量");
        }
//        if (productWorkOrder.getPlanQuantity() != null
//                && currentWorkOrderReportedQty.add(reportQty).compareTo(productWorkOrder.getPlanQuantity()) > 0) {
//            throw new ServiceException("本次报工数量超过工单可报数量");
//        }

        // 第五步：生成报工单号并确定报工人信息
        String productNo;
@@ -313,6 +324,14 @@
                    .collect(Collectors.toMap(ProductStructureDto::getId, Function.identity(), (a, b) -> a));
        }

        // 第七步-1：投入数量强制取前端传入的 bomInputQty
        BigDecimal inputBaseQty = bomInputQty;

        // 第七步-2：光检外观和包装工序不扣减库存
        String currentProcessName = productProcess.getName() == null ? "" : productProcess.getName().trim();
        boolean shouldSkipStockDeduction = PROCESS_OPTICAL_INSPECTION.equals(currentProcessName) 
                || PROCESS_PACKAGING.equals(currentProcessName);

        for (ProductStructureDto productStructureDto : productStructureDtos) {
            if (productStructureDto.getProductModelId() == null) {
                throw new ServiceException("投入物料产品型号不能为空");
@@ -335,23 +354,24 @@
                throw new ServiceException("父级物料用量必须大于0");
            }

            BigDecimal needQty = childQty
                    .divide(parentQty, 6, RoundingMode.HALF_UP)
                    .multiply(reportQty);
            BigDecimal needQty = inputBaseQty;

            ProductionProductInput productionProductInput = new ProductionProductInput();
            productionProductInput.setProductModelId(productStructureDto.getProductModelId());
            productionProductInput.setQuantity(needQty);
            productionProductInput.setQuantity(needQty == null ? BigDecimal.ZERO : needQty);
            productionProductInput.setProductMainId(productionProductMain.getId());
            productionProductInputMapper.insert(productionProductInput);

            stockUtils.substractStock(
                    productStructureDto.getProductModelId(),
                    needQty,
                    StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(),
                    productionProductMain.getId(),
                    null
            );
            if (!shouldSkipStockDeduction) {
                stockUtils.substractStock(
                        productStructureDto.getProductModelId(),
                        needQty,
                        StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(),
                        productionProductMain.getId(),
                        null,
                        null
                );
            }
        }

        // 第八步：写产出记录并计算本次合格数量
@@ -756,4 +776,87 @@

        return productionProductMainDtos;
    }
}

    private BigDecimal resolveInputWeight(String otherData) {
        if (StringUtils.isBlank(otherData)) {
            return null;
        }
        Object parsed;
        try {
            parsed = JSON.parse(otherData);
        } catch (Exception ex) {
            throw new ServiceException("报工参数格式错误，无法解析投入重量/数量");
        }
        String inputWeight = StringUtils.trim(findParameterValue(parsed, INPUT_WEIGHT_PARAMETER));
        if (StringUtils.isBlank(inputWeight)) {
            inputWeight = StringUtils.trim(findFieldValue(parsed, INPUT_WEIGHT_FIELD));
        }
        if (StringUtils.isBlank(inputWeight)) {
            return null;
        }
        try {
            return new BigDecimal(inputWeight);
        } catch (NumberFormatException ex) {
            throw new ServiceException("报工参数中的投入重量/数量格式错误");
        }
    }

    private String findParameterValue(Object node, String parameterItem) {
        if (node instanceof JSONArray) {
            JSONArray array = (JSONArray) node;
            for (Object item : array) {
                String value = findParameterValue(item, parameterItem);
                if (StringUtils.isNotBlank(value)) {
                    return value;
                }
            }
            return null;
        }
        if (node instanceof JSONObject) {
            JSONObject object = (JSONObject) node;
            if (parameterItem.equals(StringUtils.trim(object.getString("parameterItem")))) {
                String value = StringUtils.trim(object.getString("value"));
                if (StringUtils.isNotBlank(value)) {
                    return value;
                }
            }
            for (Object value : object.values()) {
                String matched = findParameterValue(value, parameterItem);
                if (StringUtils.isNotBlank(matched)) {
                    return matched;
                }
            }
        }
        return null;
    }

    private String findFieldValue(Object node, String fieldName) {
        if (node instanceof JSONArray) {
            JSONArray array = (JSONArray) node;
            for (Object item : array) {
                String value = findFieldValue(item, fieldName);
                if (StringUtils.isNotBlank(value)) {
                    return value;
                }
            }
            return null;
        }
        if (node instanceof JSONObject) {
            JSONObject object = (JSONObject) node;
            Object fieldValue = object.get(fieldName);
            if (fieldValue != null) {
                String value = StringUtils.trim(String.valueOf(fieldValue));
                if (StringUtils.isNotBlank(value)) {
                    return value;
                }
            }
            for (Object value : object.values()) {
                String matched = findFieldValue(value, fieldName);
                if (StringUtils.isNotBlank(matched)) {
                    return matched;
                }
            }
        }
        return null;
    }
}