Преглед изворни кода

fix: 航次库存详情添加共享库存字段,修改扣库存问题

luofeiyun пре 3 недеља
родитељ
комит
bc20fe871d

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

@@ -117,7 +117,8 @@ public class VoyageStockDetailServiceImpl implements VoyageStockDetailService {
                 BigDecimal num = numMap.get(item.getRoomModelId() + "_" + item.getFloor());
                 BigDecimal totalNum = totalNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
                 if(num != null) {
-                    item.setShareNum(item.getShareNum().subtract(totalNum).add(num));
+                    //共享库存应该加上上次分出去的再减去这次分出去的
+                    item.setShareNum(item.getShareNum().add(totalNum).subtract(num));
                 }
             });
             voyageStockDetailMapper.updateBatch(list);

+ 3 - 3
ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -101,7 +101,7 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
                 list = BeanUtils.toBean(createReqVO, VoyageStockDistributeNewDO.class);
                 list.stream().forEach(item -> {
                     item.setBookNum(zero);
-                    item.setTotalNum(item.getNum());
+                    item.setTotalNum(zero);
                 });
                 if(!CollectionUtils.isAnyEmpty(list)) {
                     voyageStockDistributeNewMapper.insertBatch(list);
@@ -117,13 +117,13 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
                 map.keySet().stream().forEach(key -> {
                     if(existList.contains(key)) { //存在,做修改
                         VoyageStockDistributeNewDO voyageStockDistributeNewDO = existMap.get(key);
+                        voyageStockDistributeNewDO.setTotalNum(voyageStockDistributeNewDO.getNum().add(voyageStockDistributeNewDO.getBookNum()));
                         voyageStockDistributeNewDO.setNum(map.get(key));
                         voyageStockDistributeNewDO.setRoomModelNum(mapVO.get(key).getRoomModelNum());
-                        voyageStockDistributeNewDO.setTotalNum(voyageStockDistributeNewDO.getNum().add(voyageStockDistributeNewDO.getBookNum()));
                         updateList.add(voyageStockDistributeNewDO);
                     }else { //不存在,做插入
                         VoyageStockDistributeNewDO voyageStockDistributeNewDO = BeanUtils.toBean(mapVO.get(key), VoyageStockDistributeNewDO.class);
-                        voyageStockDistributeNewDO.setTotalNum(voyageStockDistributeNewDO.getNum());
+                        voyageStockDistributeNewDO.setTotalNum(zero);
                         insertList.add(voyageStockDistributeNewDO);
                     }
                 });