From e52dd73ef7b44ec23a49ef2483ee813aa3b7dc96 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 30 11月 2024 14:35:40 +0800
Subject: [PATCH] 2222
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 45 +++++++++++++++-------
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs | 37 ++++++++++++++++++
2 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs
new file mode 100644
index 0000000..f226039
--- /dev/null
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/Dto/ScreenLoginUserOutput.cs
@@ -0,0 +1,37 @@
+锘縰sing 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; }
+}
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 d2a711e..635e74a 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/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; } // 鍖呰９淇℃伅
- }
+
}
--
Gitblit v1.9.3