|
|
|
@ -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);
|
|
|
|
|