From 6a9cbabce3dab5b74fa466d6f7ab27bd1a1be3cb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 11 十月 2025 14:16:50 +0800
Subject: [PATCH] 优化任务逻辑并新增文件与文档支持 移除字段 "生产产线" 相关代码，优化 AGV 同层搬运与入库任务逻辑，新增对写入信号的判断处理，提升任务执行可靠性。 新增 `HttpHelper.cs`、`TaskEnumHelper.cs`、`PDAController.cs` 等文件，调整文档布局，更新索引与视图状态。 清理无用代码，完善堆垛机任务完成逻辑，新增日志记录。 新增与数据库相关的二进制文件及 Excel 文件支持。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs"
index 10f60dc..12447c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Repository/Sys_MenuRepository.cs"
@@ -26,13 +26,29 @@
public List<MenuDTO> GetAllMenu()
{
- List<Sys_Menu> menus = base.QueryData(x => x.Enable == 1 || x.Enable == 2).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
+ //List<Sys_Menu> menus = base.QueryData(x => x.Enable == 1 || x.Enable == 2).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
+ //List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
+
+ //_menus.ForEach(x =>
+ //{
+ // x.MenuType ??= 0;
+ // if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
+ // {
+ // try
+ // {
+ // x.Actions = x.Auth.DeserializeObject<List<ActionDTO>>();
+ // }
+ // catch { }
+ // }
+ // x.Actions ??= new List<ActionDTO>();
+ //});
+ //string test = _menus.Serialize();
+ //return _menus;
+ List<Sys_Menu> menus = base.QueryData(x => (x.Enable == 1 || x.Enable == 2) && x.MenuType == App.User.MenuType).OrderByDescending(a => a.OrderNo).ThenByDescending(q => q.ParentId).ToList();
List<MenuDTO> _menus = _mapper.Map<List<MenuDTO>>(menus);
-
_menus.ForEach(x =>
{
- x.MenuType ??= 0;
if (!string.IsNullOrEmpty(x.Auth) && x.Auth.Length > 10)
{
try
--
Gitblit v1.9.3