Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-16 a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf

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

@@ -64,5 +64,8 @@
     */
    public int deleteApsPlateStandardRequireBomStockDetailById(Long id);

    void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, ApsBom bomLine, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,String requireId);
    void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId
            ,String itemCode, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId
             , List<ApsPlateStandardRequireBomStockDetail> stockDetailsList
    );
}