zhanghl
2025-05-09 5c5bc65b0edb80a4c990015a43bda0f800b25202
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java
@@ -175,13 +175,11 @@
            String itemNumber = mainPlan.getItemNumber();
            /*根据料号 获取BOM Header */
            /*当前Bom节点处理完成后,处理下级BOM*/
            List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plantCode, itemNumber);
            List<ApsPlateStandardRequire> requiresList=new ArrayList<>();
            if(!bomLineList.isEmpty()){
                bomLineList.forEach(line -> {
                    getBomRequires(plantCode, line, batchNum, null, mainPlan, requiresList, 0L);
                });
            }
            getBomRequires(plantCode, "0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L);
            // 批量插入以提高性能
            if (!requiresList.isEmpty()) {
                int batchSize = 1000;
@@ -196,10 +194,18 @@
    /**
     * 构建需求信息
     * */
    private void getBomRequires(String plant, ApsBom bomLine, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
        String itemNumber = bomLine.getItemCode();
     *
     * @param plant 工厂代码
     * @param bomLineId BOM行ID
     * @param itemCode 物料代码
     * @param itemNum 物料数量
     * @param batchNum 批次号
     * @param upLevelStartDate 上级工序的开始日期
     * @param plan 计划对象
     * @param allRequires 所有需求的列表
     * @param level 层级
     */
    private void getBomRequires(String plant,  String bomLineId,String itemCode,BigDecimal itemNum, String batchNum, Date upLevelStartDate, ApsPlatePlan plan, List<ApsPlateStandardRequire> allRequires, Long level) {
        /*构建需求信息*/
        ApsPlateStandardRequire require = new ApsPlateStandardRequire();
        require.setId(IdUtil.getSnowflakeNextId());
@@ -207,24 +213,27 @@
        require.setBatchNumber(batchNum);
        require.setDocNum(plan.getDocumentNumber());
        require.setOrgCode(plant);
        require.setBomLineCode(itemNumber);
        require.setBomLineId(bomLineId);
        require.setBomLineCode(itemCode);
        require.setBomLineLevel(level);
        require.setBomUseAmount(bomLine.getNum());
        require.setBomUseAmount(itemNum);
        require.setCreateTime(DateUtils.getNowDate());
        require.setCreateBy(SecurityUtils.getUsername());
        require.setDelFlag("0");
        require.setProductionBase(plan.getProductionBase());
        /*计算需求数量*/
        if (level == 0) {
            require.setBomUseAmount(BigDecimal.ONE);
            require.setCompleteDate(plan.getPlanEndDay());
            require.setDemandDate(plan.getPlanEndDay());
        } else {
            require.setBomUseAmount(bomLine.getNum().multiply(plan.getProductionQuantity()));
            require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
        }
        /*查找库存,计算净需求,保存剩余库存,保存库存扣减明细*/
        BigDecimal remainderStock = BigDecimal.ZERO;
        /*默认净需求为BOM用量*/
        require.setNetRequirement(require.getBomUseAmount());
        Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemNumber);
        Optional<ApsMaterialStorageManagement> itemStorage = getItemStorage(plant, itemCode);
        if (itemStorage.isPresent()) {
            ApsMaterialStorageManagement storage = itemStorage.get();
            /*剩余库存*/
@@ -246,10 +255,10 @@
                    afterStockAmount = remainderStock.subtract(deductionAmount);
                    require.setNetRequirement(BigDecimal.ZERO);
                }
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLine, batchNum, deductionAmount, afterStockAmount,require.getId());
                /*记录库存剩余数量,记录库存使用记录*/
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount, afterStockAmount,require.getId());
            }
        }
        /*工艺路线总需求*/
        ApsStandardProcessRouteLine routeHeader = routeLineService.getRouteLineTotalTime(require);
        String routeId = routeHeader.getRouteId();
@@ -297,10 +306,11 @@
        allRequires.add(require);
        if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
            /*当前Bom节点处理完成后,处理下级BOM*/
            List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemNumber);
            long nextLevel=level+1;
            List<ApsBom> bomLineList = bomLineService.selectApsBomLineList(plant, itemCode);
            if (!bomLineList.isEmpty()) {
                bomLineList.forEach(line -> {
                    getBomRequires(plant, line, batchNum, require.getStartDate(), plan, allRequires, level + 1);
                    getBomRequires(plant, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum, require.getStartDate(), plan, allRequires, nextLevel);
                });
            }
        }