From 9aefdca43aba60fb331e796ad5c791ba51c4c2b1 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Sat, 13 Jul 2024 15:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=E5=90=8E=E7=AB=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/biz/service/storage/StorageServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java index 51872854..c0a4e412 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java +++ b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java @@ -46,6 +46,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -294,11 +295,8 @@ public class StorageServiceImpl implements StorageService { } else if(OperateTypeEnum.AUDIT.name().equals(updateReqVO.getActive()) && updateObj.getStockType() == StockTypeEnum.IN.getCode()){ - Calendar calendar = Calendar.getInstance(); - calendar.setTime(new Date(String.valueOf(LocalDate.now()))); - - String firstDay = calendar.get(Calendar.YEAR)+"-"+calendar.get(Calendar.MONDAY)+"-01 00:00:00"; - String lastDay = getLastDayOfMonth(new Date(String.valueOf(LocalDate.now()))).toString()+" 23:59:59"; + String firstDay = LocalDate.now().getYear()+"-"+ LocalDateTime.now().getMonthValue() +"-01 00:00:00"; + String lastDay = LocalDate.now()+" 23:59:59"; TplusStorageOutPageReqVO reqOutVO = new TplusStorageOutPageReqVO(); reqOutVO.setPageSize(PageParam.PAGE_SIZE_NONE);