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

huangjiayang

2025-05-12 f003459b33063abdcca11bb6aea1ed550ca5cc7d

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

@@ -111,7 +111,10 @@
     * */
    @Transactional
    @Override
    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId,String itemCode, String batchNum, BigDecimal deductionAmount, BigDecimal afterStockAmount,Long requireId){
    public void saveStorageAndDetail(ApsMaterialStorageManagement itemStorage, ApsPlatePlan plan, String bomLineId,
                                     String itemCode, String batchNum, BigDecimal deductionAmount,
                                     BigDecimal afterStockAmount,Long requireId
            ,List<ApsPlateStandardRequireBomStockDetail> stockDetailsList){
        /*更新物料剩余库存*/
        itemStorageMapper.updateMaterialStorageByVersion(itemStorage.getId(), afterStockAmount,itemStorage.getVersion());
        /*记录扣减明细*/
@@ -131,8 +134,8 @@
        bomStockDetail.setCreateBy(SecurityUtils.getUsername());
        bomStockDetail.setCreateTime(DateUtils.getNowDate());

        plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);
        stockDetailsList.add(bomStockDetail);
        //plateBomStockDetailMapper.insertApsPlateStandardRequireBomStockDetail(bomStockDetail);

    }

}