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

huangjiayang

2025-05-12 c26bb1aef89d6d0c3301dbcac638b1fc9e0e63d1

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

@@ -63,5 +63,7 @@
     */
    public int deleteApsPlateStandardRequireBomOrderDetailById(Long id);

    void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement);
    void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract
            , BigDecimal stock, BigDecimal netRequirement, List<ApsPlateStandardRequireBomOrderDetail> orderDetailsList
    );
}