From ce21109b355a4948f11471d4db53c0226417f04e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 16 12月 2024 09:47:07 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json | 2
LA24030_LuLiPackageLine_Web/src/views/home/index.vue | 82 ++++++++++++---------------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 75 ++++++++++++++----------
3 files changed, 80 insertions(+), 79 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
index bfa6122..eddb91d 100644
--- a/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
+++ b/LA24030_LuLiPackageLine_Web/src/views/home/index.vue
@@ -160,11 +160,6 @@
var noMaterialCount = result.length - hasMaterialCount;
countList.value = [
{
- type: '',
- name: '鎬诲簱浣�',
- value: result.length || 0,
- },
- {
type: 1,
name: '鏈夎揣搴撲綅',
value: hasMaterialCount || 0,
@@ -173,11 +168,6 @@
type: 18,
name: '鏃犺揣搴撲綅',
value: noMaterialCount || 0,
- },
- {
- type: 2,
- name: '閿佸畾搴撲綅',
- value: result.filter((item: any) => item.stockStatus == 2).length || 0,
},
];
optionPie.series[0].data = countList.value;
@@ -188,7 +178,7 @@
var res = await getQueryOffOrderList();
// WmsCommonnQuery/QueryOffOrderList
if (res.data.code == 200) {
- debugger;
+ //debugger;
offOrderInfo.value = res.data.result || [];
}
});
@@ -509,13 +499,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: [
@@ -549,38 +539,38 @@
// },
],
series: [
+ // {
+ // name: '涓婄嚎',
+ // type: 'line',
+ // smooth: true,
+ // showSymbol: true,
+ // // 鐭㈤噺鐢讳簲瑙掓槦
+ // symbol: 'path://M150 0 L80 175 L250 75 L50 75 L220 175 Z',
+ // symbolSize: 12,
+ // yAxisIndex: 0,
+ // areaStyle: {
+ // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ // { offset: 0, color: 'rgba(250,180,101,0.3)' },
+ // { offset: 1, color: 'rgba(250,180,101,0)' },
+ // ]),
+ // shadowColor: 'rgba(250,180,101,0.2)',
+ // shadowBlur: 20,
+ // },
+ // itemStyle: { color: '#FF8000' },
+ // // data涓彲浠ヤ娇鐢ㄥ璞★紝value浠ｈ〃鐩稿簲鐨勫�硷紝鍙﹀鍙姞鍏ヨ嚜瀹氫箟鐨勫睘鎬�
+ // // data: [
+ // // { value: 1, stationName: 's1' },
+ // // { value: 3, stationName: 's2' },
+ // // { value: 4, stationName: 's3' },
+ // // { value: 9, stationName: 's4' },
+ // // { value: 3, stationName: 's5' },
+ // // { value: 2, stationName: 's6' },
+ // // ],
+ // // data:dataAll.value.arr1
+ // data: [],
+ // },
{
- name: '涓婄嚎',
- type: 'line',
- smooth: true,
- showSymbol: true,
- // 鐭㈤噺鐢讳簲瑙掓槦
- symbol: 'path://M150 0 L80 175 L250 75 L50 75 L220 175 Z',
- symbolSize: 12,
- yAxisIndex: 0,
- areaStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: 'rgba(250,180,101,0.3)' },
- { offset: 1, color: 'rgba(250,180,101,0)' },
- ]),
- shadowColor: 'rgba(250,180,101,0.2)',
- shadowBlur: 20,
- },
- itemStyle: { color: '#FF8000' },
- // data涓彲浠ヤ娇鐢ㄥ璞★紝value浠ｈ〃鐩稿簲鐨勫�硷紝鍙﹀鍙姞鍏ヨ嚜瀹氫箟鐨勫睘鎬�
- // data: [
- // { value: 1, stationName: 's1' },
- // { value: 3, stationName: 's2' },
- // { value: 4, stationName: 's3' },
- // { value: 9, stationName: 's4' },
- // { value: 3, stationName: 's5' },
- // { value: 2, stationName: 's6' },
- // ],
- // data:dataAll.value.arr1
- data: [],
- },
- {
- name: '涓嬬嚎',
+ name: '涓嬬嚎璁㈠崟',
type: 'line',
smooth: true,
showSymbol: true,
@@ -651,8 +641,8 @@
state.global.homeCharThree = markRaw(echarts.init(chart, state.charts.theme));
//鎵嬪姩璧嬪��
option.xAxis[0].data = dataAll.value.arr5;
- option.series[0].data = dataAll.value.arr1;
- option.series[1].data = dataAll.value.arr2;
+ option.series[0].data = dataAll.value.arr2;
+ //option.series[1].data = dataAll.value.arr2;
// option.series[2].data = dataAll.value.arr3
// option.series[3].data = dataAll.value.arr4
// 缁樺埗鍥捐〃
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
index 329f063..3491b79 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
@@ -26,7 +26,7 @@
"EnableUnderLine": false // 鍚敤椹煎嘲杞笅鍒掔嚎
},
"TableSettings": {
- "EnableInitTable": true, // 鍚敤琛ㄥ垵濮嬪寲
+ "EnableInitTable": false, // 鍚敤琛ㄥ垵濮嬪寲
"EnableIncreTable": false // 鍚敤琛ㄥ閲忔洿鏂�-鐗规�IncreTable]
},
"SeedSettings": {
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 b8ca267..8263ade 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -10,6 +10,7 @@
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
using System.Collections.Generic;
using Admin.NET.Application.CommonHelper;
+using System.Globalization;
namespace Admin.NET.Application;
/// <summary>
@@ -768,24 +769,46 @@
// 鑾峰彇褰撳墠鏃堕棿
DateTime currentDate = DateTime.Now;
// 璁＄畻涓�鍛ㄤ箣鍓嶇殑鏃堕棿
- DateTime oneWeekAgo = currentDate.AddDays(-7);
+ //DateTime oneWeekAgo = currentDate.AddDays(-7);
+
+ // 鑾峰彇褰撳墠鏂囧寲淇℃伅
+ CultureInfo cultureInfo = CultureInfo.CurrentCulture;
+
+ // DayOfWeek.Monday 琛ㄧず涓�鍛ㄧ殑绗竴澶╂槸鍛ㄤ竴
+ int diff = (int)cultureInfo.DateTimeFormat.FirstDayOfWeek - (int)DateTime.Now.DayOfWeek;
+
+ // 濡傛灉闇�瑕侊紝瀵瑰樊鍊艰繘琛岃皟鏁翠互纭繚鏄繃鍘荤殑鏃ユ湡
+ if (diff < 0) diff += 7;
+ DateTime oneWeekAgo = DateTime.Now.AddDays(diff).Date;
+ //*/
+
// 鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
- var orderCount = await _mesOrderGatherRep.AsQueryable().Where(x => x.UnlineTime >= oneWeekAgo && x.UnlineTime <= currentDate).CountAsync();
+ var dataList = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(x => x.CreateTime >= oneWeekAgo && x.CreateTime <= currentDate).ToListAsync();
+
+ var packageList = dataList.GroupBy(x => x.PackageCode);//涓嬬嚎鍖�
+
+ var orderCount = dataList.GroupBy(x => x.Info5).Count();//涓嬬嚎璁㈠崟鏁�
+ var packageCount = packageList.Count();//涓嬬嚎鍖呮暟
+ var upiCount = 0;
+ foreach (var item in packageList)
+ {
+ upiCount += Convert.ToInt32(item.ToList().First().Info12);
+ }
+
resultList.Add(new Home_Order_Info
{
Name = "鏈懆涓嬬嚎璁㈠崟鏁�",
- Value = orderCount // 灏嗘煡璇㈠埌鐨勬暟閲忚祴鍊�
+ Value = orderCount
});
resultList.Add(new Home_Order_Info
{
- Name = "涓嬬嚎鍖呮暟",
- Value = 8
- // Value = await _mesPackage_UnLine_RecordRep 鏌ヨ鏈�杩戜竴鍛ㄧ殑涓嬬嚎璁㈠崟鏁�
+ Name = "鏈懆涓嬬嚎鍖呮暟",
+ Value = packageCount
});
resultList.Add(new Home_Order_Info
{
- Name = "涓嬬嚎鏉挎暟",
- Value = 3 // 杩欓噷绀轰緥鍊间负3锛屽彲浠ユ牴鎹疄闄呴�昏緫璋冩暣
+ Name = "鏈懆涓嬬嚎鏉挎暟",
+ Value = upiCount
});
return resultList; // 缁撴灉
}
@@ -811,10 +834,8 @@
//鎬荤殑鏁版嵁
DateTime all_startDate = currentDate.AddDays(-11);
DateTime all_endDate = currentDate.Date.AddDays(1).AddTicks(-1);
- var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable()
+ var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable()
.Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
- //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
- //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
).ToListAsync();
@@ -831,12 +852,10 @@
var summary = new WmsStockPassMapOutput
{
Time = 12 - i,
- InWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
- .ToList().Count(),
+ //InWare = recordsOfDay
+ //.ToList().Count(),
OutWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
- .ToList().Count(),
+ .ToList().GroupBy(x => x.Info5).Count(),
StockNum = 0,
AveStockNum = 0,
Date = startDate.Date.ToString("yyyy-MM-dd")
@@ -851,9 +870,7 @@
//鎬荤殑鏁版嵁
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.涓嬫灦鍗�)
+ var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -869,12 +886,10 @@
var summary = new WmsStockPassMapOutput
{
Time = 12 - i,
- InWare = recordsOfWeek
- // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�) .Sum(x => x.Quantity),
- .ToList().Count(),
+ //InWare = recordsOfWeek
+ //.ToList().Count(),
OutWare = recordsOfWeek
- // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
- .ToList().Count(),
+ .ToList().GroupBy(x => x.Info5).Count(),
StockNum = 0,
AveStockNum = 0,
Date = startDate.Date.ToString("MMdd") + "锝�" + endDate.Date.ToString("MMdd")
@@ -889,9 +904,7 @@
//鎬荤殑鏁版嵁
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.涓嬫灦鍗�)
+ var all_recordsOfDay = await _mesPackage_UnLine_RecordRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -906,12 +919,10 @@
var summary = new WmsStockPassMapOutput
{
Time = 12 - i,
- InWare = recordsOfMonth
- //.Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
- .ToList().Count(),
+ //InWare = recordsOfMonth
+ // .ToList().Count(),
OutWare = recordsOfMonth
- // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
- .ToList().Count(),
+ .ToList().GroupBy(x => x.Info5).Count(),
StockNum = 0,
AveStockNum = 0,
Date = startDate.ToString("yyyy-MM")
--
Gitblit v1.9.3