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

liding

4 天以前 579d785db5254ad64b02eb58cb696c2447821dd3

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

@@ -327,6 +327,11 @@
        // 第七步-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("投入物料产品型号不能为空");
@@ -357,14 +362,16 @@
            productionProductInput.setProductMainId(productionProductMain.getId());
            productionProductInputMapper.insert(productionProductInput);

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

        // 第八步：写产出记录并计算本次合格数量
@@ -852,4 +859,4 @@
        }
        return null;
    }
}
}