From abf9b6bb33fcfad5b56a17a5d3e99b49782a7316 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 12月 2024 15:19:00 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 84 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 15 deletions(-)
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..ded416f 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,8 @@
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
+using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
+using System.Collections.Generic;
namespace Admin.NET.Application;
/// <summary>
@@ -22,12 +24,16 @@
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;
+ private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
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
+ , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
)
{
_sysConfigRep = sysConfigRep;
@@ -36,6 +42,8 @@
_wmsStockQuanRep = wmsStockQuanRep;
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
_mesOrderGatherRep = mesOrderGatherRep;
+ _mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
+ _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
}
/// <summary>
@@ -59,6 +67,39 @@
return list; // 缁撴灉
}
+
+
+ /// <summary>
+ /// 鏌ヨ 璁″垝鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryPlanOrderList")]
+ [Description("WmsCommonnQuery/QueryPlanOrderList")]
+ public async Task<List<Mes_Order_Gather>> QueryPlanOrderList()
+ {
+ var list = await _mesPackage_LineQueueRep.AsQueryable()
+ .OrderBy(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+ List<Mes_Order_Gather> resultList = new List<Mes_Order_Gather>();
+ foreach (var item in list)
+ {
+ if (resultList.Select(x => x.Info5).ToList().Contains(item.Info5))
+ {
+
+ }
+ else
+ {
+ var mesOrderGather = await _mesOrderGatherRep.GetFirstAsync(x => x.Info5 == item.Info5);
+ if (mesOrderGather != null)
+ {
+ resultList.Add(mesOrderGather);
+ }
+ }
+ }
+
+ return resultList; // 缁撴灉
+ }
/// <summary>
/// 鏌ヨ 鍘嗗彶鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級
@@ -97,7 +138,7 @@
public async Task<Mes_Order_Gather> QueryCurrentOrder()
{
//鑾峰彇涓婄彮鏃堕棿銆�
- var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
+ var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�")
{
return null;
@@ -143,31 +184,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