出入库

src/main/java/com/dk/mdm/service/ivt/inbound/InboundPurchaseReturnService.java

@@ -382,12 +382,12 @@ public class InboundPurchaseReturnService extends BaseService<Inbound> {
         InboundResponse inboundResponse = inboundMapper.selectById(inboundVO.getIntoId());
         BigDecimal sumIntoQty = inboundVO.getItemList().stream().map(InboundItemVO::getIntoQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         BigDecimal sumIntoAmt = inboundVO.getItemList().stream().map(InboundItemVO::getIntoAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumIntoingQty = inboundVO.getItemList().stream().map(InboundItemVO::getIntoingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumIntoingAmt = inboundVO.getItemList().stream().map(InboundItemVO::getIntoAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumIntoingQty = inboundVO.getItemList().stream().map(InboundItemVO::getIntoingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumIntoingAmt = inboundVO.getItemList().stream().map(InboundItemVO::getIntoAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
         inboundVO.setIntoQty(sumIntoQty);
         inboundVO.setIntoAmt(sumIntoAmt);
-        inboundVO.setIntoingQty(inboundResponse.getIntoingQty().subtract(sumIntoingQty));
-        inboundVO.setIntoingAmt(inboundResponse.getIntoingAmt().subtract(sumIntoingAmt));
+        inboundVO.setIntoingQty(inboundResponse.getIntoingQty().subtract(sumIntoQty));
+        inboundVO.setIntoingAmt(inboundResponse.getIntoingAmt().subtract(sumIntoAmt));
         //入库状态
         String intoStatus = this.setIntoStatus(inboundVO.getIntoingQty(), inboundVO.getIntoQty());
         inboundVO.setIntoStatus(intoStatus);

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundOtherService.java

@@ -264,12 +264,12 @@ public class OutboundOtherService extends BaseService<Outbound> {
         OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
         BigDecimal sumOutQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         BigDecimal sumOutAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
         outboundVO.setOutQty(sumOutQty);
         outboundVO.setOutAmt(sumOutAmt);
-        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutingQty));
-        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutingAmt));
+        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutQty));
+        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutAmt));
         //出库状态
         String outStatus = this.setOutStatus(outboundVO.getOutingQty(), outboundVO.getOutQty());
         outboundVO.setOutStatus(outStatus);

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -376,12 +376,12 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
         OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
         BigDecimal sumOutQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         BigDecimal sumOutAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
         outboundVO.setOutQty(sumOutQty);
         outboundVO.setOutAmt(sumOutAmt);
-        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutingQty));
-        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutingAmt));
+        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutQty));
+        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutAmt));
         //出库状态
         String outStatus = this.setOutStatus(outboundVO.getOutingQty(), outboundVO.getOutQty());
         outboundVO.setOutStatus(outStatus);
@@ -407,8 +407,8 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
             //endregion
             order.setOutingQty(sumOutQty);
             order.setOutingAmt(sumOutAmt);
-            order.setOutQty(sumOutingQty.negate());
-            order.setOutAmt(sumOutingAmt.negate());
+            order.setOutQty(sumOutQty.negate());
+            order.setOutAmt(sumOutAmt.negate());
             //根据id查询
             OrderResponse orderResponse = orderMapper.selectById(outboundVO.getFromId());
             //出库状态

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -380,12 +380,12 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
         OutboundResponse outboundResponse = outboundMapper.selectById(outboundVO.getOutId());
         BigDecimal sumOutQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
         BigDecimal sumOutAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
-        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingQty = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingQty).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(6, BigDecimal.ROUND_HALF_UP);
+//        BigDecimal sumOutingAmt = outboundVO.getItemList().stream().map(OutboundItemVO::getOutingAmt).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
         outboundVO.setOutQty(sumOutQty);
         outboundVO.setOutAmt(sumOutAmt);
-        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutingQty));
-        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutingAmt));
+        outboundVO.setOutingQty(outboundResponse.getOutingQty().subtract(sumOutQty));
+        outboundVO.setOutingAmt(outboundResponse.getOutingAmt().subtract(sumOutAmt));
         //出库状态
         String outStatus = this.setOutStatus(outboundVO.getOutingQty(), outboundVO.getOutQty());
         outboundVO.setOutStatus(outStatus);