UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

汇总统计

Browse Source
test
anthonywj 2 years ago
parent 70323f2e5f
commit e319a9888d
16 changed files with 303 additions and 200 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java
Unescape Escape View File

@ -6,6 +6,7 @@ import com.glxp.api.req.inout.CptTraceRequest;
import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
import com.glxp.api.res.inout.CptTraceOrderResponse;
import com.glxp.api.res.inout.IoOrderDetailResultResponse;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import io.lettuce.core.dynamic.annotation.Param;
import java.util.List;
@ -33,7 +34,7 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
*
* @return
*/
List<IoOrderDetailResultEntity> selectStatDataByTime(@Param("list") List<String> orderIdFk);
List<IoOrderDetailStatRsponse> selectStatDataByTime(@Param("list") List<String> orderIdFk);
List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
}

3
src/main/java/com/glxp/api/entity/inout/IoOrderDetailResultEntity.java
Unescape Escape View File

@ -192,5 +192,6 @@ public class IoOrderDetailResultEntity {
@TableField(exist = false)
private String deptCode;
@TableField(exist = false)
private String invCode;
}

8
src/main/java/com/glxp/api/entity/inout/IoStatDayEntity.java
Unescape Escape View File

@ -166,6 +166,14 @@ public class IoStatDayEntity {
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
@TableField(exist = false)
private String deptName;

6
src/main/java/com/glxp/api/entity/inout/IoStatMonthEntity.java
Unescape Escape View File

@ -160,6 +160,12 @@ public class IoStatMonthEntity {
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
@TableField(exist = false)
private String deptName;
}

13
src/main/java/com/glxp/api/entity/inout/IoStatOrderEntity.java
Unescape Escape View File

@ -54,4 +54,17 @@ public class IoStatOrderEntity {
@TableField(value = "remark")
private String remark;
/**
* 仓库编码
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
}

5
src/main/java/com/glxp/api/entity/inout/IoStatQuarterEntity.java
Unescape Escape View File

@ -154,6 +154,11 @@ public class IoStatQuarterEntity {
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
@TableField(exist = false)
private String deptName;

5
src/main/java/com/glxp/api/entity/inout/IoStatYearEntity.java
Unescape Escape View File

@ -147,6 +147,11 @@ public class IoStatYearEntity {
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库编码
*/
@TableField(value = "invCode")
private String invCode;
@TableField(exist = false)
private String deptName;

23
src/main/java/com/glxp/api/res/inv/IoOrderDetailStatRsponse.java
Unescape Escape View File

@ -0,0 +1,23 @@
package com.glxp.api.res.inv;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class IoOrderDetailStatRsponse {
private String mainAction;
private String orderIdFk;
private String bindRlFk;
private String nameCode;
private String batchNo;
private String coName;
private String spec;
private BigDecimal price;
private int reCount;
private String deptCode;
private String invCode;
}

37
src/main/java/com/glxp/api/service/inout/impl/IoStatDayServiceImpl.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.api.dao.inout.IoStatDayDao;
import com.glxp.api.dao.inout.IoStatOrderDao;
import com.glxp.api.entity.inout.*;
import com.glxp.api.req.inout.FilterStatDataDetailRequest;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import com.glxp.api.service.inout.IoStatDayService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
@ -58,8 +59,8 @@ public class IoStatDayServiceImpl implements IoStatDayService {
//查询单号
List<String> orderIdFkList = new ArrayList<>();
orderIdFkList = orderDao.selectOrderIdList(yesterday.toString("yyyy-MM-dd"));
List<IoOrderDetailResultEntity> orderDetailResultEntities = new ArrayList<>();
if(orderIdFkList.size()>0){
List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
if (orderIdFkList.size() > 0) {
orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);
}
if (CollUtil.isNotEmpty(orderDetailResultEntities)) {
@ -69,7 +70,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
IoStatDayEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday);
//查询此单是出库还是入库
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode",orderDetailResultEntity.getDeptCode()));
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (order.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -95,8 +96,8 @@ public class IoStatDayServiceImpl implements IoStatDayService {
ew.eq("quarter", twoDay.quarter());
ew.eq("month", twoDay.monthBaseOne());
ew.eq("day", twoDay.dayOfMonth());
List<IoStatDayEntity> ioStatDayEntityList=statDayDao.selectList(ew);
List<IoStatDayEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatDayEntityList,yesterday);
List<IoStatDayEntity> ioStatDayEntityList = statDayDao.selectList(ew);
List<IoStatDayEntity> newOrOldDate = getNewOrOldDate(dataList, ioStatDayEntityList, yesterday);
dataList.addAll(newOrOldDate);
//插入汇总记录
saveData(yesterday, dataList);
@ -126,7 +127,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
* @param orderDetailResultEntity
* @return
*/
private IoStatDayEntity getStatData(List<IoStatDayEntity> dataList, IoOrderDetailResultEntity orderDetailResultEntity, DateTime yesterday) {
private IoStatDayEntity getStatData(List<IoStatDayEntity> dataList, IoOrderDetailStatRsponse orderDetailResultEntity, DateTime yesterday) {
if (CollUtil.isNotEmpty(dataList)) {
for (IoStatDayEntity statDayEntity : dataList) {
if (Long.valueOf(statDayEntity.getRelIdFk()).equals(orderDetailResultEntity.getBindRlFk()) && statDayEntity.getDeptCode().equals(orderDetailResultEntity.getDeptCode())) {
@ -183,7 +184,6 @@ public class IoStatDayServiceImpl implements IoStatDayService {
//设置结余价格
statData.setBalancePrice(null == orderDetailResultEntity.getPrice() ? BigDecimal.ZERO : orderDetailResultEntity.getPrice());
dataList.add(statData);
return statData;
}
@ -192,9 +192,16 @@ public class IoStatDayServiceImpl implements IoStatDayService {
* 保存日汇总数据到数据库
*
* @param date 生成日期
* @param dataList 数据集合
*/
private void saveData(Date date, List<IoStatDayEntity> dataList) {
private void saveData(Date date, List<IoStatDayEntity> statDayEntities) {
Map<String, List<IoStatDayEntity>> stringListMap = statDayEntities.stream()
.collect(Collectors.groupingBy(IoStatDayEntity::getInvCode));
for (String key : stringListMap.keySet()) {
List<IoStatDayEntity> dataList = stringListMap.get(key);
//生成汇总记录
IoStatOrderEntity statOrderEntity = new IoStatOrderEntity();
//生成记录号
@ -202,12 +209,12 @@ public class IoStatDayServiceImpl implements IoStatDayService {
String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean);
statOrderEntity.setRecordKey(orderNo);
statOrderEntity.setType(4);
statOrderEntity.setInvCode(key);
statOrderEntity.setDate(date);
statOrderEntity.setTitle(DateUtil.format(date, "yyyy-MM-dd") + " 日出入库汇总");
Date updateTime = new Date();
statOrderEntity.setUpdateTime(updateTime);
statOrderDao.insert(statOrderEntity);
SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, TransactionIsolationLevel.READ_COMMITTED);
@ -219,7 +226,6 @@ public class IoStatDayServiceImpl implements IoStatDayService {
//计算结余数据
statDayEntity.setBalanceCount(statDayEntity.getBalanceCount() + statDayEntity.getInCount() - statDayEntity.getOutCount());
statDayEntity.setBalanceAmount(statDayEntity.getBalanceAmount().add(statDayEntity.getInAmount()).subtract(statDayEntity.getOutAmount()));
mapper.insert(statDayEntity);
});
@ -227,9 +233,12 @@ public class IoStatDayServiceImpl implements IoStatDayService {
sqlSession.close();
}
private static QueryWrapper<IoStatDayEntity> buildQueryWrapper(IoOrderDetailResultEntity orderDetailResultEntity, DateTime yesterday) {
}
private static QueryWrapper<IoStatDayEntity> buildQueryWrapper(IoOrderDetailStatRsponse orderDetailResultEntity, DateTime yesterday) {
QueryWrapper<IoStatDayEntity> wrapper = new QueryWrapper<>();
DateTime dateTime =DateUtil.offsetDay(yesterday, -1); //取前天的时间
DateTime dateTime = DateUtil.offsetDay(yesterday, -1); //取前天的时间
wrapper.eq("year", dateTime.year())
.eq("month", dateTime.monthBaseOne())
.eq("day", dateTime.dayOfMonth()) //取前天的数据
@ -240,7 +249,7 @@ public class IoStatDayServiceImpl implements IoStatDayService {
return wrapper;
}
private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity,DateTime yesterday){
private List<IoStatDayEntity> getNewOrOldDate(List<IoStatDayEntity> newIoStatDayEntity, List<IoStatDayEntity> oldIoStatDayEntity, DateTime yesterday) {
// 计算出两个集合之间产品批次号组成的差异
List<IoStatDayEntity> IoStatDayEntityList = oldIoStatDayEntity.stream()

30
src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.api.dao.schedule.SystemParamConfigDao;
import com.glxp.api.entity.inout.*;
import com.glxp.api.req.inout.FilterStatDataDetailRequest;
import com.glxp.api.res.dev.DateRequest;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import com.glxp.api.service.inout.IoStatMonthService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
@ -55,14 +56,14 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
@Override
public void statData(Date date) {
DateTime lastMonth = DateUtil.offsetMonth(date,-1);
DateTime lastMonth = DateUtil.offsetMonth(date, -1);
DateRequest dateRequest1 = getfirstDayAndLastDay(lastMonth.year(), lastMonth.monthBaseOne());
List<IoStatMonthEntity> dataList = new ArrayList<>();
//查询单号
List<String> orderIdFkList = new ArrayList<>();
orderIdFkList = orderDao.selectOrderfirstAndLastIdList(dateRequest1.getFirstDay(), dateRequest1.getLastDay());
List<IoOrderDetailResultEntity> orderDetailResultEntities = new ArrayList<>();
if(orderIdFkList.size()>0){
List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
if (orderIdFkList.size() > 0) {
orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);
}
@ -74,7 +75,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
IoStatMonthEntity statData = getStatData(dataList, orderDetailResultEntity, lastMonth);
//查询此单是出库还是入库
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode",orderDetailResultEntity.getDeptCode()));
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (order.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -102,8 +103,8 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
ew.eq("year", lastMonth.year())
.eq("month", lastMonth.monthBaseOne() - 1);//取上上月的数据
}
List<IoStatMonthEntity> ioStatMonthEntityList=statMonthDao.selectList(ew);
List<IoStatMonthEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList,lastMonth);
List<IoStatMonthEntity> ioStatMonthEntityList = statMonthDao.selectList(ew);
List<IoStatMonthEntity> newOrOldDate = getNewOrOldDate(dataList, ioStatMonthEntityList, lastMonth);
dataList.addAll(newOrOldDate);
//插入汇总记录
@ -130,9 +131,14 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
* 保存月汇总数据记录到数据库
*
* @param lastMonth
* @param dataList
*/
private void saveData(DateTime lastMonth, List<IoStatMonthEntity> dataList) {
private void saveData(DateTime lastMonth, List<IoStatMonthEntity> statMonthEntities) {
Map<String, List<IoStatMonthEntity>> stringListMap = statMonthEntities.stream()
.collect(Collectors.groupingBy(IoStatMonthEntity::getInvCode));
for (String key : stringListMap.keySet()) {
List<IoStatMonthEntity> dataList = stringListMap.get(key);
//生成汇总记录
IoStatOrderEntity statOrderEntity = new IoStatOrderEntity();
//生成记录号
@ -141,7 +147,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
statOrderEntity.setRecordKey(orderNo);
statOrderEntity.setType(3);
statOrderEntity.setTitle(lastMonth.year() + " 年 " + lastMonth.monthBaseOne() + " 月出入库汇总");
DateUtil.offsetMonth(lastMonth,+1);
DateUtil.offsetMonth(lastMonth, +1);
statOrderEntity.setDate(lastMonth);
Date updateTime = new Date();
@ -165,6 +171,8 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
sqlSession.close();
}
}
/**
* 获取新的汇总数据
*
@ -173,7 +181,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
* @param lastMonth
* @return
*/
private IoStatMonthEntity getStatData(List<IoStatMonthEntity> dataList, IoOrderDetailResultEntity orderDetailResultEntity, DateTime lastMonth) {
private IoStatMonthEntity getStatData(List<IoStatMonthEntity> dataList, IoOrderDetailStatRsponse orderDetailResultEntity, DateTime lastMonth) {
if (CollUtil.isNotEmpty(dataList)) {
for (IoStatMonthEntity statDayEntity : dataList) {
@ -242,7 +250,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
* @param lastMonth
* @return
*/
private Wrapper<IoStatMonthEntity> buildQueryWrapper(IoOrderDetailResultEntity ioOrderDetailResultEntity, DateTime lastMonth) {
private Wrapper<IoStatMonthEntity> buildQueryWrapper(IoOrderDetailStatRsponse ioOrderDetailResultEntity, DateTime lastMonth) {
QueryWrapper<IoStatMonthEntity> wrapper = new QueryWrapper<>();
if (lastMonth.monthBaseOne() == 1) {
//当前汇总的记录为1月，上一月份的时间取前一年的12月

37
src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.inout.*;
import com.glxp.api.entity.inout.*;
import com.glxp.api.req.inout.FilterStatDataDetailRequest;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import com.glxp.api.service.inout.IoStatQuarterService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
@ -54,15 +55,15 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
//查询上一季度各个月度的数据
int quarter = yesterday.quarter();
int year = yesterday.year();
String topDate=getStartDayOfQuarter(year,quarter);
String lastDate=getLastDayOfQuarter(year,quarter);
String topDate = getStartDayOfQuarter(year, quarter);
String lastDate = getLastDayOfQuarter(year, quarter);
//查询单号
List<String> orderIdFkList = new ArrayList<>();
//汇总上一个季度的数据
List<IoStatQuarterEntity> dataList = new ArrayList<>();
orderIdFkList = orderDao.selectOrderfirstAndLastIdList(lastDate, topDate);
List<IoOrderDetailResultEntity> orderDetailResultEntities = new ArrayList<>();
if(orderIdFkList.size()>0){
List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
if (orderIdFkList.size() > 0) {
orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);
}
@ -73,7 +74,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
IoStatQuarterEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday);
//查询此单是出库还是入库
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode",orderDetailResultEntity.getDeptCode()));
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (order.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -95,9 +96,9 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
//获取上上天的数据
QueryWrapper<IoStatQuarterEntity> ew = new QueryWrapper<>();
ew.eq("year", yesterday.year());
ew.eq("quarter", yesterday.quarter()-1);
List<IoStatQuarterEntity> ioStatMonthEntityList=statQuarterDao.selectList(ew);
List<IoStatQuarterEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList,yesterday);
ew.eq("quarter", yesterday.quarter() - 1);
List<IoStatQuarterEntity> ioStatMonthEntityList = statQuarterDao.selectList(ew);
List<IoStatQuarterEntity> newOrOldDate = getNewOrOldDate(dataList, ioStatMonthEntityList, yesterday);
dataList.addAll(newOrOldDate);
@ -127,9 +128,15 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
* 插入汇总数据
*
* @param yesterday 时间
* @param dataList 数据集合
*/
private void saveData(DateTime yesterday, List<IoStatQuarterEntity> dataList) {
private void saveData(DateTime yesterday, List<IoStatQuarterEntity> statQuarterEntities) {
Map<String, List<IoStatQuarterEntity>> stringListMap = statQuarterEntities.stream()
.collect(Collectors.groupingBy(IoStatQuarterEntity::getInvCode));
for (String key : stringListMap.keySet()) {
List<IoStatQuarterEntity> dataList = stringListMap.get(key);
//生成汇总记录
IoStatOrderEntity statOrderEntity = new IoStatOrderEntity();
//生成记录号
@ -137,7 +144,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean);
statOrderEntity.setRecordKey(orderNo);
statOrderEntity.setType(2);
DateTime dateTime=DateUtil.offsetDay(yesterday,+1);
DateTime dateTime = DateUtil.offsetDay(yesterday, +1);
statOrderEntity.setDate(dateTime);
statOrderEntity.setTitle(yesterday.year() + " 年 " + yesterday.quarter() + " 季度出入库汇总");
@ -163,6 +170,8 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
sqlSession.close();
}
}
/**
* 获取季度数据
*
@ -171,7 +180,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
* @param yesterday
* @return
*/
private IoStatQuarterEntity getStatData(List<IoStatQuarterEntity> dataList, IoOrderDetailResultEntity orderDetailResultEntity, DateTime yesterday) {
private IoStatQuarterEntity getStatData(List<IoStatQuarterEntity> dataList, IoOrderDetailStatRsponse orderDetailResultEntity, DateTime yesterday) {
if (CollUtil.isNotEmpty(dataList)) {
for (IoStatQuarterEntity statDayEntity : dataList) {
@ -238,7 +247,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
* @param yesterday
* @return
*/
private QueryWrapper<IoStatQuarterEntity> buildQueryWrapper(IoOrderDetailResultEntity ioOrderDetailResultEntity, DateTime yesterday) {
private QueryWrapper<IoStatQuarterEntity> buildQueryWrapper(IoOrderDetailStatRsponse ioOrderDetailResultEntity, DateTime yesterday) {
QueryWrapper<IoStatQuarterEntity> wrapper = new QueryWrapper<>();
if (yesterday.quarter() == 1) {
//当前汇总的记录为第一季度，上一季度时间取前一年的第四季度数据
@ -329,7 +338,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
ioStatDayEntity.setBeginAmount(ioStatDayEntity.getBalanceAmount());
ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
ioStatDayEntity.setQuarter(ioStatDayEntity.getQuarter()+1);
ioStatDayEntity.setQuarter(ioStatDayEntity.getQuarter() + 1);
ioStatDayEntity.setInAmount(new BigDecimal(0));
ioStatDayEntity.setOutAmount(new BigDecimal(0));
ioStatDayEntity.setInCount(0);

36
src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java
Unescape Escape View File

@ -10,6 +10,7 @@ import com.glxp.api.constant.ConstantType;
import com.glxp.api.dao.inout.*;
import com.glxp.api.entity.inout.*;
import com.glxp.api.req.inout.FilterStatDataDetailRequest;
import com.glxp.api.res.inv.IoOrderDetailStatRsponse;
import com.glxp.api.service.inout.IoStatYearService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
@ -55,9 +56,9 @@ public class IoStatYearServiceImpl implements IoStatYearService {
//查询单号
List<String> orderIdFkList = new ArrayList<>();
//汇总上一个季度的数据
orderIdFkList = orderDao.selectOrderfirstAndLastIdList(yesterday.year()+"-12-31", yesterday.year()+"-01-01");
List<IoOrderDetailResultEntity> orderDetailResultEntities = new ArrayList<>();
if(orderIdFkList.size()>0){
orderIdFkList = orderDao.selectOrderfirstAndLastIdList(yesterday.year() + "-12-31", yesterday.year() + "-01-01");
List<IoOrderDetailStatRsponse> orderDetailResultEntities = new ArrayList<>();
if (orderIdFkList.size() > 0) {
orderDetailResultEntities = ioOrderDetailResultDao.selectStatDataByTime(orderIdFkList);
}
@ -68,7 +69,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
IoStatYearEntity statData = getStatData(dataList, orderDetailResultEntity, yesterday);
//查询此单是出库还是入库
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode",orderDetailResultEntity.getDeptCode()));
IoOrderEntity order = orderDao.selectOne(new QueryWrapper<IoOrderEntity>().select("mainAction").eq("billNo", orderDetailResultEntity.getOrderIdFk()).eq("deptCode", orderDetailResultEntity.getDeptCode()));
if (order.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库
statData.setInCount(orderDetailResultEntity.getReCount() + statData.getInCount());
@ -89,9 +90,9 @@ public class IoStatYearServiceImpl implements IoStatYearService {
//汇总上一季度存在上上一季度不存在产品的汇总数据
//获取上上天的数据
QueryWrapper<IoStatYearEntity> ew = new QueryWrapper<>();
ew.eq("year", yesterday.year()-1);
List<IoStatYearEntity> ioStatMonthEntityList=statYearDao.selectList(ew);
List<IoStatYearEntity> newOrOldDate=getNewOrOldDate(dataList,ioStatMonthEntityList,yesterday);
ew.eq("year", yesterday.year() - 1);
List<IoStatYearEntity> ioStatMonthEntityList = statYearDao.selectList(ew);
List<IoStatYearEntity> newOrOldDate = getNewOrOldDate(dataList, ioStatMonthEntityList, yesterday);
dataList.addAll(newOrOldDate);
@ -120,9 +121,15 @@ public class IoStatYearServiceImpl implements IoStatYearService {
* 插入汇总数据
*
* @param yesterday
* @param dataList
*/
private void saveData(DateTime yesterday, List<IoStatYearEntity> dataList) {
private void saveData(DateTime yesterday, List<IoStatYearEntity> statYearEntities) {
Map<String, List<IoStatYearEntity>> stringListMap = statYearEntities.stream()
.collect(Collectors.groupingBy(IoStatYearEntity::getInvCode));
for (String key : stringListMap.keySet()) {
List<IoStatYearEntity> dataList = stringListMap.get(key);
//生成汇总记录
IoStatOrderEntity statOrderEntity = new IoStatOrderEntity();
//生成记录号
@ -130,7 +137,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean);
statOrderEntity.setRecordKey(orderNo);
statOrderEntity.setType(1);
DateTime dateTime=DateUtil.offsetDay(yesterday,+1);
DateTime dateTime = DateUtil.offsetDay(yesterday, +1);
statOrderEntity.setDate(dateTime);
statOrderEntity.setTitle(yesterday.year() + " 年度出入库汇总");
@ -155,6 +162,9 @@ public class IoStatYearServiceImpl implements IoStatYearService {
sqlSession.close();
}
}
/**
* 获取汇总数据
*
@ -163,7 +173,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
* @param yesterday
* @return
*/
private IoStatYearEntity getStatData(List<IoStatYearEntity> dataList, IoOrderDetailResultEntity orderDetailResultEntity, DateTime yesterday) {
private IoStatYearEntity getStatData(List<IoStatYearEntity> dataList, IoOrderDetailStatRsponse orderDetailResultEntity, DateTime yesterday) {
if (CollUtil.isNotEmpty(dataList)) {
for (IoStatYearEntity statDayEntity : dataList) {
@ -229,7 +239,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
* @param ioOrderDetailResultEntity
* @param yesterday
*/
private QueryWrapper<IoStatYearEntity> buildQueryWrapper(IoOrderDetailResultEntity ioOrderDetailResultEntity, DateTime yesterday) {
private QueryWrapper<IoStatYearEntity> buildQueryWrapper(IoOrderDetailStatRsponse ioOrderDetailResultEntity, DateTime yesterday) {
QueryWrapper<IoStatYearEntity> wrapper = new QueryWrapper<>();
wrapper.eq("year", yesterday.year() - 1);
wrapper.eq("relIdFk", ioOrderDetailResultEntity.getBindRlFk());
@ -275,7 +285,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
ioStatDayEntity.setBeginCount(ioStatDayEntity.getBalanceCount());
ioStatDayEntity.setBeginAmount(ioStatDayEntity.getBalanceAmount());
ioStatDayEntity.setBeginPrice(ioStatDayEntity.getBalancePrice());
ioStatDayEntity.setYear(ioStatDayEntity.getYear()+1);
ioStatDayEntity.setYear(ioStatDayEntity.getYear() + 1);
ioStatDayEntity.setInAmount(new BigDecimal(0));
ioStatDayEntity.setOutAmount(new BigDecimal(0));
ioStatDayEntity.setInCount(0);

1
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -663,5 +663,4 @@
</otherwise>
</choose>
</select>
</mapper>

13
src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
Unescape Escape View File

@ -28,7 +28,7 @@
a1.mainAction,
a1.auditTime,
b1.NAME AS fromCorpName,
(select name from auth_warehouse aw where aw.code= a1.fromInvCode) as fromInvName,
(select name from auth_warehouse aw where aw.code = a1.fromInvCode) as fromInvName,
(SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = a1.action) billTypeName
FROM io_order_detail_result a2
LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
@ -92,7 +92,7 @@
</where>
</select>
<select id="selectStatDataByTime" resultType="com.glxp.api.entity.inout.IoOrderDetailResultEntity">
<select id="selectStatDataByTime" resultType="com.glxp.api.res.inv.IoOrderDetailStatRsponse">
select orderIdFk,
bindRlFk,
nameCode,
@ -101,12 +101,13 @@
spec,
price,
reCount,
io_order.deptCode
io_order.deptCode,
io_order.invCode
from io_order_detail_result
left JOIN io_order on io_order.billNo=io_order_detail_result.orderIdFk
left JOIN io_order on io_order.billNo = io_order_detail_result.orderIdFk
<where>
<if test="list != null and list.size() > 0 ">
orderIdFk in
<if test="list != null and list.size() > 0">
and io_order_detail_result.orderIdFk in
<foreach item="item" index="index" collection="list"
open="(" separator="," close=")">
#{item}

1
src/main/resources/mybatis/mapper/inout/IoStatOrderDao.xml
Unescape Escape View File

@ -19,5 +19,4 @@
</if>
</where>
</select>
</mapper>

6
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -997,3 +997,9 @@ CALL Pro_Temp_ColumnWork('inv_count_codes', 'expireDate', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_count_codes', 'serialNo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_count_order', 'codeCount', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_stat_order', 'deptCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_stat_day', 'invCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_stat_month', 'invCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_stat_quarter', 'invCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_stat_year', 'invCode', 'varchar(255)', 1);

Write Preview
Loading…
Cancel
Save