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

zhanghl

2025-05-12 088a46dc697ef5b719f1ab62c9988f96a21e5e0c

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

@@ -14,6 +14,7 @@
import com.aps.core.mapper.ApsPlateStandardRequireBomOrderDetailMapper;
import com.aps.core.domain.ApsPlateStandardRequireBomOrderDetail;
import com.aps.core.service.IApsPlateStandardRequireBomOrderDetailService;
import org.springframework.transaction.annotation.Transactional;

/**
 * ApsPlateStandardRequireBomOrderDetailService业务层处理
@@ -101,7 +102,7 @@
    {
        return apsPlateStandardRequireBomOrderDetailMapper.deleteApsPlateStandardRequireBomOrderDetailById(id);
    }

    @Transactional
    @Override
    public void savePlastPlanAndBomOrderDetail(ApsPlateStandardRequire require, ApsPlatePlan platePlan, BigDecimal subtract, BigDecimal stock, BigDecimal netRequirement) {
        platePlan.setUnmatchedQuantity(subtract);