修改

xuhy

2024-09-10 abfedddb15ff90b7810a231dac964d2450372b94

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java

@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.constant.OrderNumConstants;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.domain.TOrderSaleGoods;
import com.ruoyi.system.domain.TOrderStock;
import com.ruoyi.system.domain.TOrderStockGoods;
@@ -43,7 +44,7 @@
    @Override
    public void add(TOrderStockDTO dto) {
        // 进货单号
        dto.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateOrderSn());
        dto.setStockNum(OrderNumConstants.STOCK + CodeGenerateUtils.generateVolumeSn());
        List<TOrderStockGoods> orderStockGoods = dto.getOrderStockGoods();
//        BigDecimal sum = orderStockGoods.stream().map(TOrderStockGoods::getStockPrice).reduce(BigDecimal::add).get();
//        dto.setStockTotalPrice(sum);
@@ -102,8 +103,8 @@
                    endTime = LocalDateTime.now();
                    break;
            }
            query.setStartTime(startTime);
            query.setEndTime(endTime);
            query.setStartTime(DateUtils.localDateTimeToDate(startTime));
            query.setEndTime(DateUtils.localDateTimeToDate(endTime));
        }
        PageInfo<TOrderStockVO> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize());
        List<TOrderStockVO> list = this.baseMapper.pageList(query,pageInfo);
@@ -156,8 +157,8 @@
                    endTime = LocalDateTime.now();
                    break;
            }
            query.setStartTime(startTime);
            query.setEndTime(endTime);
            query.setStartTime(DateUtils.localDateTimeToDate(startTime));
            query.setEndTime(DateUtils.localDateTimeToDate(endTime));
        }
        List<TOrderStockVO> list = this.baseMapper.stockGeneratorExport(query);
        // 查询商品