优化库存虚拟库存部分

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/VoyageStockDetailController.java

@@ -195,6 +195,7 @@ public class VoyageStockDetailController {
         sumDetailNewResp.setCanSellNum(filterList.stream().map(VoyageStockDetailNewRespVO::getCanSellNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setOversoldNum(filterList.stream().map(VoyageStockDetailNewRespVO::getOversoldNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setSurplusNum(filterList.stream().map(VoyageStockDetailNewRespVO::getSurplusNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+        sumDetailNewResp.setVirtualNumber(filterList.stream().map(VoyageStockDetailNewRespVO::getVirtualNumber).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setVirtualNum(filterList.stream().map(VoyageStockDetailNewRespVO::getVirtualNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setRealTotalNum(filterList.stream().map(VoyageStockDetailNewRespVO::getRealTotalNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         sumDetailNewResp.setShareNum(filterList.stream().map(VoyageStockDetailNewRespVO::getShareNum).filter(java.util.Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/vo/VoyageStockDetailNewRespVO.java

@@ -70,6 +70,10 @@ public class VoyageStockDetailNewRespVO {
     /**
      * 虚拟房间数
      */
+    private BigDecimal virtualNumber;
+    /**
+     * 虚拟房间库存数
+     */
     private BigDecimal virtualNum;
 
     /**

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdetail/VoyageStockDetailServiceImpl.java

@@ -308,6 +308,9 @@ public class VoyageStockDetailServiceImpl implements VoyageStockDetailService {
                 item.setLockNum(BigDecimal.ZERO);
                 item.setOtherNum(BigDecimal.ZERO);
             }
+            BigDecimal roomNum = item.getRoomNum() == null ? BigDecimal.ZERO : item.getRoomNum();
+            BigDecimal shelfedNum = item.getShelfedNum() == null ? BigDecimal.ZERO : item.getShelfedNum();
+            item.setVirtualNumber(shelfedNum.subtract(roomNum).max(BigDecimal.ZERO));
         });
         return bean;
     }