Bläddra i källkod

fix:添加实际房间数和虚拟房间数字段,允许上架超过实际房间数

luofeiyun 1 månad sedan
förälder
incheckning
56928169f1

+ 4 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestock/vo/VoyageStockBaseVO.java

@@ -62,4 +62,8 @@ public class VoyageStockBaseVO {
     @Schema(description = "虚拟房间数")
     @ExcelProperty("虚拟房间数")
     private Integer virtualNum;
+
+    @Schema(description = "实房间数")
+    @ExcelProperty("实房间数")
+    private Integer realTotalNum;
 }

+ 4 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/vo/VoyageStockDetailSaveReqVO.java

@@ -47,5 +47,9 @@ public class VoyageStockDetailSaveReqVO {
     @ExcelProperty("虚拟房间数")
     private Integer virtualNum;
 
+    @Schema(description = "实房间数")
+    @ExcelProperty("实房间数")
+    private Integer realTotalNum;
+
 
 }

+ 4 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyagestockdetail/vo/VoyageStockDetailTotalRespVO.java

@@ -66,4 +66,8 @@ public class VoyageStockDetailTotalRespVO {
     @Schema(description = "虚拟房间数")
     @ExcelProperty("虚拟房间数")
     private Integer virtualNum;
+
+    @Schema(description = "实房间数")
+    @ExcelProperty("实房间数")
+    private Integer realTotalNum;
 }

+ 5 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyagestock/VoyageStockDO.java

@@ -83,4 +83,9 @@ public class VoyageStockDO extends TenantBaseDO {
      */
     private Integer virtualNum;
 
+    /**
+     * 实际房间总数
+     */
+    private Integer realTotalNum;
+
 }

+ 5 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyagestockdetail/VoyageStockDetailDO.java

@@ -83,4 +83,9 @@ public class VoyageStockDetailDO extends TenantBaseDO {
      */
     private Integer virtualNum;
 
+    /**
+     * 实际房间总数
+     */
+    private Integer realTotalNum;
+
 }

+ 4 - 0
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -94,10 +94,12 @@ public class VoyageServiceImpl implements VoyageService {
             List<RoomModelFloorNumDTO> list = shipApi.queryRoomModelFloorToNum(reqVO.getShipId());
             int sum = list.stream().mapToInt(RoomModelFloorNumDTO::getNum).sum();
             voyageStockDO.setTotalNum(sum);
+            voyageStockDO.setRealTotalNum(sum);
             voyageStockDO.setNotShelfNum(sum);
             voyageStockDO.setShelfedNum(0);
             voyageStockDO.setBookNum(0);
             voyageStockDO.setCanSellNum(0);
+            voyageStockDO.setVirtualNum(0);
             voyageStockDO.setOversoldNum(0);
             voyageStockDO.setSurplusNum(sum);
             voyageStockMapper.insert(voyageStockDO);
@@ -110,12 +112,14 @@ public class VoyageServiceImpl implements VoyageService {
                 stockDetailDO.setRoomModelName(item.getRoomModelName());
                 stockDetailDO.setFloor(item.getFloor());
                 stockDetailDO.setTotalNum(item.getNum());
+                stockDetailDO.setRealTotalNum(item.getNum());
                 stockDetailDO.setShelfNum(0);
                 stockDetailDO.setNotShelfNum(item.getNum());
                 stockDetailDO.setShelfedNum(0);
                 stockDetailDO.setBookNum(0);
                 stockDetailDO.setCanSellNum(0);
                 stockDetailDO.setOversoldNum(0);
+                stockDetailDO.setVirtualNum(0);
                 stockDetailDO.setSurplusNum(item.getNum());
                 stockDetailDOS.add(stockDetailDO);
             });