From c4c2f2214f3213c6200435595aa64110b6984092 Mon Sep 17 00:00:00 2001 From: liuying <1427574514@qq.com> Date: 周六, 30 11月 2024 14:18:16 +0800 Subject: [PATCH] 大屏 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 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 0359bb2..d2a711e 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs @@ -13,6 +13,7 @@ /// 閫氱敤鏌ヨ鏈嶅姟 /// </summary> [ApiDescriptionSettings(ApplicationConst.WmsCommonnQueryGroupName, Order = 100)] +[AllowAnonymous] public class WmsCommonnQueryService : IDynamicApiController, ITransient { private readonly SqlSugarRepository<WmsRbLineTask> _rep; @@ -57,5 +58,116 @@ return list; // 缁撴灉 } + + + /// <summary> + /// 鏌ヨ 鍘嗗彶鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級 + /// </summary> + /// <returns></returns> + [HttpGet] + [ApiDescriptionSettings(Name = "QueryHistoryOrderList")] + [Description("WmsCommonnQuery/QueryHistoryOrderList")] + public async Task<List<Mes_Order_Gather>> QueryHistoryOrderList() + { + //鑾峰彇涓婄彮鏃堕棿銆� + 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 == "鏃�") + { + return null; + } + var unLineTime = Convert.ToDateTime(sysConfig_wms_unline_time.Value); + + var list = await _mesOrderGatherRep.AsQueryable() + .Where(x => x.UnlineTime >= unLineTime) + .Where(x => x.IsUnline == true) + .OrderByDescending(g => g.Id) + .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List + + return list; // 缁撴灉 + } + + + /// <summary> + /// 鏌ヨ 褰撳墠鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級 + /// </summary> + /// <returns></returns> + [HttpGet] + [ApiDescriptionSettings(Name = "QueryCurrentOrder")] + [Description("WmsCommonnQuery/QueryCurrentOrder")] + public async Task<Mes_Order_Gather> QueryCurrentOrder() + { + //鑾峰彇涓婄彮鏃堕棿銆� + var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper); + if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�") + { + return null; + } + var arr = sysConfig_wms_wms_unline_oper.Value.Split('|'); + var packagecode = arr[0]; + var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode); + if (packObj == null) + { + throw Oops.Oh($"娌℃湁鎵惧埌鍖厈packagecode}鐨勬眹鎬绘暟鎹�"); + } + + var list = await _mesOrderGatherRep.AsQueryable() + .Where(x => x.Info5 == packObj.Info5) + .FirstAsync(); // 纭繚鑾峰彇缁撴灉涓� List + + return list; // 缁撴灉 + } + + + + + /// <summary> + /// 澶у睆 - 鐧诲綍浜� 鐧诲綍鏃堕棿 LS070700117B0005GS + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpGet] + [ApiDescriptionSettings(Name = "ScreenLogin")] + [Description("WmsCommonnQuery/ScreenLogin")] + [AllowAnonymous] + public async Task<ScreenLoginUserOutput> ScreenLogin([FromQuery] Mes_Package_LineQueueInput input) + { + // 鍩烘湰鏌ヨ + var list = await _sysConfigRep.AsQueryable() + .Where(x => x.Code == "wms_bz30_qitao" || x.Code == "wms_unline_oper" || x.Code == "wms_unline_time") + .ToListAsync(); + // 妫�鏌ist鏄惁涓虹┖ + if (list == null || !list.Any()) + { + // 杩斿洖榛樿鍊兼垨鑰呮姏鍑哄紓甯� + return new ScreenLoginUserOutput + { + LoginUser = null, + TimeLogin = null, + List = null + }; + } + // 鑾峰彇 wms_bz30_qitao 瀵瑰簲鐨勫�� + var param = list.FirstOrDefault(x => x.Code == "wms_bz30_qitao")?.Value; + // 鑾峰彇鍖呰9浠g爜 + var PackageCode = string.IsNullOrEmpty(param) ? "" : param.Split("|")[0]; + // 鑾峰彇鍖呰9淇℃伅 + var packageGather = await _mesPackageGatherRep.GetFirstAsync(w => w.PackageCode == PackageCode); + // 杩斿洖缁撴灉 + 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 瀹炰緥 + }; + } + + + public class ScreenLoginUserOutput + { + public string LoginUser { get; set; } // 鍒嗙粍鐨勯敭 + public string TimeLogin { get; set; } // 鐧诲綍鏃堕棿锛堢ず渚嬬敤锛� + public Mes_Package_Gather List { get; set; } // 鍖呰9淇℃伅 + } + } -- Gitblit v1.9.3