Browse Source

销售出库

koushanshan 1 year ago
parent
commit
6e80e83be8

+ 4 - 1
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -401,7 +401,7 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         //出库金额
         //出库金额
         BigDecimal sumIntoPriceAmt = BigDecimal.ZERO;
         BigDecimal sumIntoPriceAmt = BigDecimal.ZERO;
         if(orderTransmitFlag){
         if(orderTransmitFlag){
-             sumIntoQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+            sumIntoQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
             sumIntoPriceAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getPriceOut).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
             sumIntoPriceAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getPriceOut).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
         }
         }
         //获取 id/单号
         //获取 id/单号
@@ -430,6 +430,9 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             outboundVO
             outboundVO
                     .setOutQty(BigDecimal.ZERO)
                     .setOutQty(BigDecimal.ZERO)
                     .setOutAmt(BigDecimal.ZERO)
                     .setOutAmt(BigDecimal.ZERO)
+                    //用于销售订单自动创建出库单
+                    .setOutingQty(orderTransmitFlag ? sumIntoQty : outboundVO.getOutingQty())
+                    .setOutingAmt(orderTransmitFlag ? sumIntoQty.multiply(sumIntoPriceAmt) : outboundVO.getOutingAmt())
             ;
             ;
         }
         }