diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java index b96c40ed..86e34c30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/StIvtStructivtDaily.java @@ -110,7 +110,15 @@ public class StIvtStructivtDaily implements Serializable { */ private BigDecimal warehousing_qty; + /** + * 入库数 + */ + private BigDecimal in_qty; + /** + * 出库数 + */ + private BigDecimal out_qty; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java index 94e7158f..25d96347 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java @@ -23,10 +23,16 @@ public interface StIvtStructivtDailyMapper extends BaseMapper selectStructivt(@Param("table") String table); /** - * 大屏数据 - 近一周工段产量 + * 获取历史库存 * @param list / * @return / */ List getHistoryivt(@Param("chanList") List list, @Param("query") Map json); + + /** + * 获取当天出入库数量 + * @return / + */ + List getIoNum(@Param("query") Map json); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml index 43dda196..ee835387 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml @@ -29,4 +29,58 @@ + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java index 86b0c03f..518adabd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/impl/StIvtStructivtDailyServiceImpl.java @@ -2,8 +2,10 @@ package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; @@ -15,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.transaction.Transactional; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -48,6 +51,35 @@ public class StIvtStructivtDailyServiceImpl extends ServiceImpl inNumList = this.baseMapper.getIoNum(param); + + // 出库数 + param.put("io_type", "1"); + List outNumList = this.baseMapper.getIoNum(param); + + // 整理数据 + for (StIvtStructivtDaily dao : list) { + + List jsonIn = inNumList.stream() + .filter(row -> row.getString("material_id").equals(dao.getMaterial_id())) + .collect(Collectors.toList()); + + dao.setIn_qty(ObjectUtil.isNotEmpty(jsonIn) ? jsonIn.get(0).getBigDecimal("io_num") : BigDecimal.valueOf(0)); + + List jsonOut = outNumList.stream() + .filter(row -> row.getString("material_id").equals(dao.getMaterial_id())) + .collect(Collectors.toList()); + + dao.setOut_qty(ObjectUtil.isNotEmpty(jsonOut) ? jsonOut.get(0).getBigDecimal("io_num") : BigDecimal.valueOf(0)); + } + if (!CollectionUtils.isEmpty(list)){ List errorData = list.stream().filter(stIvtStructivtDaily -> StringUtils.isEmpty(stIvtStructivtDaily.getStor_id()) || StringUtils.isEmpty(stIvtStructivtDaily.getMaterial_id())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(errorData)){ diff --git a/mes/qd/src/views/wms/stata_manage/historyivt/index.vue b/mes/qd/src/views/wms/stata_manage/historyivt/index.vue index 876fa7b5..4b610f40 100644 --- a/mes/qd/src/views/wms/stata_manage/historyivt/index.vue +++ b/mes/qd/src/views/wms/stata_manage/historyivt/index.vue @@ -87,7 +87,7 @@ - +