zhanghl
2025-05-12 7af8acca55ef250ba4742f9ad5524ab0fd0cd0f5
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -72,6 +72,8 @@
    @Resource
    IApsPlateStandardRequireBatchService requireBatchService;
    @Autowired
    private ApsPlateStandardRequireBomStockDetailMapper apsPlateStandardRequireBomStockDetailMapper;
    /**
     * 查询钣金工单标准需求
@@ -177,8 +179,9 @@
            /*当前Bom节点处理完成后,处理下级BOM*/
            List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
            getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
            List<ApsPlateStandardRequireBomStockDetail> stockDetailsList=new ArrayList<>();
            List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList=new ArrayList<>();
            getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList);
            // 批量插入以提高性能
            if (!requiresList.isEmpty()) {
@@ -187,6 +190,24 @@
                    int end = Math.min(i + batchSize, requiresList.size());
                    List<ApsPlateStandardRequire> batch = requiresList.subList(i, end);
                    apsPlateStandardRequireMapper.batchInsert(batch);
                }
            }
            if(!stockDetailsList.isEmpty()){
                int batchSize = 1000;
                for (int i = 0; i < stockDetailsList.size(); i += batchSize) {
                    int end = Math.min(i + batchSize, stockDetailsList.size());
                    List<ApsPlateStandardRequireBomStockDetail> batch = stockDetailsList.subList(i, end);
                    plateBomStockDetailMapper.batchInsert(batch);
                }
            }
            if(!orderDetailsList.isEmpty()){
                int batchSize = 1000;
                for (int i = 0; i < orderDetailsList.size(); i += batchSize) {
                    int end = Math.min(i + batchSize, orderDetailsList.size());
                    List<ApsPlateStandardRequireBomOrderDetail> batch = orderDetailsList.subList(i, end);
                    plateBomOrderDetailMapper.batchInsert(batch);
                }
            }
        }
@@ -206,7 +227,12 @@
     * @param allRequires 所有需求的列表
     * @param level 层级
     */
    private void getBomRequires(String plant, String bomHeaderCode, String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
    private void getBomRequires(String plant, String bomHeaderCode, String bomLineId,String itemCode,BigDecimal itemNum,
                                String batchNum, Date upLevelStartDate, ApsPlatePlan plan,
                                List<ApsPlateStandardRequire> allRequires,
                                Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList
                                ,List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList
    ) {
        /*构建需求信息*/
        ApsPlateStandardRequire require = new ApsPlateStandardRequire();
        require.setId(IdUtil.getSnowflakeNextId());
@@ -258,7 +284,7 @@
                    require.setNetRequirement(BigDecimal.ZERO);
                }
                /*记录库存剩余数量,记录库存使用记录*/
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId());
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId(),stockDetailsList);
            }
        }
        /*未匹配数量,默认为净需求*/
@@ -311,7 +337,7 @@
            require.setMatchState("待匹配");
            require.setMatchMode("工单匹配");
            /*使用子件工单进行需求匹配*/
            matchRequireAndSubPlan(require);
            matchRequireAndSubPlan(require,orderDetailsList);
        }
        allRequires.add(require);
        if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
@@ -320,7 +346,10 @@
            List<ApsBom> bomLineList = bomLineService.selectRdsBomLineList(plant, itemCode);
            if (!bomLineList.isEmpty()) {
                bomLineList.forEach(line -> {
                    getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
                    getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum
                            , require.getStartDate(), plan, allRequires, nextLevel,stockDetailsList
                            ,orderDetailsList
                    );
                });
            }
        }
@@ -352,7 +381,7 @@
    * 使用子件工单匹配需求中的净需求
    * */
    private void matchRequireAndSubPlan(ApsPlateStandardRequire require) {
    private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList) {
        BigDecimal netRequirement = require.getNetRequirement();
        require.setMatchMode("工单匹配");
        if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
@@ -364,7 +393,7 @@
                    /* 库存数量 大于 净需求数量*/
                    /* 净需求数量=0 ,子件工单未匹配数量= 库存-净需求*/
                    BigDecimal subtract = stock.subtract(netRequirement);
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
                    netRequirement = BigDecimal.ZERO;
                    require.setMatchState("已匹配");
                    require.setUnmatchedDemandAmount(BigDecimal.ZERO);
@@ -374,7 +403,7 @@
                    /*净需求数量 == 库存数量*/
                    BigDecimal subtract = BigDecimal.ZERO;
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement);
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
                    netRequirement = BigDecimal.ZERO;
                    require.setMatchState("已匹配");
                    require.setUnmatchedDemandAmount(BigDecimal.ZERO);
@@ -386,7 +415,7 @@
                    BigDecimal rest = netRequirement.subtract(stock);
                    require.setMatchState("匹配中");
                    /*工单 未匹配数量为0 全部用于匹配需求*/
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement);
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement,orderDetailsList);
                    /*净需求未被满足,需要继续匹配*/
                    platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(),  require.getBomLineCode());
                    /*剩余净需求*/