钣金工单计划管理：新增 查看上下阶需求接口

zhanghl

2025-05-13 a9f55fb1ab24f43fee70b16e1a8c58a33fc59fa6

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlateStandardRequireServiceImpl.java

@@ -14,6 +14,7 @@
import jakarta.annotation.Resource;
import com.aps.core.domain.ApsPlateStandardRequire;
import com.aps.core.mapper.ApsPlateStandardRequireMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.core.service.IApsPlateStandardRequireService;
@@ -27,6 +28,7 @@
 * @author zhl
 * @date 2025-05-06
 */
@Slf4j
@Service
public class ApsPlateStandardRequireServiceImpl implements IApsPlateStandardRequireService 
{
@@ -72,7 +74,7 @@

    @Resource
    IApsPlateStandardRequireBatchService requireBatchService;
    @Autowired
    @Resource
    private IApsMaterialStorageManagementService storageManagementService;

    /**
@@ -173,6 +175,8 @@
        String batchNum= requireBatchService.getNewBatchNumber();
        /*获取钣金主单信息*/
        List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
        Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
        log.info("开始生成需求：");
        for (ApsPlatePlan mainPlan : mainPlans) {
            String itemNumber = mainPlan.getItemNumber();
            /*根据料号 获取BOM Header */
@@ -182,8 +186,10 @@
            List<ApsPlateStandardRequireBomStockDetail> stockDetailsList=new ArrayList<>();
            List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList=new ArrayList<>();


            getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null, mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList);
            log.info("开始生成需求：工单号："+mainPlan.getDocumentNumber());
            getBomRequires(plantCode, "0","0",itemNumber,BigDecimal.ONE, batchNum, null
                    , mainPlan, requiresList, 0L,stockDetailsList,orderDetailsList,usedStorage
            );

            // 批量插入以提高性能
            if (!requiresList.isEmpty()) {
@@ -194,24 +200,33 @@
                    apsPlateStandardRequireMapper.batchInsert(batch);
                }
            }
            log.info("生成完成");
//            if(!stockDetailsList.isEmpty()){
//                int batchSize = 1000;
//                stockDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
//                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;
//                orderDetailsList.forEach(x->x.setId(IdUtil.getSnowflakeNextId()));
//                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);
//                }
//            }
            /*集中保存库存信息*/
           /* if(!usedStorage.isEmpty()){
                usedStorage.forEach((key, sm) -> {
                    storageManagementService.updateRemainderStock(sm.getId(),sm.getRemainderStock(),sm.getVersion());
                });
            }*/

            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);
                }
            }
        }
    }

@@ -234,8 +249,9 @@
    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
                                Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList,
                                List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,
                                 Hashtable<String, ApsMaterialStorageManagement> usedStorage
    ) {
        /*构建需求信息*/
        ApsPlateStandardRequire require = new ApsPlateStandardRequire();
@@ -248,26 +264,36 @@
        require.setBomLineId(bomLineId);
        require.setBomLineCode(itemCode);
        require.setBomLineLevel(level);
        require.setBomUseAmount(itemNum);
        require.setOrderCreateTime(plan.getOrderCreateTime());
        require.setCreateTime(DateUtils.getNowDate());
        require.setCreateBy(SecurityUtils.getUsername());
        require.setDelFlag("0");
        require.setProductionBase(plan.getProductionBase());
        /*计算需求数量*/
        /*BOM用量 level0=1 */
        if (level == 0) {
            require.setBomUseAmount(BigDecimal.ONE);
        } else {
            require.setBomUseAmount(itemNum.multiply(plan.getProductionQuantity()));
            require.setBomUseAmount(itemNum);
        }
        /*计算需求数量*/
        require.setRequireAmount(itemNum.multiply(plan.getProductionQuantity()));
        /*查找库存，计算净需求，保存剩余库存，保存库存扣减明细*/
        BigDecimal remainderStock = BigDecimal.ZERO;
        /*默认净需求为BOM用量*/
        require.setNetRequirement(require.getBomUseAmount());
        Optional<ApsMaterialStorageManagement> itemStorage = Optional.of(storageManagementService.getRdsStorage( plant,  itemCode));
        if (itemStorage.isPresent()) {
            ApsMaterialStorageManagement storage = itemStorage.get();
            /*剩余库存*/
            remainderStock = storage.getRemainderStock();
        require.setNetRequirement(require.getRequireAmount());

        /*读取库存信息的优先级-> 内存、redis、db*/
       /* ApsMaterialStorageManagement storage = usedStorage.get(itemCode);
        if(storage==null){
            storage = storageManagementService.getRdsStorage(plant, itemCode);
            if(storage!=null){
                *//*剩余库存*//*
                remainderStock = storage.getRemainderStock();
            }
        }*/
        Optional<ApsMaterialStorageManagement> itemStorageOpt = storageManagementService.getItemStorage(plant, itemCode);
        if (itemStorageOpt.isPresent()) {
            ApsMaterialStorageManagement     itemStorage=itemStorageOpt.get();
            BigDecimal remainderStock =itemStorage.getRemainderStock();
            /*计算净需求 默认=需求数量*/
            if (remainderStock.compareTo(BigDecimal.ZERO) == 0) {
                require.setNetRequirement(require.getBomUseAmount());
@@ -286,9 +312,11 @@
                    require.setNetRequirement(BigDecimal.ZERO);
                }
                /*记录库存剩余数量，记录库存使用记录*/
                bomStockDetailService.saveStorageAndDetail(storage, plan, bomLineId,itemCode, batchNum, deductionAmount
                        , afterStockAmount,require.getId(),stockDetailsList
                bomStockDetailService.saveStorageAndDetail(itemStorage, plan, bomLineId, itemCode, batchNum, deductionAmount
                        , afterStockAmount, require.getId(), stockDetailsList
                );
                /*更新内存中的库存使用信息*/
               // usedStorage.put(itemCode, storage);
            }
        }
        /*未匹配数量，默认为净需求*/
@@ -322,7 +350,12 @@

        /*设置开始时间*/
        Date startDay = new Date();
        startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
        /*开始时间 默认为 完成时间 如果净需求>0 开始时间=结束时间-工序总工时*/
        startDay.setTime(require.getCompleteDate().getTime());
        if(require.getNetRequirement().compareTo(BigDecimal.ZERO)>0){
            startDay.setTime(require.getCompleteDate().getTime() - totalRouteMillisecond);
        }

        require.setStartDate(startDay);

        /*计算是否有风险*/
@@ -338,12 +371,12 @@
        require.setMatchState("已匹配");
        require.setMatchMode("库存匹配");
        if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
            require.setMatchState("待匹配");
            require.setMatchMode("工单匹配");
            /*使用子件工单进行需求匹配*/
            matchRequireAndSubPlan(require,orderDetailsList);
        }
        allRequires.add(require);
        log.info("已生成需求："+plan.getDocumentNumber()+"bomHeaderCode:"+bomHeaderCode+"bomLineCode:"+itemCode+"bomLevel:"+level);
        if (require.getNetRequirement().compareTo(BigDecimal.ZERO) > 0) {
            /*当前Bom节点处理完成后，处理下级BOM*/
            long nextLevel=level+1;
@@ -352,21 +385,11 @@
                bomLineList.forEach(line -> {
                    getBomRequires(plant, itemCode, line.getBomLineId(),line.getItemCode() ,line.getNum() , batchNum
                            , require.getStartDate(), plan, allRequires, nextLevel,stockDetailsList
                            ,orderDetailsList
                            ,orderDetailsList,usedStorage
                    );
                });
            }
        }
    }
    /**
     * 获取物料库存信息
     * */
    private Optional<ApsMaterialStorageManagement> getItemStorage(String plant, String itemNumber) {
        ApsMaterialStorageManagement storageParam = new ApsMaterialStorageManagement();
        storageParam.setItemNumber(itemNumber);
        storageParam.setApplicableFactories(plant);
        return itemStorageMapper.selectApsMaterialStorageManagementList(storageParam).stream()
                .findFirst();
    }


@@ -389,6 +412,7 @@
    private void matchRequireAndSubPlan(ApsPlateStandardRequire require, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList) {
        BigDecimal netRequirement = require.getNetRequirement();
        require.setMatchMode("工单匹配");
        require.setMatchState("已匹配");
        if (netRequirement.compareTo(BigDecimal.ZERO) > 0) {
            ApsPlatePlan platePlan = apsPlatePlanMapper.selectUnMatchPlateSubPlan(require.getOrgCode(),  require.getBomLineCode());
            /*子件工单的未匹配数量 作为当前的库存*/
@@ -400,7 +424,7 @@
                    BigDecimal subtract = stock.subtract(netRequirement);
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
                    netRequirement = BigDecimal.ZERO;
                    require.setMatchState("已匹配");

                    require.setUnmatchedDemandAmount(BigDecimal.ZERO);
                    /*净需求已经被满足，不需要继续匹配*/

@@ -410,7 +434,7 @@
                    BigDecimal subtract = BigDecimal.ZERO;
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, subtract, stock, netRequirement,orderDetailsList);
                    netRequirement = BigDecimal.ZERO;
                    require.setMatchState("已匹配");

                    require.setUnmatchedDemandAmount(BigDecimal.ZERO);
                    /*净需求已经被满足，不需要继续匹配*/
                }
@@ -418,7 +442,7 @@
                    /*需求大于库存*/
                    /*净需求 被部分满足 */
                    BigDecimal rest = netRequirement.subtract(stock);
                    require.setMatchState("匹配中");

                    /*工单 未匹配数量为0 全部用于匹配需求*/
                    bomOrderDetailService.savePlastPlanAndBomOrderDetail(require, platePlan, BigDecimal.ZERO, stock, netRequirement,orderDetailsList);
                    /*净需求未被满足，需要继续匹配*/
@@ -428,6 +452,7 @@
                    require.setUnmatchedDemandAmount(rest);
                }
            }

        }
    }