root/wms_base
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}

43
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,7 +356,6 @@ 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());
@@ -355,6 +373,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl<MpsSaleOrderMapper,MpsS
}
}
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>

2
mes/qd/src/views/wms/pcs/purchaseorder/index.vue
View File

@@ -103,7 +103,7 @@
<el-table-column label="车间" prop="workshop_id" show-overflow-tooltip/>
<el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
<el-table-column :min-width="flexWidth('material_name', crud.data, '物料名称')" label="物料名称" prop="material_name" show-overflow-tooltip/>
<el-table-column :min-width="flexWidth('ask_time', crud.data, '要求到货日期')" label="要求到货日期" prop="askTime"/>
<el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
<el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
<!-- <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" label="安全库存" />-->
<!-- <el-table-column label="总重量" align="center" prop="total_qty"/>-->

2
mes/qd/src/views/wms/pcs/purchaseplan/index.vue
View File

@@ -151,7 +151,7 @@
<el-table-column :formatter="workshopFormat" label="车间" prop="workshop_id" show-overflow-tooltip/>
<el-table-column label="物料编号" prop="material_code" show-overflow-tooltip width="130"/>
<el-table-column label="物料名称" prop="material_name" show-overflow-tooltip width="130"/>
<el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="130"/>
<el-table-column label="要求到货日期" prop="askTime" show-overflow-tooltip width="150"/>
<el-table-column label="重量" min-width="120" prop="show_qty" show-overflow-tooltip/>
<el-table-column label="确认交货日期" min-width="120" prop="agree_time" show-overflow-tooltip/>
<el-table-column label="订单编号" min-width="120" prop="po_code" show-overflow-tooltip/>

24
mes/qd/src/views/wms/pcs/saleorder/Dialog.vue
View File

@@ -1,18 +1,18 @@
<template>
<el-dialog
title="aps提交"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="true"
width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
:show-close="true"
:visible.sync="dialogVisible"
append-to-body
destroy-on-close
title="aps提交"
width="500px"
@close="close"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form ref="form" :model="form1" :rules="rules" label-width="110px" size="mini">
<el-form-item label="订单阶段:" prop="bill_code">
@@ -22,13 +22,13 @@
</el-select>
</el-form-item>
<el-form-item label="日期区间：" prop="createTime">
<el-form-item label="订单交期：" prop="createTime">
<el-date-picker
v-model="form.createTime"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
@@ -39,7 +39,7 @@
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
<el-button class="filter-item" icon="el-icon-search" size="mini" type="success" @click="queryStruct">确认
</el-button>
</div>
</div>
@@ -89,7 +89,7 @@ export default {
queryStruct() {
// 校验开始日期和结束日期是否为空
if (!this.form.createTime || !this.form.createTime[0] || !this.form.createTime[1]) {
this.showErrorNotification('请选择日期区间')
this.showErrorNotification('请选择订单交期')
return
}
// 校验销售订单号值是否为空

247
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -8,46 +8,91 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="80px"
>
<el-form-item label="销售单号">
<el-input
v-model="query.sale_code"
class="filter-item"
clearable
placeholder="销售单号"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
v-model="query.material"
clearable
size="small"
placeholder="物料编码、名称或规格"
style="width: 200px;"
class="filter-item"
clearable
placeholder="物料编码、名称或规格"
size="small"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="订单交期">
<el-date-picker
v-model="query.planTime"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="query.createTime"
:default-time="['00:00:00', '23:59:59']"
end-placeholder="结束日期"
start-placeholder="开始日期"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
<el-form-item label="单据类型">
<el-select
v-model="query.sale_type"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.PCS_SAL_TYPE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="生成方式">
<el-select
v-model="query.create_mode"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_CREATE_MODE"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-select
v-model="query.status"
style="width: 200px"
clearable
filterable
placeholder="请选择"
style="width: 200px"
@change="crud.toQuery"
>
<el-option
@@ -58,24 +103,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="产品系列">
<treeselect
v-model="query.product_series"
:options="classes3"
:auto-load-root-options="false"
:load-options="loadChildNodes"
style="width: 200px;"
placeholder="请选择"
/>
</el-form-item>
<!-- <el-form-item label="产品系列">-->
<!-- <treeselect-->
<!-- v-model="query.product_series"-->
<!-- :auto-load-root-options="false"-->
<!-- :load-options="loadChildNodes"-->
<!-- :options="classes3"-->
<!-- placeholder="请选择"-->
<!-- style="width: 200px;"-->
<!-- />-->
<!-- </el-form-item>-->
<rrOperation :crud="crud"/>
</el-form>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
type="success"
@click="deleteApsData"
>
清空测试数据
@@ -86,9 +131,9 @@
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
type="warning"
@click="uploadShow = true"
>
导入
@@ -97,9 +142,9 @@
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
type="success"
@click="importin"
>
aps提交
@@ -107,10 +152,10 @@
</crudOperation>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:close-on-click-modal="false"
:title="crud.status.title"
:visible.sync="crud.status.cu > 0"
width="1200px"
>
<el-form
@@ -122,7 +167,8 @@
>
<el-form-item label="车间" prop="product_area">
<!-- unit_list-->
<el-select v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
<el-select
v-model="form.product_area" :disabled="crud.status.edit > 0 || crud.status.view > 0"
placeholder=""
>
<el-option
@@ -134,12 +180,14 @@
</el-select>
</el-form-item>
<el-form-item label="销售单号" prop="sale_code">
<el-input v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
<el-input
v-model="form.sale_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
style="width: 200px;"
/>
</el-form-item>
<el-form-item label="合同号" prop="contract_code">
<el-input v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
<el-input
v-model="form.contract_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
style="width: 200px;"
/>
</el-form-item>
@@ -154,7 +202,8 @@
</el-select>
</el-form-item> -->
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
<el-input
v-model="form.material_code" :disabled="crud.status.edit > 0 || crud.status.view > 0"
style="width: 200px;"
/>
</el-form-item>
@@ -171,9 +220,9 @@
<el-form-item label="计划交期时间" prop="plandeliver_date">
<el-date-picker
v-model="form.plandeliverDate"
value-format="yyyy-MM-dd"
type="date"
style="width: 200px;"
type="date"
value-format="yyyy-MM-dd"
/>
<el-form-item label="订单数量" prop="sale_qty">
<el-input-number v-model="form.sale_qty" style="width: 200px;"/>
@@ -204,94 +253,114 @@
>
<el-table-column type="selection" width="55"/>
<el-table-column
prop="sale_code"
label="销售单号"
min-width="100"
prop="sale_code"
show-overflow-tooltip
/>
<el-table-column
label="行号"
min-width="60"
prop="seq_no"
label="销售单行号"
min-width="100"
show-overflow-tooltip
/>
<!-- <el-table-column prop="seq_no" label="明细序号" /> -->
<el-table-column prop="contract_code" label="合同号"
:min-width="flexWidth('contract_code', crud.data, '合同号')"
/>
<el-table-column prop="material_code" label="物料编码"
:min-width="flexWidth('material_code', crud.data, '物料编码')"
<el-table-column
:min-width="flexWidth('contract_code', crud.data, '合同号')" label="合同号"
prop="contract_code"
/>
<el-table-column
:min-width="flexWidth('material_code', crud.data, '物料编码')" label="物料编码"
prop="material_code"
/>
<el-table-column
prop="material_spec"
label="物料规格"
:min-width="flexWidth('material_spec', crud.data, '物料规格')"
label="物料规格"
prop="material_spec"
/>
<el-table-column
prop="material_name"
label="物料名称"
:min-width="flexWidth('material_name', crud.data, '物料名称')"
show-overflow-tooltip
/>
<!-- <el-table-column-->
<!-- :min-width="flexWidth('material_name', crud.data, '物料名称')"-->
<!-- label="物料名称"-->
<!-- prop="material_name"-->
<!-- show-overflow-tooltip-->
<!-- />-->
<el-table-column prop="product_area" label="工段">
<el-table-column label="工段" prop="product_area">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="sale_qty" label="订单数量"/>
<el-table-column label="订单数量" min-width="80" prop="sale_qty"/>
<el-table-column label="需生产数量" min-width="88" prop="need_product_qty"/>
<el-table-column label="已生产数量" min-width="88" prop="product_qty"/>
<el-table-column label="刻字数量" prop="lettering_qty"/>
<el-table-column label="预入库数量" min-width="88" prop="instor_qty"/>
<el-table-column label="入库数量" prop="in_storage_qty"/>
<el-table-column label="发货数量" prop="sendout_qty"/>
<el-table-column
prop="qty_unit_name"
label="计量单位"
show-overflow-tooltip
min-width="80"
/>
<el-table-column
prop="plandeliverDate"
label="前段计划交期"
label="预入库交期"
min-width="100"
prop="warehousing_date"
show-overflow-tooltip
/>
<el-table-column prop="status" label="前段状态">
<el-table-column
label="计划交期"
min-width="100"
prop="plandeliverDate"
show-overflow-tooltip
/>
<el-table-column
label="订单交期"
min-width="100"
prop="order_date"
show-overflow-tooltip
/>
<el-table-column label="订单状态" prop="status">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column
prop="behindPlandeliverDate"
label="后段计划交期"
min-width="100"
label="计量单位"
min-width="80"
prop="qty_unit_name"
show-overflow-tooltip
/>
<el-table-column prop="behind_submit_flag" label="后段状态">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- label="后段计划交期"-->
<!-- min-width="100"-->
<!-- prop="behindPlandeliverDate"-->
<!-- show-overflow-tooltip-->
<!-- />-->
<!-- <el-table-column label="后段状态" prop="behind_submit_flag">-->
<!-- <template slot-scope="scope">-->
<!-- {{ dict.label.PCS_SALE_STATUS[scope.row.behind_submit_flag] }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop="rawmaterial_name"
label="原辅料信息"
:min-width="flexWidth('rawmaterial_name', crud.data, '原辅料信息')"
label="原辅料信息"
prop="rawmaterial_name"
show-overflow-tooltip
/>
<el-table-column
prop="rate_qty"
label="单重"
:min-width="flexWidth('rate_qty', crud.data, '单重')"
label="单重"
prop="rate_qty"
show-overflow-tooltip
/>
<el-table-column
prop="canuse_qty"
label="原辅料库存"
:min-width="flexWidth('canuse_qty', crud.data, '原辅料库存')"
label="原辅料库存"
prop="canuse_qty"
show-overflow-tooltip
width="90"
/>
<!-- <el-table-column-->
<!-- prop="early_start_time"-->
@@ -300,40 +369,35 @@
<!-- show-overflow-tooltip-->
<!-- />-->
<el-table-column
prop="product_qty"
label="生产数量"
:min-width="flexWidth('product_qty', crud.data, '生产数量')"
show-overflow-tooltip
/>
<el-table-column
prop="sale_type"
label="销售单类型"
min-width="100"
prop="sale_type"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
</template>
</el-table-column>
<el-table-column prop="create_mode" label="生成方式" min-width="100">
<el-table-column label="生成方式" min-width="100" prop="create_mode">
<template slot-scope="scope">
{{ dict.label.ST_CREATE_MODE[scope.row.create_mode] }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column label="创建人" prop="create_name"/>
<el-table-column
prop="createTime"
label="创建时间"
:min-width="flexWidth('createTime', crud.data, '创建时间')"
/>
<el-table-column prop="update_time" label="修改时间"
:min-width="flexWidth('update_time',crud.data,'修改时间')"
label="创建时间"
prop="createTime"
/>
<el-table-column
:min-width="flexWidth('update_time',crud.data,'修改时间')" label="修改时间"
prop="update_time"
/>
<el-table-column
prop="remark"
label="备注"
show-overflow-tooltip
min-width="200"
prop="remark"
show-overflow-tooltip
/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
@@ -358,7 +422,7 @@
<script>
import crudSaleOrder from '@/views/wms/pcs/saleorder/saleOrder'
import customerbase from '@/api/wms/basedata/master/customerbase'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'
@@ -367,7 +431,6 @@ import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import crudBigScreen from '@/api/wms/bigScreen/bigScreen'
const defaultForm = {
sale_id: null,

102
mes/qd/src/views/wms/stata_manage/historyivt/LinChart.vue Normal file
View File

@@ -0,0 +1,102 @@
<template>
<div id="myId" :class="className" :style="{height:height,width:width}" />
</template>
<script>
import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import { debounce } from '@/utils'
export default {
props: {
className: {
type: String,
default: 'chart'
},
width: {
type: String,
default: '100%'
},
height: {
type: String,
default: '300px'
},
chartData: {
type: Object,
required: true
}
},
data() {
return {
chart: null
}
},
watch: {
chartData: {
deep: true,
handler() {
// 每次清除之后重新渲染
const myChart = echarts.init(document.getElementById('myId'))
myChart.clear()
this.setOptions()
}
}
},
mounted() {
this.initChart()
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
}
}, 100)
window.addEventListener('resize', this.__resizeHandler)
},
beforeDestroy() {
if (!this.chart) {
return
}
window.removeEventListener('resize', this.__resizeHandler)
this.chart.dispose()
this.chart = null
},
methods: {
initChart() {
this.chart = echarts.init(this.$el, 'macarons')
this.setOptions()
},
setOptions() {
this.chart.setOption({
title: {
text: 'material_code'
},
tooltip: {
trigger: 'axis'
},
legend: {
data: this.chartData.legenda
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
toolbox: {
feature: {
saveAsImage: {}
}
},
xAxis: {
type: 'category',
boundaryGap: false,
data: this.chartData.xAxisa
},
yAxis: {
type: 'value'
},
series: this.chartData.seriesa
})
}
}
}
</script>

42
mes/qd/src/views/wms/stata_manage/historyivt/historyivt.js Normal file
View File

@@ -0,0 +1,42 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: 'api/historyivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/historyivt/',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/historyivt',
method: 'put',
data
})
}
export function getHeader() {
return request({
url: 'api/historyivt/getHeader',
method: 'get'
})
}
export function autoWeb(data) {
return request({
url: 'api/historyivt/autoWeb',
method: 'post',
data
})
}
export default { add, edit, del, getHeader, autoWeb }

216
mes/qd/src/views/wms/stata_manage/historyivt/index.vue Normal file
View File

@@ -0,0 +1,216 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
size="mini"
>
<el-form-item label="仓库">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
<el-select
v-model="query.stor_id"
size="mini"
placeholder="单据状态"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<el-form-item label="日期">
<label slot="label">日&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:</label>
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
:clearable="false"
:disabled="true"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="物料编码">
<el-input
v-model="query.material_code"
clearable
size="mini"
placeholder="请输入物料编码、名称、规格"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<!--表格渲染-->
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :lg="24">
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
:max-height="590"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="45" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="1" label="物料编码" min-width="150" />
<el-table-column prop="2" label="物料名称" min-width="200" show-overflow-tooltip />
<el-table-column prop="3" label="物料规格" min-width="150" />
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" align="center" min-width="140" />
</template>
</el-table>
<!--分页组件-->
<pagination />
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :lg="24">
<div class="chart-wrapper">
<Lin-chart :chart-data="dataList" />
</div>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
import crudHistoryivt, { autoWeb } from '@/views/wms/stata_manage/historyivt/historyivt'
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import Date from '@/utils/datetime'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import LinChart from '@/views/wms/stata_manage/historyivt/LinChart'
export default {
name: 'Historyivt',
components: { pagination, crudOperation, rrOperation, LinChart, udOperation, DateRangePicker },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: '历史库存分析',
url: 'api/historyivt',
idField: 'id',
sort: 'id,desc',
crudMethod: { ...crudHistoryivt },
props: {
// 每页数据条数
size: 10
},
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
return {
cols: [],
storlist: [],
dataList: '',
query_flag: true,
openParam: null,
permission: {
},
rules: {
}}
},
mounted() {
this.init()
},
beforeDestroy() {
// js提供的clearInterval方法用来清除定时器
console.log('定时器销毁')
clearInterval(this.timer)
},
created() {
crudStorattr.getStor({ 'stor_type': '' }).then(res => {
this.storlist = res.content
})
this.crud.query.createTime = [new Date().daysAgo(6), new Date()]
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(6)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.crud.query.stor_id = '1528627995269533696'
this.query_flag = false
}
this.getHeader()
},
hand(value) {
this.crud.toQuery()
},
onInput() {
this.$forceUpdate()
},
getHeader() {
crudHistoryivt.getHeader().then(res => {
this.cols = res
})
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
init: function() {
this.initStageData()
},
initStageData() {
this.timer = setInterval(() => { // 定时刷新
console.log('定时器启动')
this.initStatus()
}, 4000)
},
initStatus() {
autoWeb(this.crud.query).then(res => {
this.dataList = res
})
}
}
}
</script>
<style scoped>
</style>

101
mes/qd/src/views/wms/stata_manage/realtimeivt/PieChart.vue Normal file
View File

@@ -0,0 +1,101 @@
<template>
<div :class="className" :style="{height:height,width:width}" />
</template>
<script>
import echarts from 'echarts'
require('echarts/theme/macarons') // echarts theme
import { debounce } from '@/utils'
export default {
props: {
className: {
type: String,
default: 'chart'
},
width: {
type: String,
default: '100%'
},
height: {
type: String,
default: '300px'
},
chartData: {
type: Array,
required: true
}
},
data() {
return {
chart: null
}
},
watch: {
chartData: {
deep: true,
handler() {
this.setOptions()
}
}
},
mounted() {
this.initChart()
this.__resizeHandler = debounce(() => {
if (this.chart) {
this.chart.resize()
}
}, 100)
window.addEventListener('resize', this.__resizeHandler)
},
beforeDestroy() {
if (!this.chart) {
return
}
window.removeEventListener('resize', this.__resizeHandler)
this.chart.dispose()
this.chart = null
},
methods: {
initChart() {
this.chart = echarts.init(this.$el, 'macarons')
this.setOptions()
},
setOptions() {
this.chart.setOption({
title: {
text: '统计',
subtext: '',
subtextStyle: {
'color': '#333'
},
left: 'center'
},
tooltip: {
trigger: 'item'
},
legend: {
orient: 'vertical',
left: 'left'
},
// color: ['#e0a803', '#27aa0f', '#d2d1d1'], // 修改图饼颜色
series: [
{
name: '百分比',
type: 'pie',
radius: '70%',
data: this.chartData,
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0,0,0,0.5)'
}
}
}
]
})
}
}
}
</script>

160
mes/qd/src/views/wms/stata_manage/realtimeivt/index.vue Normal file
View File

@@ -0,0 +1,160 @@
<template>
<div class="app-container">
<!--工具栏-->
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="所属仓库">
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
<el-select
v-model="query.stor_id"
size="mini"
placeholder="所属仓库"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in storlist"
:key="item.stor_id"
:label="item.stor_name"
:value="item.stor_id"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="物料编码">
<el-input
v-model="query.material_code"
size="mini"
clearable
placeholder="物料编码、名称、规格"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>-->
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表格渲染-->
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :lg="24">
<el-table
ref="table"
v-loading="crud.loading"
size="mini"
:data="crud.data"
highlight-current-row
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column show-overflow-tooltip min-width="120" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip min-width="120" prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="canuse_qty" label="库存" :formatter="crud.formatNum3" />
<el-table-column show-overflow-tooltip prop="unit_name" label="单位" />
<el-table-column show-overflow-tooltip prop="pro" label="占比(%)" />
</el-table>
<!--分页组件-->
<pagination />
</el-col>
</el-row>
<hr/>
<el-row :gutter="20">
<el-col :xs="24" :sm="24" :lg="24">
<div class="chart-wrapper">
<pie-chart :chart-data="ivtList" />
</div>
</el-col>
</el-row>
</div>
</div>
</template>
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudStorattr from '@/views/wms/storage_manage/basedata/basedata'
import Realtimeivt, { autoWeb } from '@/views/wms/stata_manage/realtimeivt/realtimeivt'
import PieChart from '@/views/wms/stata_manage/realtimeivt/PieChart'
export default {
name: 'RealTimeIvt',
components: { crudOperation, rrOperation, PieChart, udOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '实时库存分析',
optShow: { add: false, reset: true },
idField: 'stockrecord_id',
url: '/api/realtimeivt',
crudMethod: { ...Realtimeivt }
})
},
mixins: [presenter(), header(), crud()],
// 数据字典
data() {
return {
query_flag: true,
permission: {},
storlist: [],
ivtList: []
}
},
mounted: function() {
const that = this
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 180 + 'px;'
}
this.init()
},
beforeDestroy() {
// js提供的clearInterval方法用来清除定时器
console.log('定时器销毁')
clearInterval(this.timer)
},
created() {
crudStorattr.getStor({ 'stor_type': '' }).then(res => {
this.storlist = res.content
})
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.stor_id = '1528627995269533696'
this.query_flag = false
}
},
init: function() {
this.initStageData()
},
initStageData() {
this.timer = setInterval(() => { // 定时刷新
console.log('定时器启动')
this.initStatus()
}, 4000)
},
initStatus() {
autoWeb(this.crud.query).then(res => {
this.ivtList = res.ivtList
})
}
}
}
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
::v-deep .el-dialog__body {
padding-top: 10px;
}
</style>

40
mes/qd/src/views/wms/stata_manage/realtimeivt/realtimeivt.js Normal file
View File

@@ -0,0 +1,40 @@
import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/realtimeivt',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: '/api/realtimeivt/delete',
method: 'post',
data: ids
})
}
export function edit(data) {
return request({
url: '/api/realtimeivt/update',
method: 'post',
data
})
}
export function autoWeb(data) {
return request({
url: 'api/realtimeivt/autoWeb',
method: 'post',
data
})
}
export default {
add,
edit,
del,
autoWeb
}