schangxiang@126.com
2024-11-30 e52dd73ef7b44ec23a49ef2483ee813aa3b7dc96
2222
已添加1个文件
已修改1个文件
82 ■■■■ 文件已修改
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,37 @@
using Admin.NET.Application.Entity;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.NET.Application.Service.WmsCommonnQuery.Dto;
public class ScreenLoginUserOutput
{
    public string LoginUser { get; set; }        // åˆ†ç»„的键
    public string TimeLogin { get; set; }         // ç™»å½•时间(示例用)
    /// <summary>
    /// å·¥ä½œæ—¶é•¿(h)
    /// </summary>
    public double WorkTime { get; set; }
    /// <summary>
    /// åŒ…æ•°
    /// </summary>
    [SugarColumn(ColumnName = "PackageNum", ColumnDescription = "包数")]
    public int PackageNum { get; set; }
    /// <summary>
    /// æ€»åŒ…装面积
    /// </summary>
    [SugarColumn(ColumnName = "AllPackageArea", ColumnDescription = "总包装面积")]
    public decimal AllPackageArea { get; set; }
    /// <summary>
    /// æ€»ç”Ÿäº§è®¢å•æ•°
    /// </summary>
    public decimal AllOrderNum { get; set; }
}
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -7,6 +7,7 @@
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
namespace Admin.NET.Application;
/// <summary>
@@ -22,12 +23,14 @@
    private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
    private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
    private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
    private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
    public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
        , SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
        , SqlSugarRepository<SysConfig> sysConfigRep
        , SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
        , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
        , SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
        )
    {
        _sysConfigRep = sysConfigRep;
@@ -36,6 +39,7 @@
        _wmsStockQuanRep = wmsStockQuanRep;
        _mesBatchOrderUpiRep = mesBatchOrderUpiRep;
        _mesOrderGatherRep = mesOrderGatherRep;
        _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
    }
    /// <summary>
@@ -143,31 +147,44 @@
            {
                LoginUser = null,
                TimeLogin = null,
                List = null
            };
        }
        // èŽ·å– wms_bz30_qitao å¯¹åº”的值
        var param = list.FirstOrDefault(x => x.Code == "wms_bz30_qitao")?.Value;
        // èŽ·å–åŒ…è£¹ä»£ç 
        var PackageCode = string.IsNullOrEmpty(param) ? "" : param.Split("|")[0];
        // èŽ·å–åŒ…è£¹ä¿¡æ¯
        var packageGather = await _mesPackageGatherRep.GetFirstAsync(w => w.PackageCode == PackageCode);
        //获取上班时间。
        DateTime unLineTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd 00:00:00"));
        var sysConfig_wms_unline_time = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_time);
        if (sysConfig_wms_unline_time == null || sysConfig_wms_unline_time.Value == "无")
        {
        }
        else
        {
            unLineTime = Convert.ToDateTime(sysConfig_wms_unline_time.Value);
        }
        var recordList = await _mesPackage_UnLine_RecordRep.AsQueryable()
            .Where(x => x.CreateTime >= unLineTime)
            .ToListAsync(); // ç¡®ä¿èŽ·å–ç»“æžœä¸º List
                            //汇总数据
        TimeSpan ts = DateTime.Now - unLineTime;
        // è¿”回结果
        return new ScreenLoginUserOutput
        {
            LoginUser = list.FirstOrDefault(x => x.Code == "wms_unline_oper")?.Value,
            TimeLogin = list.FirstOrDefault(x => x.Code == "wms_unline_time")?.Value,
            List = packageGather // ç¡®ä¿è¿™é‡Œæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ Mes_Package_Gather å®žä¾‹
            AllOrderNum = recordList.GroupBy(x => x.Info5).Count(),
            AllPackageArea = recordList.Sum(x => Convert.ToDecimal((x.Info13))),
            PackageNum = recordList.GroupBy(x => x.PackageCode).Count(),
            WorkTime = ts.TotalHours
        };
    }
    public class ScreenLoginUserOutput
    {
        public string LoginUser { get; set; }        // åˆ†ç»„的键
        public string TimeLogin { get; set; }         // ç™»å½•时间(示例用)
        public Mes_Package_Gather List { get; set; } // åŒ…裹信息
    }
}