root/wms_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：历史库存分析

Browse Source
This commit is contained in:
liuxy
2023-10-08 13:28:40 +08:00
parent ee24ae7c2a
commit 9c27279dbc
8 changed files with 693 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/StIvtStructivtDailyMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -20,5 +21,12 @@ public interface StIvtStructivtDailyMapper extends BaseMapper<StIvtStructivtDail
@Select("SELECT #{table} AS table_name,GROUP_CONCAT(a.struct_code) struct_code, 'A1' AS product_area, st_ivt_structattr.stor_id,st_ivt_structattr.stor_name , st_ivt_structattr.sect_id,st_ivt_structattr.sect_name , UUID_SHORT( ) id,a.material_id,md_me_materialbase.material_code,md_me_materialbase.material_spec, sum( canuse_qty ) canuse_qty, sum( frozen_qty ) frozen_qty, sum( ivt_qty ) ivt_qty, sum( warehousing_qty ) warehousing_qty, qty_unit_id, CURDATE( ) create_time FROM ${table} as a left join st_ivt_structattr on a.struct_code = st_ivt_structattr.struct_code left join md_me_materialbase on a.material_id = md_me_materialbase.material_id GROUP BY material_id")
List<Map> selectStructivt(@Param("table") String table);
/**
* 大屏数据 - 近一周工段产量
* @param list /
* @return /
*/
List<JSONObject> getHistoryivt(@Param("chanList") List<String> list, @Param("query") Map json);
}

27
mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/service/dailyStructivt/dao/mapper/xml/StIvtStructivtDailyMapper.xml
View File

@@ -1,5 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper.StIvtStructivtDailyMapper">
<select id="getHistoryivt" resultType="com.alibaba.fastjson.JSONObject">
SELECT
da.*,
mater.material_name
FROM
st_ivt_structivt_daily da
LEFT JOIN md_me_materialbase mater ON da.material_id = mater.material_id
<where>
da.create_time IN
<foreach collection="chanList" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
<if test="query.stor_id != null and query.stor_id != ''">
and da.stor_id = #{query.stor_id}
</if>
<if test="query.material_code != null and query.material_code != ''">
and (mater.material_code LIKE '%${query.material_code}%' or
mater.material_name LIKE '%${query.material_code}%' or
mater.material_spec LIKE '%${query.material_code}%')
</if>
order by da.create_time
</where>
</select>
</mapper>

48
mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/rest/HistoryivtController.java Normal file
View File

@@ -0,0 +1,48 @@
package org.nl.wms.stata_manage.rest;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.wms.stata_manage.service.HistoryivtService;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Map;
/**
* @author Liuxy
* @date 2022-06-28
**/
@RestController
@RequiredArgsConstructor
@Api(tags = "历史库存统计分析")
@RequestMapping("/api/historyivt")
@Slf4j
public class HistoryivtController {
private final HistoryivtService historyivtService;
@GetMapping
@ApiOperation("库存查询")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(historyivtService.queryAll(whereJson, page), HttpStatus.OK);
}
@GetMapping("/getHeader")
@ApiOperation("获取表头")
public ResponseEntity<Object> getHeader() {
return new ResponseEntity<>(historyivtService.getHeader(), HttpStatus.OK);
}
@PostMapping("/autoWeb")
@ApiOperation("线性图")
public ResponseEntity<Object> autoWeb(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(historyivtService.autoWeb(whereJson), HttpStatus.OK);
}
}

39
mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/HistoryivtService.java Normal file
View File

@@ -0,0 +1,39 @@
package org.nl.wms.stata_manage.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.springframework.data.domain.Pageable;
import java.util.Map;
/**
* @author Liuxy
* @description 服务接口
* @date 2022-06-28
**/
public interface HistoryivtService {
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 获取表头
*/
JSONArray getHeader();
/**
* 线形图数据获取
* @return /
*/
JSONObject autoWeb( JSONObject whereJson );
}

211
mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/impl/HistoryivtServiceImpl.java Normal file
View File

@@ -0,0 +1,211 @@
package org.nl.wms.stata_manage.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.modules.common.utils.PageUtil;
import org.nl.wms.masterdata_manage.storage.service.dailyStructivt.dao.mapper.StIvtStructivtDailyMapper;
import org.nl.wms.stata_manage.service.HistoryivtService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* @author Liuxy
* @description 服务实现
* @date 2022-06-28
**/
@Service
@RequiredArgsConstructor
@Slf4j
public class HistoryivtServiceImpl implements HistoryivtService {
@Autowired
private StIvtStructivtDailyMapper stIvtStructivtDailyMapper;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
String endTime = DateUtil.today();
DateTime toDay = DateUtil.parse(endTime);
String startTime = DateUtil.offsetDay(toDay, -6).toString().substring(0, 10);
// 7天时间集合
List<String> timeList =
DateUtil.rangeToList(DateUtil.parse(startTime), DateUtil.parse(endTime), DateField.DAY_OF_YEAR)
.stream()
.map(row -> row.toString().substring(0,10))
.collect(Collectors.toList());
List<JSONObject> ivtList = stIvtStructivtDailyMapper.getHistoryivt(timeList, whereJson);
// 处理数据
JSONArray data = new JSONArray();
Map<String, List<JSONObject>> ivt = ivtList.stream().collect(Collectors.groupingBy(
row -> row.getString("material_code")
));
for (String material_coed: ivt.keySet()) {
// 找出相同数据
List<JSONObject> findList = ivtList.stream()
.filter(row -> row.getString("material_code").equals(material_coed))
.collect(Collectors.toList());
JSONObject jsonObject = new JSONObject();
jsonObject.put("1", findList.get(0).getString("material_code"));
jsonObject.put("2", findList.get(0).getString("material_name"));
jsonObject.put("3", findList.get(0).getString("material_spec"));
for (JSONObject json : findList) {
jsonObject.put(json.getString("create_time"), NumberUtil.round(json.getDoubleValue("canuse_qty"), 3));
}
data.add(jsonObject);
}
// 处理分页
Map<String, Object> json = PageUtil.toPage(
PageUtil.toPage(page.getPageNumber(), page.getPageSize(), data),
data.size()
);
return json;
}
@Override
public JSONArray getHeader() {
JSONArray jsonResultArr = new JSONArray();
// 获取日期: 当前日期前7天
String todayStr = DateUtil.today();
DateTime toDay = DateUtil.parse(todayStr);
for (int i = 6; i >=0; i--) {
DateTime dateTime = DateUtil.offsetDay(toDay, -i);
JSONObject json = new JSONObject();
json.put("prop", dateTime.toString().substring(0, 10));
json.put("label", dateTime.toString().substring(0, 10));
jsonResultArr.add(json);
}
return jsonResultArr;
}
@Override
public JSONObject autoWeb(JSONObject whereJson) {
/*
* 处理数据
* 1.legend：每条线的名称
* 2.xAxis：所有日期
* 3.series：具体数据
*/
// 3.具体数据
List<JSONObject> allList = publicMethodQuery(whereJson);
// 1.每条线的名称
List<String> legendList = allList.stream()
.map(row -> row.getString("name"))
.collect(Collectors.toList());
// 2.所有日期
JSONArray headerArr = getHeader();
List<String> xAxisList = headerArr.stream()
.map(row -> ((JSONObject) row).getString("prop"))
.collect(Collectors.toList());
// 整理数据
JSONObject result = new JSONObject();
result.put("legenda",legendList);
result.put("xAxisa",xAxisList);
result.put("seriesa",allList);
return result;
}
/**
* 查询共用方法
* @param whereJson 、
* @return 、
*/
private List<JSONObject> publicMethodQuery(Map whereJson) {
String endTime = DateUtil.today();
DateTime toDay = DateUtil.parse(endTime);
String startTime = DateUtil.offsetDay(toDay, -6).toString().substring(0, 10);
// 7天时间集合
List<String> timeList =
DateUtil.rangeToList(DateUtil.parse(startTime), DateUtil.parse(endTime), DateField.DAY_OF_YEAR)
.stream()
.map(row -> row.toString().substring(0,10))
.collect(Collectors.toList());
List<JSONObject> ivtList = stIvtStructivtDailyMapper.getHistoryivt(timeList, whereJson);
// 处理数据
List<JSONObject> alldataList = new ArrayList<>();
Map<String, List<JSONObject>> ivt = ivtList.stream().collect(Collectors.groupingBy(
row -> row.getString("material_code")
));
for (String material_coed: ivt.keySet()) {
// 找出相同数据
List<JSONObject> findList = ivtList.stream()
.filter(row -> row.getString("material_code").equals(material_coed))
.collect(Collectors.toList());
JSONObject jsonObject = new JSONObject();
jsonObject.put("name", findList.get(0).getString("material_code"));
jsonObject.put("type", "line");
jsonObject.put("stack", "Total");
JSONArray data = new JSONArray();
JSONArray headerArr = getHeader();
List<String> xAxisList = headerArr.stream()
.map(row -> ((JSONObject) row).getString("prop"))
.collect(Collectors.toList());
xAxisList.forEach(row -> {
for (JSONObject json : findList) {
if (json.getString("create_time").equals(row)) {
data.add(NumberUtil.round(json.getDoubleValue("canuse_qty"), 3));
} else {
data.add(0);
}
}
});
jsonObject.put("data", data);
alldataList.add(jsonObject);
}
return alldataList;
}
}