22

schangxiang@126.com

2024-12-16 ce21109b355a4948f11471d4db53c0226417f04e

22

 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
    // 绘制图表

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json

@@ -26,7 +26,7 @@
          "EnableUnderLine": false // 启用驼峰转下划线
        },
        "TableSettings": {
          "EnableInitTable": true, // 启用表初始化
          "EnableInitTable": false, // 启用表初始化
          "EnableIncreTable": false // 启用表增量更新-特性[IncreTable]
        },
        "SeedSettings": {

 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")