首页

liuying

2024-12-11 3b8b9cba9ebe15ff4ae1a7d8cb483d1f0ffcfa85

首页

 LA24030_LuLiPackageLine_Pda/pages/artificial/artificial.vue

@@ -391,7 +391,7 @@
      this.singlist = [];
    },

    //获取容器的信息
    //获取
    getContainerData(param) {
      if (!this.warehouse.upi) {
        uni.showToast({

 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',

	

}

// å¢žåŠ åˆ†æ‹£ä¿¡æ¯
@@ -13,3 +17,11 @@
        method: 'get',
        data: params
    });

	
    export const getQueryOffOrderList = (params?: any) =>
        request({
            url: Api.QueryOffOrderList,
            method: 'get',
            data: params
        });

 LA24030_LuLiPackageLine_Web/src/api/main/inventoryWarning/inventoryWarning.ts

@@ -1,7 +1,7 @@
import 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',  

 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;
@@ -193,10 +183,16 @@
        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>

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/HomeListInputAndOutput.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
using 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; }
}

 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天即可得到周日
    }
  
}