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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-10-09 09:37:20 +08:00
parent 8ab8ebf29f aa923a5a1a
commit dbb70827d8
34 changed files with 1540 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/EmBiStructivtMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.device_manage.ios.service.structIvt.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
@@ -28,4 +29,7 @@ public interface EmBiStructivtMapper extends BaseMapper<EmBiStructivt> {
List<Map> getSemiProductIvt(@Param("query") StructIvtEmQuery query);
List<Map> getStructIvt(@Param("query") StructIvtEmQuery query);
List<JSONObject> getIvtPor();
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/ios/service/structIvt/dao/mapper/xml/EmBiStructivtMapper.xml
View File

@@ -186,4 +186,20 @@
</if>
</where>
</select>
<select id="getIvtPor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
mater.material_code,
mater.material_name,
mater.material_spec,
MAX(unit.unit_name) AS unit_name,
SUM(ivt.canuse_qty) AS canuse_qty,
ROUND(SUM(ivt.canuse_qty) / (SELECT SUM(canuse_qty) FROM em_bi_structivt) * 100,2) AS pro
FROM
em_bi_structivt ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
GROUP BY ivt.material_id
</select>
</mapper>

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>

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java
View File

@@ -261,4 +261,19 @@ public class MpsSaleOrder implements Serializable{
*/
@ApiModelProperty(value = "/**后段提交标记*/")
private String behind_submit_flag;
/**
* 需生产数量
*/
@ApiModelProperty(value = "/**需生产数量*/")
private BigDecimal need_product_qty;
/**
* 刻字数量
*/
@ApiModelProperty(value = "/**刻字数量*/")
private BigDecimal lettering_qty;
/**
* 刻字数量
*/
@ApiModelProperty(value = "/**入库数量*/")
private BigDecimal in_storage_qty;
}

8
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml
View File

@@ -9,6 +9,8 @@
DATE_FORMAT(der.behind_plandeliver_date, '%Y-%m-%d' ) AS behindPlandeliverDate,
DATE_FORMAT(der.create_time, '%Y-%m-%d %H:%i:%s' ) AS createTime,
DATE_FORMAT(der.aps_update_time, '%Y-%m-%d %H:%i:%s' ) AS apsUpdateTime,
DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 7 DAY), '%Y-%m-%d') AS order_date,
DATE_FORMAT(DATE_ADD(der.plandeliver_date, INTERVAL 3 DAY), '%Y-%m-%d') AS warehousing_date,
mater.material_name
FROM
mps_sale_order der
@@ -22,13 +24,13 @@
and der.status = #{query.status}
</if>
<if test="query.sale_type != null">
and der.sale_type >= #{query.sale_type}
and der.sale_type = #{query.sale_type}
</if>
<if test="query.create_mode != null">
and der.create_mode >= #{query.create_mode}
and der.create_mode = #{query.create_mode}
</if>
<if test="query.cust_code != null">
and der.cust_code >= #{query.cust_code}
and der.cust_code = #{query.cust_code}
</if>
<if test="query.start_time != null and query.start_time != ''">
and der.create_time >= #{query.start_time}

73
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java
View File

@@ -160,6 +160,9 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
@Override
public void update(JSONObject form) {
MpsSaleOrder mpsSaleOrder = form.toJavaObject(MpsSaleOrder.class);
mpsSaleOrder.setUpdate_id(SecurityUtils.getCurrentUserId());
mpsSaleOrder.setUpdate_name(SecurityUtils.getCurrentUsername());
mpsSaleOrder.setUpdate_time(DateUtil.now());
this.updateById(mpsSaleOrder);
}
@@ -226,20 +229,33 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
if(StringUtils.isBlank(col)) {
throw new BadRequestException("销售单号不能为空");
}
if(col.equals("660697961")) {
int is = 0;
}
mpsSaleOrder.setSale_code(col);
}
if(j == 1) {
if(StringUtils.isBlank(col)) {
throw new BadRequestException("合同号不能为空");
}
// if(StringUtils.isBlank(col)) {
// throw new BadRequestException("合同号不能为空");
// }
mpsSaleOrder.setContract_code(col);
}
if(j == 2) {
mpsSaleOrder.setMaterial_code(col);
}
if(j == 3) {
if(StringUtils.isBlank(col)) {
throw new BadRequestException("规格名称不能为空");
}
List<MdMeMaterialbase> meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
List<MdMeMaterialbase> meMaterialBases;
if(StringUtils.isNotBlank(mpsSaleOrder.getMaterial_code())) {
meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_code", mpsSaleOrder.getMaterial_code()));
}
else{
meMaterialBases = materialbaseService.list(new QueryWrapper<MdMeMaterialbase>().eq("material_spec", col));
}
if(CollectionUtils.isEmpty(meMaterialBases)) {
//如果不是一线物料，就跳过不导入该订单
break;
}
else{
@@ -258,14 +274,14 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
}
}
}
if(j == 3) {
if(j == 4) {
if(StringUtils.isBlank(col)) {
mpsSaleOrder.setProduct_area("A1");
}
//智能一线，智能三线
mpsSaleOrder.setProduct_area(col.contains("三") || col.contains("3") ? "A3" : "A1");
}
if(j == 4) {
if(j == 5) {
if(StringUtils.isBlank(col)) {
throw new BadRequestException("销售数量不能为空");
}
@@ -283,7 +299,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
break;
}
}
if(j == 5) {
if(j == 6) {
if(StringUtils.isBlank(col)) {
throw new BadRequestException("订单交期不能为空");
}
@@ -307,27 +323,30 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
//后段交期
mpsSaleOrder.setBehind_plandeliver_date(newDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
if(j == 6) {
if(j == 7) {
if(StringUtils.isNotBlank(col)) {
mpsSaleOrder.setRawmaterial_name(col);
}
}
if(j == 7) {
if(j == 8) {
if(StringUtils.isNotBlank(col)) {
BigDecimal rateQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
mpsSaleOrder.setRate_qty(rateQty);
}
}
if(j == 8) {
if(j == 9) {
if(StringUtils.isNotBlank(col)) {
BigDecimal canuseQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
mpsSaleOrder.setCanuse_qty(canuseQty);
}
}
if(j == 9) {
if(j == 10) {
//已完成数量
if(StringUtils.isNotBlank(col)) {
BigDecimal productQty = BigDecimal.valueOf(NumberUtils.isNumber(col) ? NumberUtils.toDouble(col) : 0);
mpsSaleOrder.setProduct_qty(productQty);
//需生产数量
mpsSaleOrder.setNeed_product_qty(mpsSaleOrder.getSale_qty().subtract(productQty));
}
}
}
@@ -337,24 +356,24 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
int seqNo = orderSeqNoMap.getOrDefault(orderCode, 0) + 1;
orderSeqNoMap.put(orderCode, seqNo);
mpsSaleOrder.setSeq_no(seqNo * 100);
}
OrderQuery orderQuery = new OrderQuery();
orderQuery.setSale_code(mpsSaleOrder.getSale_code());
orderQuery.setStatus(SaleOrderEnum.CREATE.getCode());
List<Map> salesOrders = baseMapper.queryAll(orderQuery);
//相同订单号
if(salesOrders.size() > 0) {
List<Map> salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList());
if(salesOrderList.size() > 0) {
continue;
}
else{
Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null);
int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no");
mpsSaleOrder.setSeq_no(maxSeqNoValue + 100);
OrderQuery orderQuery = new OrderQuery();
orderQuery.setSale_code(mpsSaleOrder.getSale_code());
orderQuery.setStatus(SaleOrderEnum.CREATE.getCode());
List<Map> salesOrders = baseMapper.queryAll(orderQuery);
//相同订单号
if(salesOrders.size() > 0) {
List<Map> salesOrderList = salesOrders.stream().filter(m -> mpsSaleOrder.getSale_code().equals(m.get("sale_code")) && mpsSaleOrder.getMaterial_code().equals(m.get("material_code"))).collect(Collectors.toList());
if(salesOrderList.size() > 0) {
continue;
}
else{
Map maxSeqNoOrder = salesOrders.stream().max(Comparator.comparingInt(m -> (int) m.get("seq_no"))).orElse(null);
int maxSeqNoValue = (int) maxSeqNoOrder.get("seq_no");
mpsSaleOrder.setSeq_no(maxSeqNoValue + 100);
}
}
mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no());
}
mpsSaleOrder.setAps_sale_code(mpsSaleOrder.getSale_code() + "-" + mpsSaleOrder.getSeq_no());
if(CollectionUtils.isEmpty(errorMap)) {
if(mpsSaleOrder.getSale_code() != null) {
data.add(mpsSaleOrder);

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/controller/purchase/PcsIfPurchaseorderController.java
View File

File diff suppressed because one or more lines are too long

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
View File

@@ -1,15 +1,10 @@
package org.nl.wms.pcs_manage.service.purchase.dao;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;

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

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

@@ -0,0 +1,42 @@
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.RealTimeIvtService;
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/realtimeivt")
@Slf4j
public class RealTimeIvtController {
private final RealTimeIvtService realTimeIvtService;
@GetMapping
@ApiOperation("库存查询")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(realTimeIvtService.queryAll(whereJson, page), HttpStatus.OK);
}
@PostMapping("/autoWeb")
@ApiOperation("饼图")
public ResponseEntity<Object> autoWeb(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(realTimeIvtService.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 );
}

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

@@ -0,0 +1,40 @@
package org.nl.wms.stata_manage.service;
import com.alibaba.fastjson.JSONObject;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
/**
* @author Liuxy
* @description 服务接口
* @date 2022-06-28
**/
public interface RealTimeIvtService {
/**
* 查询数据分页
*
* @param whereJson 条件
* @param page 分页参数
* @return Map<String, Object>
*/
Map<String, Object> queryAll(Map whereJson, Pageable page);
/**
* 饼图数据获取
* @return /
*/
JSONObject autoWeb( JSONObject whereJson );
/**
* 根据仓库查询不同仓库得来类型
* @param whereJson 、
* @return 、
*/
List<JSONObject> queryIvt(Map whereJson);
}

9
mes/hd/nladmin-system/src/main/java/org/nl/wms/stata_manage/service/dto/StorUtil.java Normal file
View File

@@ -0,0 +1,9 @@
package org.nl.wms.stata_manage.service.dto;
public class StorUtil {
public static final String STOR_YL = "1528627964823080960";
public static final String STOR_CP = "1528627995269533696";
public static final String STOR_BCP = "15286279952695336962";
public static final String STOR_HR_BCP = "15286279952695336963";
public static final String STOR_BJ = "15286279952695336977";
}

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;
}
}

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

@@ -0,0 +1,113 @@
package org.nl.wms.stata_manage.service.impl;
import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.utils.PageUtil;
import org.nl.wms.device_manage.ios.service.structIvt.dao.mapper.EmBiStructivtMapper;
import org.nl.wms.stata_manage.service.RealTimeIvtService;
import org.nl.wms.stata_manage.service.dto.StorUtil;
import org.nl.wms.storage_manage.productmanage.service.structIvt.dao.mapper.StIvtStructivtCpMapper;
import org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper.StIvtStructivtYlMapper;
import org.nl.wms.storage_manage.semimanage.service.structIvt.dao.mapper.StIvtStructivtBcpMapper;
import org.nl.wms.storage_manage.semimanagehr.service.structIvt.dao.mapper.StIvtStructivtHrBcpMapper;
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 RealTimeIvtServiceImpl implements RealTimeIvtService {
@Autowired
private StIvtStructivtYlMapper stIvtStructivtYlMapper; // 原料
@Autowired
private StIvtStructivtBcpMapper stIvtStructivtBcpMapper; // 半成品
@Autowired
private StIvtStructivtCpMapper stIvtStructivtCpMapper; // 成品
@Autowired
private StIvtStructivtHrBcpMapper stIvtStructivtHrBcpMapper; // 海柔半成品
@Autowired
private EmBiStructivtMapper emBiStructivtMapper; // 备件
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
List<JSONObject> allList = queryIvt(whereJson);
// 组织分页
Map<String, Object> json = PageUtil.toPage(
PageUtil.toPage(page.getPageNumber(), page.getPageSize(), allList),
allList.size()
);
return json;
}
@Override
public JSONObject autoWeb(JSONObject whereJson) {
List<JSONObject> allList = queryIvt(whereJson);
// 处理数据
List<JSONObject> resultList = allList.stream()
.map(row -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("name", row.getString("material_code"));
jsonObject.put("value", row.getDoubleValue("pro"));
return jsonObject;
})
.collect(Collectors.toList());
JSONObject result = new JSONObject();
result.put("ivtList", resultList);
return result;
}
@Override
public List<JSONObject> queryIvt(Map whereJson) {
String stor_id = MapUtil.getStr(whereJson, "stor_id");
List<JSONObject> result = new ArrayList<>();
switch (stor_id) {
case StorUtil.STOR_YL :
result = stIvtStructivtYlMapper.getIvtPor();
break;
case StorUtil.STOR_BCP :
result = stIvtStructivtBcpMapper.getIvtPor();
break;
case StorUtil.STOR_CP :
result = stIvtStructivtCpMapper.getIvtPor();
break;
case StorUtil.STOR_HR_BCP :
result = stIvtStructivtHrBcpMapper.getIvtPor();
break;
case StorUtil.STOR_BJ :
result = emBiStructivtMapper.getIvtPor();
break;
}
return result;
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.java
View File

@@ -33,4 +33,6 @@ public interface StIvtStructivtCpMapper extends BaseMapper<StIvtStructivtCp> {
List<Map> getStructAll(@Param("chanList") List<String> list);
List<JSONObject> getIvtPor();
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/dao/mapper/StIvtStructivtCpMapper.xml
View File

@@ -236,4 +236,20 @@
</where>
</select>
<select id="getIvtPor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
mater.material_code,
mater.material_name,
mater.material_spec,
MAX(unit.unit_name) AS unit_name,
SUM(ivt.canuse_qty) AS canuse_qty,
ROUND(SUM(ivt.canuse_qty) / (SELECT SUM(canuse_qty) FROM st_ivt_structivt_cp) * 100,2) AS pro
FROM
st_ivt_structivt_cp ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
GROUP BY ivt.material_id
</select>
</mapper>

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/StIvtStructivtYlMapper.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.storage_manage.rawmanage.service.structIvt.dao.mapper;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.pcs_manage.service.purchase.dto.PurchaseOrderQuery;
@@ -29,4 +30,6 @@ public interface StIvtStructivtYlMapper extends BaseMapper<StIvtStructivtYl> {
List<Map> getSemiProductIvt(@Param("query") StructIvtYLQuery query);
List<Map> getStructIvt(@Param("query") StructIvtYLQuery query);
List<JSONObject> getIvtPor();
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/structIvt/dao/mapper/xml/StIvtStructivtYlMapper.xml
View File

@@ -192,4 +192,20 @@
</if>
</where>
</select>
<select id="getIvtPor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
mater.material_code,
mater.material_name,
mater.material_spec,
MAX(unit.unit_name) AS unit_name,
SUM(ivt.canuse_qty) AS canuse_qty,
ROUND(SUM(ivt.canuse_qty) / (SELECT SUM(canuse_qty) FROM st_ivt_structivt_yl) * 100,2) AS pro
FROM
st_ivt_structivt_yl ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
GROUP BY ivt.material_id
</select>
</mapper>

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java
View File

@@ -38,4 +38,6 @@ public interface StIvtStructivtBcpMapper extends BaseMapper<StIvtStructivtBcp> {
List<Map> getPdaBcpMaterialIvt(JSONObject jo);
StIvtStructivtBcp queryIvtOutOne(JSONObject json);
List<JSONObject> getIvtPor();
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml
View File

@@ -271,4 +271,20 @@
LIMIT 1
</select>
<select id="getIvtPor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
mater.material_code,
mater.material_name,
mater.material_spec,
MAX(unit.unit_name) AS unit_name,
SUM(ivt.canuse_qty) AS canuse_qty,
ROUND(SUM(ivt.canuse_qty) / (SELECT SUM(canuse_qty) FROM st_ivt_structivt_bcp) * 100,2) AS pro
FROM
st_ivt_structivt_bcp ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
GROUP BY ivt.material_id
</select>
</mapper>

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/StIvtStructivtHrBcpMapper.java
View File

@@ -39,4 +39,7 @@ public interface StIvtStructivtHrBcpMapper extends BaseMapper<StIvtStructivtHrBc
StIvtStructivtBcp queryIvtOutOne(JSONObject json);
List<Map> getBcpMoveIvt(@Param("query") StructIvtYLQuery query);
List<JSONObject> getIvtPor();
}

16
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dao/mapper/xml/StIvtStructivtHrBcpMapper.xml
View File

@@ -282,4 +282,20 @@
</where>
</select>
<select id="getIvtPor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
mater.material_code,
mater.material_name,
mater.material_spec,
MAX(unit.unit_name) AS unit_name,
SUM(ivt.canuse_qty) AS canuse_qty,
ROUND(SUM(ivt.canuse_qty) / (SELECT SUM(canuse_qty) FROM st_ivt_structivt_hr_bcp) * 100,2) AS pro
FROM
st_ivt_structivt_hr_bcp ivt
LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
GROUP BY ivt.material_id
</select>
</mapper>