2025-1-15

src/main/java/com/spring/modules/quote/service/impl/QuoteDetailServiceImpl.java

@@ -300,12 +300,14 @@ public class QuoteDetailServiceImpl extends ServiceImpl<QuoteDetailMapper, Quote
                     Objects.nonNull(bagQuantity.get().getNumValue()) &&
                     Objects.nonNull(bagCost.get().getNumValue())) {
                 BigDecimal num1 = new BigDecimal(0);
+                // 包装袋成本/包装数量
                 if (bagCost.get().getNumValue().compareTo(new BigDecimal(0)) >= 1 || bagQuantity.get().getNumValue().compareTo(new BigDecimal(0)) >= 1) {
                     num1 = bagCost.get().getNumValue().divide(bagQuantity.get().getNumValue());
                 }
                 BigDecimal num2 = new BigDecimal(0);
+                // 箱子成本/(每箱袋数*每袋数量)
                 if (bagQuantity.get().getNumValue().compareTo(new BigDecimal(0)) >= 1 || boxOfBags.get().getNumValue().compareTo(new BigDecimal(0)) >= 1) {
-                    num2 = bagQuantity.get().getNumValue().divide(boxOfBags.get().getNumValue());
+                    num2 = packBoxCost.get().getNumValue().divide(bagQuantity.get().getNumValue().multiply(boxOfBags.get().getNumValue()));
                 }
                 packCost = num1.add(num2);
             }