From 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 13 十一月 2025 17:35:36 +0800
Subject: [PATCH] 新增移库页面与WebSocket支持，优化任务逻辑新增移库页面支持移库任务输入与提交。新增 WebSocket 支持（`websocket.js`、`WebSocketSetup.cs`），实现实时通信功能。 在任务状态枚举中新增 AGV 移库任务状`TaskStatusEnum.cs`）- 重构库存数据展示页面（`Home.vue`），新增数据总览与图表展示功能。 - 新增库存数据接口（`StockInfoService.cs`、`StockInfoController.cs`），支持库存统计与展示。 - 优化任务状态管理逻辑，支持 AGV 移库任务（`Dt_TaskService.cs`）。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index 2a555ff..5eb0c40 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -4,16 +4,19 @@
using Masuit.Tools;
using NewLife.Reflection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using System.Xml.Linq;
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Order;
@@ -24,6 +27,7 @@
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
+using JsonSerializer = System.Text.Json.JsonSerializer;
namespace WIDESEA_StorageBasicService;
@@ -57,7 +61,7 @@
_taskRepository = taskRepository;
_outDetailsRepository = outDetailsRepository;
}
-
+ #region 鏂规硶閲嶅啓
/// <summary>
/// 鍒嗛〉
/// </summary>
@@ -96,6 +100,7 @@
Expression<Func<DtStockInfo, bool>> floor = null;
Expression<Func<DtStockInfo, bool>> areaId = null;
Expression<Func<DtStockInfo, bool>> materielCode = null;
+ Expression<Func<DtStockInfo, bool>> materielName = null;
foreach (var item in searchParametersList)
{
if (item.Name.Contains("locationStatus"))
@@ -114,6 +119,10 @@
{
materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
}
+ else if (item.Name.Contains("materielName"))
+ {
+ materielName = x => x.StockInfoDetails.Any(d => d.MaterielName == item.Value);
+ }
}
//.IncludesAllFirstLayer()
var data = BaseDal.Db.Queryable<DtStockInfo>()
@@ -124,10 +133,46 @@
.WhereIF(floor != null, floor)
.WhereIF(areaId != null, areaId)
.WhereIF(materielCode != null, materielCode)
+ .WhereIF(materielName != null, materielName)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtStockInfo>(totalCount, data);
return new PageGridData<DtStockInfo>(totalCount, data);
+ }
+
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ var remark = saveModel.MainData["remark"].ToString();
+ var palletCode = saveModel.MainData["palletCode"].ToString();
+ List<DtStockInfoDetail> details = DeserializeList<DtStockInfoDetail>(saveModel.DetailData);
+ if (remark == "璋冩嫧鍑哄簱")
+ {
+ return _taskService.HandAllocateOutBoundTaskAsync(details).Result;
+ }
+ else if (remark == "鍏朵粬鍑哄簱")
+ {
+ return _taskService.OtherOutBoundTaskAsync(details).Result;
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("绯荤粺寮傚父");
+ }
+ }
+ public List<T> DeserializeList<T>(List<Dictionary<string, object>> rawData)
+ {
+ if (rawData == null) return new List<T>();
+ var processedData = rawData.Select(dict =>
+ {
+ var newDict = new Dictionary<string, object>();
+ foreach (var kvp in dict)
+ {
+ var newKey = char.ToUpper(kvp.Key[0]) + kvp.Key.Substring(1);
+ newDict[newKey] = kvp.Value;
+ }
+ return newDict;
+ }).ToList();
+ var json = JsonSerializer.Serialize(processedData);
+ return JsonSerializer.Deserialize<List<T>>(json);
}
public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
@@ -181,6 +226,8 @@
}
return locationsNew;
}
+
+ #endregion
#region 搴撳瓨瑙嗗浘
public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
@@ -388,4 +435,115 @@
}
#endregion
+
+ #region 搴撳瓨鏁版嵁灞曠ず
+
+ public async Task<WebResponseContent> GetStockData()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var stocks = await _stockInfoDetailRepository.QueryDataAsync(x => true);
+ var orderdetail = SqlSugarHelper.DbWMS.Queryable<Dt_OrderOutDetails_Hty>().Where(x => true).ToList();
+
+ // 鑾峰彇UTC褰撳墠鏃堕棿
+ DateTime utcNow = DateTime.UtcNow;
+
+ // 璁＄畻褰撴湀鏃堕棿鑼冨洿
+ DateTime firstDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1);
+ DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻褰撳ぉ鏃堕棿鑼冨洿
+ DateTime todayStart = utcNow.Date;
+ DateTime todayEnd = todayStart.AddDays(1).AddTicks(-1);
+
+ // 鏌ヨ褰撴湀鏁版嵁
+ var currentMonthInStocks = stocks.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocks = orderdetail.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ褰撴棩鏁版嵁
+ var currentDayInStocks = stocks.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.Quantity);
+ var currentDayOutStocks = orderdetail.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.OutboundQuantity);
+
+ // 鐢熸垚鏈�杩�7澶╃殑鍑哄叆搴撴暟鎹�
+ var last7Days = Enumerable.Range(0, 7)
+ .Select(i => utcNow.Date.AddDays(-i))
+ .OrderBy(x => x)
+ .ToList();
+
+ var monthDays = Enumerable.Range(1, DateTime.DaysInMonth(utcNow.Year, utcNow.Month))
+ .Select(day => new DateTime(utcNow.Year, utcNow.Month, day))
+ .Where(date => date <= utcNow.Date) // 鍙寘鍚埌浠婂ぉ涓烘鐨勬棩鏈�
+ .ToList();
+
+ var inboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity)
+ }).ToList();
+
+ var outboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ var MonthSumData = monthDays.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ InValue = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ OutValue = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ object obj = new
+ {
+ metrics = new List<object>{
+ new {
+ name = "浠婃棩杩涘簱閲�",
+ value = currentDayInStocks
+ },
+ new {
+ name = "浠婃棩鍑哄簱閲�",
+ value = currentDayOutStocks
+ },
+ new {
+ name = "鏈湀杩涘簱閲�",
+ value = currentMonthInStocks
+ },
+ new {
+ name = "鏈湀鍑哄簱閲�",
+ value = currentMonthOutStocks
+ },
+ new {
+ name = "搴撳瓨鎬婚噺",
+ value = stocks.Sum(x => x.Quantity)
+ }
+ },
+ outbound = new
+ {
+ dates = outboundData.Select(x => x.Date).ToArray(),
+ values = outboundData.Select(x => x.Value).ToArray()
+ },
+ inbound = new
+ {
+ dates = inboundData.Select(x => x.Date).ToArray(),
+ values = inboundData.Select(x => x.Value).ToArray()
+ },
+ monthData = new
+ {
+ dates = MonthSumData.Select(x => x.Date).ToArray(),
+ inValue = MonthSumData.Select(x => x.InValue).ToArray(),
+ outValue = MonthSumData.Select(x => x.OutValue).ToArray(),
+ }
+ };
+
+ return content.OK(data: obj);
+ }
+ catch (Exception ex)
+ {
+ return content.Error("绯荤粺閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3