出入库业务单添加金额逻辑;

This commit is contained in:
王奎兴
2026-06-04 17:38:08 +08:00
parent c1fe11a982
commit e3021854a1
@@ -236,11 +236,20 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
ReservationOutMaterialDetailDO reservationOutMaterialDetailDO = new ReservationOutMaterialDetailDO();
reservationOutMaterialDetailDO.setOutOrderNumber(reservationStockOutOrderDO.getOutOrderNumber());
MaterialBaseInfoPO materialBaseInfoPO = stockInOrderMapper.getByCode(productDetail.getProductCode());
reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP).add(new BigDecimal(productDetail.getBoxCount()).setScale(2, BigDecimal.ROUND_HALF_UP)));
reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
reservationOutMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
reservationOutMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
if (materialBaseInfoPO != null) {
reservationOutMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
reservationOutMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
reservationOutMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
reservationOutMaterialDetailDO.setBarCode(materialBaseInfoPO.getBarCode());
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
if (unitPrice != null) {
reservationOutMaterialDetailDO.setUnitPrice(unitPrice);
BigDecimal amount = unitPrice.multiply(reservationOutMaterialDetailDO.getQuantity());
reservationOutMaterialDetailDO.setTotalAmount(amount);
}
}
reservationOutMaterialDetailDO.setQuantity(new BigDecimal(productDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
reservationOutMaterialDetailDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
reservationOutMaterialDetailDO.setOrganizationName(loginUser.getUserPo().getOrganizationName());
reservationOutMaterialDetailDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
@@ -380,6 +389,13 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
reservationInMaterialDetailDO.setMaterialBaseInfoId(materialBaseInfoPO.getMaterialBaseInfoId());
reservationInMaterialDetailDO.setMaterialName(materialBaseInfoPO.getMaterialName());
reservationInMaterialDetailDO.setMaterialCode(materialBaseInfoPO.getMaterialCode());
// reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice();
if (unitPrice != null) {
reservationInMaterialDetailDO.setUnitPrice(unitPrice);
BigDecimal amount = unitPrice.multiply(reservationInMaterialDetailDO.getQuantity());
reservationInMaterialDetailDO.setTotalPrice(amount);
}
}
reservationInMaterialDetailDO.setQuantity(new BigDecimal(stockInProductDetail.getPieceCount()).setScale(2, BigDecimal.ROUND_HALF_UP));
String lot = generateDateSerialNumber();