From da392a50b1ea129d1626c1936f0b5ed5ed457b30 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 10 九月 2024 17:14:50 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
index 687bd4f..f52f708 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderStockServiceImpl.java
+++ b/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);
// 查询商品
--
Gitblit v1.7.1