From d57815781381a23be2255f1f93b480950c6c39a8 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 14 十一月 2025 17:20:24 +0800
Subject: [PATCH] 新增任务看板滚动功能及优化文档布局在 Home.vue中新增任务看板滚动显示功能,优化数据总览和图表样式新增 iconfont 字体文件及相关样式,提升页面视觉效果。在 TaskService.cs和 AGVSignal.cs中新增对RelocationGroup 的任务状态处理逻辑。新增EnumHelper.cs 中的枚举描述获取方法,支持动态描述解析优化按钮逻辑,统一“其他出库”和“调拨出库”的处理方式更新文档布局文件,调整引用路径、索引和视图状态。 在StockInfoService.cs中新增任务数据查询逻辑,支持任务状态描述返回。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoHtyService.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoHtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoHtyService.cs"
index 06d3149..cd49b05 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoHtyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoHtyService.cs"
@@ -1,6 +1,7 @@
锘縰sing AngleSharp.Dom;
using Mapster;
using Masuit.Tools;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
@@ -10,6 +11,7 @@
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
namespace WIDESEA_StorageBasicService;
@@ -54,10 +56,19 @@
}
catch { }
}
+ Expression<Func<DtStockInfo_Hty, bool>> materielCode = null;
+ foreach (var item in searchParametersList)
+ {
+ if (item.Name.Contains("materielCode"))
+ {
+ materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
+ }
+ }
var data = BaseDal.Db.Queryable<DtStockInfo_Hty>()
.Includes(x => x.StockInfoDetails)
.Where(x=>x.CreateDate>DateTime.Now.AddMonths(-1))
.WhereIF(!wheres.IsNullOrEmpty(), wheres)
+ .WhereIF(materielCode != null, materielCode)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
return new PageGridData<DtStockInfo_Hty>(totalCount, data);
--
Gitblit v1.9.3