From 3b8b9cba9ebe15ff4ae1a7d8cb483d1f0ffcfa85 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 11 12月 2024 11:29:12 +0800
Subject: [PATCH] 首页
---
LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue | 2
LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/storageView.ts | 14 ++
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/HomeListInputAndOutput.cs | 52 ++++++++
LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts | 2
LA24030_LuLiPackageLine_Web/src/views/home/index.vue | 80 +++++-------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 187 +++++++++++++++++++++++++++++++
6 files changed, 287 insertions(+), 50 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
index 4252ef1..42f2329 100644
--- a/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
+++ b/LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue
@@ -391,7 +391,7 @@
this.singlist = [];
},
- //鑾峰彇瀹瑰櫒鐨勪俊鎭�
+ //鑾峰彇
getContainerData(param) {
if (!this.warehouse.upi) {
uni.showToast({
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/storageView.ts b/LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/storageView.ts
index db287cf..372155a 100644
--- a/LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/storageView.ts
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/ReportCenter/storageView.ts
@@ -3,6 +3,10 @@
// STORAGE_VIEW='/api/wmsPlaceContainerInfo/list',
STORAGE_VIEW='/api/wmsBasePlace/listView',
+ QueryOffOrderList='/api/WmsCommonnQuery/HomeOffOrderList',
+
+
+
}
// 澧炲姞鍒嗘嫞淇℃伅
@@ -12,4 +16,12 @@
url: Api.STORAGE_VIEW,
method: 'get',
data: params
- });
\ No newline at end of file
+ });
+
+
+ export const getQueryOffOrderList = (params?: any) =>
+ request({
+ url: Api.QueryOffOrderList,
+ method: 'get',
+ data: params
+ });
\ No newline at end of file
diff --git a/LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts b/LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts
index 0942ac5..c3a6084 100644
--- a/LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts
+++ b/LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts
@@ -1,7 +1,7 @@
锘縤mport request from '/@/utils/request';
enum Api {
wmsStockWarning = '/api/wmsStockWarning/page',
- wmsStockPassMap = '/api/wmsStockPassMap/page',
+ wmsStockPassMap = '/api/WmsCommonnQuery/HomeTytPage',
wmsTakeGoodStats = '/api/wmsTakeGoodStats/page',
wmsHomePageQuery = '/api/wmsHomePage/wmsHomePageQuery',
wmsHomePlaceQuery = '/api/wmsHomePage/wmsHomePlaceQuery',
diff --git a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
index fc304d0..bfa6122 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
@@ -1,17 +1,17 @@
<template>
<div class="home-container layout-pd">
<el-row :gutter="15" class="home-card-one mb15">
- <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" class="home-media home-media-lg">
+ <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" class="home-media home-media-lg" v-for="(v, k) in offOrderInfo" >
<div class="home-card-item flex">
<div class="flex-margin flex w100" :class="` home-one-animation${1}`">
<div class="flex-auto">
- <span class="ml5 font16">鏈懆涓嬬嚎璁㈠崟鏁�</span>
- <div class="font30">{{ state.orderNum }}</div>
+ <span class="ml5 font16">{{ v.name }}</span>
+ <div class="font30">{{ v.value }}</div>
</div>
</div>
</div>
</el-col>
- <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" class="home-media home-media-lg">
+ <!-- <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" class="home-media home-media-lg">
<div class="home-card-item flex">
<div class="flex-margin flex w100" :class="` home-one-animation${1}`">
<div class="flex-auto">
@@ -21,16 +21,7 @@
</div>
</div>
</el-col>
- <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" class="home-media home-media-lg">
- <div class="home-card-item flex">
- <div class="flex-margin flex w100" :class="` home-one-animation${1}`">
- <div class="flex-auto">
- <span class="ml5 font16">涓嬬嚎鏉挎暟</span>
- <div class="font30">{{ state.orderNum }}</div>
- </div>
- </div>
- </div>
- </el-col>
+ -->
<!-- <el-col :xs="24" :sm="8" :md="8" :lg="8" :xl="8" v-for="(v, k) in state.homeOne" :key="k" :class="{ 'home-media home-media-lg': k > 1, 'home-media-sm': k === 1 }">
<div class="home-card-item flex">
<div class="flex-margin flex w100" :class="` home-one-animation${k}`">
@@ -86,7 +77,7 @@
import { wmsStockPassMap, wmsHomePageQuery, wmsHomePlaceQuery, wmsTransitionDiagramQuery } from '/@/api/main/inventoryWarning/inventoryWarning';
import type { TabsPaneContext } from 'element-plus';
import { useRoute, useRouter } from 'vue-router';
-import { getStorageView } from '/@/api/main/ReportCenter/storageView';
+import { getQueryOffOrderList, getStorageView } from '/@/api/main/ReportCenter/storageView';
const router = useRouter();
// 鎺ュ彛鏁版嵁
const loadingwms = ref(false);
@@ -156,12 +147,11 @@
],
};
+var offOrderInfo = ref([])
onMounted(() => {
nextTick(async () => {
-
-
var res = await getStorageView();
- debugger
+ debugger;
if (res.data.code == 200) {
const { data } = res;
const result = data.result;
@@ -190,13 +180,19 @@
value: result.filter((item: any) => item.stockStatus == 2).length || 0,
},
];
- optionPie.series[0].data = countList.value;
- myChart = echarts.init(document.getElementById('homePieChart') as HTMLDivElement);
- myChart.setOption(optionPie);
+ optionPie.series[0].data = countList.value;
+ myChart = echarts.init(document.getElementById('homePieChart') as HTMLDivElement);
+ myChart.setOption(optionPie);
+ }
-
+ var res = await getQueryOffOrderList();
+ // WmsCommonnQuery/QueryOffOrderList
+ if (res.data.code == 200) {
+ debugger;
+ offOrderInfo.value = res.data.result || [];
}
});
+ handleQuery3('1');
});
// 鏌ヨ
@@ -285,7 +281,7 @@
};
// handleQuery1();
// handleQuery2();
-// handleQuery3('1');
+//
// handleQuery4();
const activeName = ref('1');
const handleClick = (tab: TabsPaneContext, event: Event) => {
@@ -330,24 +326,6 @@
color2: '--next-color-success-lighter',
color3: '--el-color-success',
},
- // {
- // num1: '125,65',
- // num2: '+17.32',
- // num3: '骞村害璁″垝淇℃伅',
- // num4: 'iconfont icon-zaosheng',
- // color1: '#6690F9',
- // color2: '--next-color-warning-lighter',
- // color3: '--el-color-warning',
- // },
- // {
- // num1: '520,43',
- // num2: '-10.01',
- // num3: '璁块棶缁熻淇℃伅',
- // num4: 'fa fa-github-alt',
- // color1: '#FF6462',
- // color2: '--next-color-danger-lighter',
- // color3: '--el-color-danger',
- // },
],
myCharts: [] as EmptyArrayType,
@@ -531,13 +509,13 @@
const option = {
backgroundColor: state.charts.bgColor,
title: {
- text: '涓婁笅鏋舵帹绉诲浘',
+ text: '涓婁笅绾挎帹绉诲浘',
x: 'left',
textStyle: { fontSize: '12', color: state.charts.color },
},
tooltip: { trigger: 'axis' },
//legend: { data: ['鍏ュ簱','鍑哄簱', '搴撳瓨', '骞冲潎'], right: 0 },
- legend: { data: ['涓婃灦', '涓嬫灦'], right: 0 },
+ legend: { data: ['涓婄嚎', '涓嬬嚎'], right: 0 },
grid: { top: 50, right: 80, bottom: 100, left: 60 },
// grid: { top: 70, right: 80, bottom: 30, left: 80 },
xAxis: [
@@ -572,7 +550,7 @@
],
series: [
{
- name: '涓婃灦',
+ name: '涓婄嚎',
type: 'line',
smooth: true,
showSymbol: true,
@@ -602,7 +580,7 @@
data: [],
},
{
- name: '涓嬫灦',
+ name: '涓嬬嚎',
type: 'line',
smooth: true,
showSymbol: true,
@@ -768,7 +746,7 @@
.home-card-three {
.home-card-item {
width: 100%;
- height: 130px;
+ height: 160px;
border-radius: 4px;
transition: all ease 0.3s;
padding: 20px;
@@ -810,7 +788,7 @@
.home-card-two,
.home-card-three {
.home-card-item {
- height: 400px;
+ height: 500px;
width: 100%;
overflow: hidden;
.home-monitor {
@@ -860,4 +838,12 @@
color: var(--el-text-color-primary);
border: 1px solid var(--next-border-color-light);
}
+.font30{
+ font-size: 39px !important;
+ margin: 24px 0;
+ color: orange;
+}
+.font16{
+ font-size: 24px !important;
+}
</style>
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/HomeListInputAndOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/HomeListInputAndOutput.cs
new file mode 100644
index 0000000..e3eb4c2
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/HomeListInputAndOutput.cs
@@ -0,0 +1,52 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+public class Home_Order_Info
+{
+ /// <summary>
+ /// 鏁版嵁鍚嶇О
+ /// </summary>
+ public string Name { get; set; }
+
+ /// <summary>
+ /// 鏁版嵁鍊�
+ /// </summary>
+ public int Value { get; set; }
+}
+
+public class WmsStockPassMapInput
+{
+ /// <summary>
+ /// 鏃ュ懆鏈堥�夋嫨 --1涓烘棩銆�2涓哄懆銆佷笁涓烘湀
+ /// </summary>
+ public int DayOrWeekOrMonth { get; set; }
+}
+
+public class WmsStockPassMapOutput
+{
+ /// <summary>
+ /// 鏍囪
+ /// </summary>
+ public int Time { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏁�
+ /// </summary>
+ public decimal InWare { get; set; }
+ /// <summary>
+ /// 鍑哄簱鏁�
+ /// </summary>
+ public decimal OutWare { get; set; }
+ /// <summary>
+ /// 搴撳瓨鏁�
+ /// </summary>
+ public decimal StockNum { get; set; }
+ /// <summary>
+ /// 骞冲潎搴撳瓨鏁�
+ /// </summary>
+ public decimal AveStockNum { get; set; }
+ public string Date { get; set; }
+}
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 29d2a93..37a2e8c 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -704,5 +704,192 @@
return upiList;
}
+
+
+ /// <summary>
+ /// 棣栭〉 鏈懆涓嬬嚎鐗╂枡淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "HomeOffOrderList")]
+ [Description("WmsCommonnQuery/HomeOffOrderList")]
+ public async Task<List<Home_Order_Info>> HomeOffOrderList()
+ {
+ List<Home_Order_Info> resultList = new List<Home_Order_Info>();
+ // 鑾峰彇褰撳墠鏃堕棿
+ DateTime currentDate = DateTime.Now;
+ // 璁＄畻涓�鍛ㄤ箣鍓嶇殑鏃堕棿
+ DateTime oneWeekAgo = currentDate.AddDays(-7);
+ // 鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
+ var orderCount = await _mesOrderGatherRep.AsQueryable().Where(x => x.UnlineTime >= oneWeekAgo && x.UnlineTime <= currentDate).CountAsync();
+ resultList.Add(new Home_Order_Info
+ {
+ Name = "鏈懆涓嬬嚎璁㈠崟鏁�",
+ Value = orderCount // 灏嗘煡璇㈠埌鐨勬暟閲忚祴鍊�
+ });
+ resultList.Add(new Home_Order_Info
+ {
+ Name = "涓嬬嚎鍖呮暟",
+ Value = 8
+ // Value = await _mesPackage_UnLine_RecordRep 鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
+ });
+ resultList.Add(new Home_Order_Info
+ {
+ Name = "涓嬬嚎鏉挎暟",
+ Value = 3 // 杩欓噷绀轰緥鍊间负3锛屽彲浠ユ牴鎹疄闄呴�昏緫璋冩暣
+ });
+ return resultList; // 缁撴灉
+ }
+
+
+
+ /// <summary>
+ /// 涓婁笅鏋舵帹绉诲浘
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "HomeTytPage")]
+ [Description("WmsCommonnQuery/HomeTytPage")]
+ public async Task<List<WmsStockPassMapOutput>> HomeTytPage([FromQuery] WmsStockPassMapInput input)
+ {
+ List<WmsStockPassMapOutput> outputlist = new List<WmsStockPassMapOutput>();
+ DateTime currentDate = DateTime.Today;
+
+ //閫夋嫨涓�12鏃ョ殑鎯呭喌
+ if (input.DayOrWeekOrMonth == 1)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = currentDate.AddDays(-11);
+ DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-1);
+ var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable()
+ .Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ ).ToListAsync();
+
+
+ for (int i = 0; i < 12; i++)
+ {
+ DateTime startDate = currentDate.AddDays(-i);
+ DateTime endDate = startDate.Date.AddDays(1).AddTicks(-1);
+
+ // 鏌ヨ鍦ㄨ繖涓�澶╁唴鐨勮褰�
+ var recordsOfDay = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate
+ ).ToList();
+
+
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ InWare = recordsOfDay
+ // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
+ .ToList().Count(),
+ OutWare = recordsOfDay
+ // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ .ToList().Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.Date.ToString("yyyy-MM-dd")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+ //閫夋嫨12鍛�
+ else if (input.DayOrWeekOrMonth == 2)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
+ DateTime all_endDate = GetEndOfWeek(currentDate);
+ var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ ).ToListAsync();
+
+ for (int i = 0; i < 12; i++)
+ {
+ // 璁＄畻褰撳墠鍛ㄧ殑璧峰鏃ユ湡
+ DateTime startDate = GetStartOfWeek(currentDate).AddDays(-7 * i);
+ DateTime endDate = GetEndOfWeek(startDate);
+
+ // 鏌ヨ鍦ㄨ繖涓�鍛ㄥ唴鐨勫嚭鍏ュ簱璁板綍
+ var recordsOfWeek = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();
+
+ // 姹囨�诲嚭鍏ュ簱璁板綍
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ InWare = recordsOfWeek
+ // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�) .Sum(x => x.Quantity),
+ .ToList().Count(),
+ OutWare = recordsOfWeek
+ // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ .ToList().Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.Date.ToString("MMdd") + "锝�" + endDate.Date.ToString("MMdd")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+ //閫夋嫨12涓湀
+ else if (input.DayOrWeekOrMonth == 3)
+ {
+ //鎬荤殑鏁版嵁
+ DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
+ DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
+ var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ ).ToListAsync();
+
+ for (int i = 0; i < 12; i++)
+ {
+ DateTime startDate = currentDate.AddMonths(-i).AddDays(1 - currentDate.Day);
+ DateTime endDate = startDate.AddMonths(1).AddDays(-1);
+
+ // 鏌ヨ鍦ㄨ繖涓湀鍐呯殑鍑哄叆搴撹褰�
+ var recordsOfMonth = all_recordsOfDay.Where(r => r.CreateTime >= startDate && r.CreateTime <= endDate).ToList();
+
+ // 姹囨�诲嚭鍏ュ簱璁板綍
+ var summary = new WmsStockPassMapOutput
+ {
+ Time = 12 - i,
+ InWare = recordsOfMonth
+ //.Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
+ .ToList().Count(),
+ OutWare = recordsOfMonth
+ // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ .ToList().Count(),
+ StockNum = 0,
+ AveStockNum = 0,
+ Date = startDate.ToString("yyyy-MM")
+ };
+
+ outputlist.Add(summary);
+ }
+ }
+
+ //鎺掑簭
+ outputlist = outputlist.OrderBy(x => x.Time).ToList();
+
+ return outputlist;
+ }
+ // 鑾峰彇褰撳墠鏃ユ湡鎵�鍦ㄥ懆鐨勮捣濮嬫棩鏈燂紙鍛ㄤ竴锛�
+ private DateTime GetStartOfWeek(DateTime currentDate)
+ {
+ int diff = currentDate.DayOfWeek - DayOfWeek.Monday;
+ if (diff < 0) diff += 7; // 澶勭悊鍛ㄦ棩鐨勬儏鍐�
+ return currentDate.AddDays(-1 * diff).Date;
+ }
+
+ // 鑾峰彇褰撳墠鏃ユ湡鎵�鍦ㄥ懆鐨勭粨鏉熸棩鏈燂紙鍛ㄦ棩锛�
+ private DateTime GetEndOfWeek(DateTime startDate)
+ {
+ return startDate.AddDays(6); // 鍥犱负璧峰鏃ユ湡宸茬粡鏄懆涓�锛屾墍浠ョ洿鎺ュ姞6澶╁嵆鍙緱鍒板懆鏃�
+ }
+
}
--
Gitblit v1.9.3