汇总统计bug修复

src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java

@@ -23,11 +23,13 @@ import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.*;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.inout.IoOrderMutiMapper;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;

src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java

@@ -234,6 +234,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
                 .eq("month", dateTime.monthBaseOne())
                 .eq("day", dateTime.dayOfMonth()) //取前天的数据
                 .eq("relIdFk", orderDetailResultEntity.getBindRlFk())
+                .eq(StrUtil.isNotBlank(orderDetailResultEntity.getDeptCode()), "deptCode", orderDetailResultEntity.getDeptCode())
                 .eq(StrUtil.isNotBlank(orderDetailResultEntity.getBatchNo()), "batchNo", orderDetailResultEntity.getBatchNo())
                 .eq(StrUtil.isNotBlank(orderDetailResultEntity.getNameCode()), "nameCode", orderDetailResultEntity.getNameCode());
         return wrapper;

src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java

@@ -141,8 +141,9 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean);
         statOrderEntity.setRecordKey(orderNo);
         statOrderEntity.setType(3);
-        statOrderEntity.setDate(lastMonth);
         statOrderEntity.setTitle(lastMonth.year() + " 年 " + lastMonth.monthBaseOne() + " 月出入库汇总");
+        DateUtil.offsetMonth(lastMonth,+1);
+        statOrderEntity.setDate(lastMonth);
 
         Date updateTime = new Date();
         statOrderEntity.setUpdateTime(updateTime);
@@ -254,6 +255,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
         }
 
         wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk());
+        wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode());
         return wrapper;

src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java

@@ -250,6 +250,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
                     .eq("quarter", yesterday.quarter() - 1);
         }
         wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk());
+        wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode());
         return wrapper;

src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java

@@ -232,6 +232,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
         QueryWrapper<IoStatYearEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("year", yesterday.year() - 1);
         wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk());
+        wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getDeptCode()), "deptCode", ioOrderDetailResultEntity.getDeptCode());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getBatchNo()), "batchNo", ioOrderDetailResultEntity.getBatchNo());
         wrapper.eq(StrUtil.isNotBlank(ioOrderDetailResultEntity.getNameCode()), "nameCode", ioOrderDetailResultEntity.getNameCode());
         return wrapper;