货物编号：{item.productId}
-货物名称：{item.productName}
-货物类型：{item.productType}
-货物数量：{item.productNum}
++ {`货物${index + 1}编号：`} + {item.productID} +
++ {`货物${index + 1}名称：`} + {item.productName} +
++ {`货物${index + 1}数量：`} + {item.amount} +
))}diff --git a/src/components/WareClerk/GoodsOut.jsx b/src/components/WareClerk/GoodsOut.jsx index 7106846..3f02aac 100644 --- a/src/components/WareClerk/GoodsOut.jsx +++ b/src/components/WareClerk/GoodsOut.jsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useState, useEffect } from "react"; import { useLocation } from "react-router-dom"; import { Table, message } from "antd"; @@ -6,18 +6,22 @@ import adminRequest from "../../utils/adminRequest"; const GoodsOut = () => { const location = useLocation(); - // console.log(location.state.record) + console.log(location.state.record); + const orderId = location.state.record.orderId; const [orderList, setOrderList] = useState( - location.state.record.orderdetailsList + // location.state.record.orderdetailsList + [] ); + console.log(orderId); + const goodsOutSubmit = () => { adminRequest .post( "http://127.0.0.1:8088/admin/ware-clerk/tasks/goods-out/order", {}, - { params: orderId } + { params: { order_id: orderId } } ) .then((res) => { if (res.data.code === 10000) { @@ -33,6 +37,18 @@ const GoodsOut = () => { }); }; + useEffect(() => { + adminRequest + .post( + "http://127.0.0.1:8088/admin/ware-clerk/tasks/getposition", + {}, + { params: { order_id: orderId } } + ) + .then((res) => { + console.log(res.data.data); + }); + }, []); + const goodsColumns = [ { title: "货品编号", @@ -48,7 +64,7 @@ const GoodsOut = () => { // }, { title: "出库件数", - dataIndex: "out", + dataIndex: "amount", }, { title: "仓库号", diff --git a/src/components/WareManager/Analysis.jsx b/src/components/WareManager/Analysis.jsx index df775d4..d50fb34 100644 --- a/src/components/WareManager/Analysis.jsx +++ b/src/components/WareManager/Analysis.jsx @@ -1,12 +1,108 @@ -import React, { useEffect, useRef } from "react"; +import React, { useState, useEffect, useRef } from "react"; +import { Tabs, message } from "antd"; import * as echarts from "echarts"; +import adminRequest from "../../utils/adminRequest"; + +const { TabPane } = Tabs; + const Analysis = () => { const inOutRef = useRef(null); const inOutRefBar = useRef(null); + const monthProRef = useRef(null); + const weekProRef = useRef(null); + + const [initial, setInitial] = useState(true); + const [repoList, setRepoList] = useState([]); + const [repoIdList, setRepoIdList] = useState([]); + const [repoPosNum, setRepoPosNum] = useState([]); + const [repoRateList, setRepoRateList] = useState([]); + + const [monthProfit, setMonthProfit] = useState([]); + const [weekProfit, setWeekProfit] = useState([]); + + const [rateFinished, setRateFinished] = useState(false); + + var temp = [], + chartInstance, + chartInstanceBar, + chartMonth, + chartWeek; + + const getRateList = async () => { + for (let j = 0, len = repoIdList.length; j < len; j++) { + let id = repoIdList[j]; + await adminRequest + .get( + `http://127.0.0.1:8088/admin/ware-manager/analysis/storage/rate/repository/${id}` + ) + .then((res) => { + if (res.status === 200) { + temp.push(((res.data / repoPosNum[j]) * 100).toFixed(2)); + } else { + message.error(res.data.message); + } + }) + .catch((err) => console.log(err)); + } + if (temp !== []) { + setRepoRateList([...temp]); + setRateFinished((pre) => !pre); + } + }; useEffect(() => { - let chartInstance = echarts.init(inOutRef.current); + setRepoIdList([]); + setRepoRateList([]); + adminRequest + .get("http://127.0.0.1:8088/admin/system/ware-manage/queryAll") + .then((res) => { + if (res.data.success) { + setRepoList(res.data.data.repositoryList); + setRepoIdList( + res.data.data.repositoryList.map((item) => item.repositoryId) + ); + setRepoPosNum( + res.data.data.repositoryList.map( + (item) => item.positionVOList.length + ) + ); + } else { + message.error(res.data.message); + } + }) + .catch((err) => console.log(err)); + + adminRequest + .get("http://127.0.0.1:8088/admin/ware-manager/analysis/profit/month") + .then((res) => { + if (res.data.success) { + console.log(res.data.data["month profit"]); + } else { + message.error(res.data.message); + } + }) + .catch((err) => console.log(err)); + + adminRequest + .get("http://127.0.0.1:8088/admin/ware-manager/analysis/profit/week") + .then((res) => { + if (res.data.success) { + console.log(res.data.data["week profit"]); + } else { + message.error(res.data.message); + } + }) + .catch((err) => console.log(err)); + + if ( + chartInstance != null && + chartInstance != "" && + chartInstance != undefined + ) { + chartInstance.dispose(); //销毁 + } + chartInstance = echarts.init(inOutRef.current); const option = { tooltip: { trigger: "item", @@ -45,7 +141,62 @@ const Analysis = () => { }; chartInstance.setOption(option); - let chartInstanceBar = echarts.init(inOutRefBar.current); + if (chartMonth != null && chartMonth != "" && chartMonth != undefined) { + chartMonth.dispose(); //销毁 + } + chartMonth = echarts.init(monthProRef.current); + const optionMonth = { + toolbox: { + feature: { + saveAsImage: {}, + }, + }, + xAxis: { + type: "category", + data: ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], + }, + yAxis: { + type: "value", + }, + series: [ + { + data: [ + ["Mon", 820], + ["Tue", 932], + ["Wed", 901], + ["Thu", 934], + ["Fri", 1290], + ["Sat", 1330], + ["Sun", 1320], + ], + type: "line", + label: { + show: true, + position: "bottom", + }, + }, + ], + }; + chartMonth.setOption(optionMonth); + }, []); + + useEffect(() => { + getRateList(); + }, [repoIdList]); + + useEffect(() => { + if (initial) { + setInitial(false); + return; + } + if ( + chartInstanceBar != null && + chartInstanceBar != "" && + chartInstanceBar != undefined + ) { + chartInstanceBar.dispose(); //销毁 + } + chartInstanceBar = echarts.init(inOutRefBar.current); const optionBar = { tooltip: { trigger: "axis", @@ -61,11 +212,8 @@ const Analysis = () => { }, grid: { top: "15%", - left: "15%", - right: "10%", - bottom: "10%", }, xAxis: { @@ -76,7 +224,7 @@ const Analysis = () => { show: false, //不显示坐标轴线 }, type: "category", - data: ["01", "02", "03", "04", "05", "06", "07", "08"], + data: repoIdList, }, yAxis: { type: "value", @@ -91,28 +239,29 @@ const Analysis = () => { color: ["#5459BC"], series: [ { - data: [26, 20, 16, 42, 90, 40, 65, 50], + //比例 + data: repoRateList, type: "bar", barWidth: 20, itemStyle: { emphasis: { - barBorderRadius: 6, + borderRadius: 6, }, normal: { - barBorderRadius: 6, + borderRadius: 6, }, }, }, ], }; chartInstanceBar.setOption(optionBar); - }, []); + }, [rateFinished]); return (