From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 09 七月 2025 22:55:27 +0800
Subject: [PATCH] 增加质检出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 84 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 6200cdc..48f998a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -7,6 +7,7 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -66,7 +67,7 @@
if (!_cacheService.Exists(item.DicNo))
{
vueDictionaryDTOs.Add(item);
- _cacheService.Add(item.DicNo, item.Serialize());
+ //_cacheService.Add(item.DicNo, item.Serialize());
}
else
{
@@ -97,8 +98,8 @@
}
}
}
- List<string> dicList = dicNos.ToList();
- if (dicNos.Where(x => !cacheDicNos.Contains(x)).Count() > 0)
+ List<string> dicList = dicNos.Where(x => !cacheDicNos.Contains(x)).ToList();
+ if (dicList.Count() > 0)
{
string str = AppSettings.Configuration["dics"];
if (!string.IsNullOrEmpty(str))
@@ -113,15 +114,14 @@
cusDics.Add(item);
dicList.Remove(item);
}
-
foreach (var item in cusDics)
{
VueDictionaryDTO vueDictionaryDTO = GetVueDictionary(item.Trim());
if (vueDictionaryDTO != null)
{
+ vueDictionaryDTOs.Add(vueDictionaryDTO);
if (!_cacheService.Exists(item))
{
- vueDictionaryDTOs.Add(vueDictionaryDTO);
_cacheService.Add(item, vueDictionaryDTO.Serialize());
}
}
@@ -434,12 +434,12 @@
List<object> data = new List<object>();
{
- Type type = typeof(InTaskStatusEnum);
- List<int> enums = Enum.GetValues(typeof(InTaskStatusEnum)).Cast<int>().ToList();
+ Type type = typeof(TaskInStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(InTaskStatusEnum).GetField(((InTaskStatusEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -454,12 +454,12 @@
}
{
- Type type = typeof(OutTaskStatusEnum);
- List<int> enums = Enum.GetValues(typeof(OutTaskStatusEnum)).Cast<int>().ToList();
+ Type type = typeof(TaskOutStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(OutTaskStatusEnum).GetField(((OutTaskStatusEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -473,25 +473,25 @@
}
}
- //{
- // Type type = typeof(AGVTaskStatusEnum);
- // List<int> enums = Enum.GetValues(typeof(AGVTaskStatusEnum)).Cast<int>().ToList();
- // int index = 0;
- // foreach (var item in enums)
- // {
- // FieldInfo? fieldInfo = typeof(AGVTaskStatusEnum).GetField(((AGVTaskStatusEnum)item).ToString());
- // DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- // if (description != null)
- // {
- // data.Add(new { key = item.ToString(), value = description.Description });
- // }
- // else
- // {
- // data.Add(new { key = item.ToString(), value = item.ToString() });
- // }
- // index++;
- // }
- //}
+ {
+ Type type = typeof(WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum).GetField(((WIDESEA_Common.TaskEnum.TaskRelocationStatusEnum)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item.ToString(), value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item.ToString(), value = item.ToString() });
+ }
+ index++;
+ }
+ }
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
@@ -520,6 +520,30 @@
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
+ case "productStatusEmun":
+ {
+ List<object> data = new List<object>();
+ Type type = typeof(ProductStatusEmun);
+ List<int> enums = Enum.GetValues(typeof(ProductStatusEmun)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(ProductStatusEmun).GetField(((ProductStatusEmun)item).ToString());
+ DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
+ if (description != null)
+ {
+ data.Add(new { key = item, value = description.Description });
+ }
+ else
+ {
+ data.Add(new { key = item, value = item.ToString() });
+ }
+ index++;
+ }
+
+ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
+ }
+ break;
case "locationChangeType":
{
List<object> data = new List<object>();
--
Gitblit v1.9.3