From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
index 4108172..a95ca9f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/LargeScreen/LargeController.cs"
@@ -21,6 +21,7 @@
using SqlSugar;
using WIDESEA_IStockService;
using WIDESEA_Common.StockEnum;
+using HslCommunication.WebSocket;
namespace WIDESEA_WMSServer.Controllers.LargeScreen
{
@@ -28,26 +29,42 @@
[ApiController]
public class LargeController : ControllerBase
{
- //private readonly IOutboundService _outboundService;
- //private readonly ITaskService _taskService;
- //private readonly ITask_HtyService _task_HtyService;
- //private readonly IBasicService _basicService;
- //private readonly IMesProInOrderService _mesProInOrderService;
- //private readonly IOutProStockInfoService _outProStockInfoService;
- //private readonly IProStockInfoDetailService _proStockInfoDetailService;
- //private readonly IProStockInfoService _proStockInfoService;
+ private readonly IOutboundService _outboundService;
+ private readonly ITaskService _taskService;
+ private readonly ITask_HtyService _task_HtyService;
+ private readonly IBasicService _basicService;
+ private readonly IMesProInOrderService _mesProInOrderService;
+ private readonly IOutProStockInfoService _outProStockInfoService;
+ private readonly WebSocketServer _webSocketServer;
+ private readonly IProStockInfoDetailService _proStockInfoDetailService;
+ private readonly IProStockInfoService _proStockInfoService;
- //public LargeController(IOutboundService outboundService, ITaskService taskService, ITask_HtyService task_HtyService, IBasicService basicService, IMesProInOrderService mesProInOrderService, IOutProStockInfoService outProStockInfoService,IProStockInfoDetailService proStockInfoDetailService, IProStockInfoService proStockInfoService)
- //{
- // _outboundService = outboundService;
- // _taskService = taskService;
- // _task_HtyService = task_HtyService;
- // _basicService = basicService;
- // _mesProInOrderService = mesProInOrderService;
- // _outProStockInfoService = outProStockInfoService;
- // _proStockInfoDetailService= proStockInfoDetailService;
- // _proStockInfoService=proStockInfoService;
- //}
+ public LargeController(IOutboundService outboundService, ITaskService taskService, ITask_HtyService task_HtyService, IBasicService basicService, IMesProInOrderService mesProInOrderService, IOutProStockInfoService outProStockInfoService, IProStockInfoDetailService proStockInfoDetailService, IProStockInfoService proStockInfoService, WebSocketServer webSocketServer)
+ {
+ _outboundService = outboundService;
+ _taskService = taskService;
+ _task_HtyService = task_HtyService;
+ _basicService = basicService;
+ _mesProInOrderService = mesProInOrderService;
+ _outProStockInfoService = outProStockInfoService;
+ _proStockInfoDetailService = proStockInfoDetailService;
+ _proStockInfoService = proStockInfoService;
+ _webSocketServer = webSocketServer;
+ }
+ /// <summary>
+ /// 娴嬭瘯
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("PushInfoSocket"), AllowAnonymous]
+ public WebResponseContent ProMonthTaskStatistics(string info)
+ {
+ WebSocketSession[] webSocketSession = _webSocketServer.OnlineSessions;
+ if (webSocketSession != null)
+ {
+ _webSocketServer.SendClientPayload(webSocketSession[0], "鍚屾剰");
+ }
+ return WebResponseContent.Instance.OK(_webSocketServer.OnlineSessions.Select(x=>x.Url).Serialize());
+ }
///// <summary>
///// 鎴愬搧褰撴湀浠诲姟缁熻
///// </summary>
@@ -173,7 +190,7 @@
// try
// {
// var list = _proStockInfoDetailService.Repository.QueryData(x => true).GroupBy(x => x.ProductCode).Select(x => new { pCode = x.Key, qtys = x.Sum(x=>x.StockPcsQty) }).OrderByDescending(x=>x.qtys).Take(5);
-
+
// content.OK("鎴愬姛", list);
// }
// catch (Exception ex)
--
Gitblit v1.9.3