Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

hongjli

2025-05-14 c357f8844e03627d0c3bea4bf2058e7c69ff3518

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsPlateOrderPlanManagerController.java

@@ -34,7 +34,7 @@
    /**
     * 查询钣金工单计划
     */
    @RequiresPermissions("ApsPlatOrderPlanManager:list")
    /*@RequiresPermissions("ApsPlatOrderPlanManager:list")*/
    @GetMapping("/list")
    public TableDataInfo list(ApsPlateOrderPlanManager apsPlateOrderPlanManager)
    {

 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java

@@ -27,6 +27,7 @@

    /** 需求ID */
    @Excel(name = "需求ID")
    @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long requireId;

    /** 需求追溯ID */

 aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlateStandardRequireService.java

@@ -68,6 +68,6 @@
     */
    public List<ApsPlateStandardRequire> selectPlateSupplyGapList(ApsPlateStandardRequire apsPlateStandardRequire);

    @Transactional

    void generatorPlan();
}

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

@@ -175,7 +175,7 @@
        String batchNum= requireBatchService.getNewBatchNumber();
        /*获取钣金主单信息*/
        List<ApsPlatePlan> mainPlans = platePlanMapper.selectPlatePlanByPlantMajor(plantCode,mainOrderType);
        Hashtable<String, ApsMaterialStorageManagement> usedStorage = new Hashtable<>();
        Hashtable<String, BigDecimal> usedStorage = new Hashtable<>();
        log.info("开始生成需求：");
        for (ApsPlatePlan mainPlan : mainPlans) {
            String itemNumber = mainPlan.getItemNumber();
@@ -228,6 +228,10 @@
            }*/

        }
        usedStorage.forEach((key,value)->{
            log.info("料号："+key+"，库存："+value);
        });

    }

    /**
@@ -251,7 +255,7 @@
                                List<ApsPlateStandardRequire> allRequires,
                                Long level,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList,
                                List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList,
                                 Hashtable<String, ApsMaterialStorageManagement> usedStorage
                                 Hashtable<String, BigDecimal> usedStorage
    ) {
        /*构建需求信息*/
        ApsPlateStandardRequire require = new ApsPlateStandardRequire();
@@ -316,7 +320,7 @@
                        , afterStockAmount, require.getId(), stockDetailsList
                );
                /*更新内存中的库存使用信息*/
               // usedStorage.put(itemCode, storage);
               usedStorage.put(itemCode, afterStockAmount);
            }
        }
        /*未匹配数量，默认为净需求*/