From 987c3af80a89b5d3cf88b5bc0e8a8e0827dd60fd Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Thu, 28 Mar 2024 16:02:17 +0800
Subject: [PATCH 1/4] =?UTF-8?q?change-=E5=88=86=E5=9E=9B=E6=89=8B=E5=8A=A8?=
=?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Admin.Core.FrameWork.AssemblyInfo.cs | 4 -
...in.Core.FrameWork.AssemblyInfoInputs.cache | 4 -
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
...Admin.Core.RealTimeService.AssemblyInfo.cs | 4 -
...e.RealTimeService.AssemblyInfoInputs.cache | 4 -
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Service_New/ProductOffLineServices.cs | 10 +-
.../Business/InstoreBusiness.cs | 117 +++--
.../ViewModels/HandPalletizViewModel.cs | 167 ++++---
.../ViewModels/SelectTypeViewModel.cs | 7 +-
.../ViewModels/StatisticsPageViewModel.cs | 36 +-
.../Views/HandPalletizView.xaml | 199 ++++----
.../Views/HandPalletizView.xaml.cs | 424 +-----------------
Aucma.Core.Palletiz/Views/IndexPageView.xaml | 2 +-
.../Views/IndexPageView.xaml.cs | 6 +
Aucma.Core.Palletiz/Views/SelectType.xaml | 5 +-
Aucma.Core.Palletiz/Views/SetRangeWindow.xaml | 4 +
.../Views/StatisticsPageView.xaml | 18 +-
.../GeneratedInternalTypeHelper.g.i.cs | 2 +-
.../HwControlLib.AssemblyInfo.cs | 4 -
.../HwControlLib.AssemblyInfoInputs.cache | 4 -
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
22 files changed, 383 insertions(+), 650 deletions(-)
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
index f701ab70..7a3f49c3 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
index 36ef8d16..4390da2f 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
7d60a94dd38c10522cbfe4a021ccb6e9c5da0354
-=======
-fad90fcc3b6583900b74d5fd78b359c3c39898e3edc954e0d716ab6813336265
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
index d158aae3..a3871f56 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,5 +1,3 @@
is_global = true
build_property.RootNamespace = Admin.Core.FrameWork
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
index 4ce14623..d49abd81 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
index 33d14cee..d77b8cba 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
0868e6bde5b49a65a126b91d794e990427a11761
-=======
-c0f6b19d433d08bad3492dc6a6ba63c6191efddb5b9b20d48fe13f4288ac8673
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
index a5e40532..6a8a8ca9 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.RealTimeService
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\
diff --git a/Admin.Core.Service/Service_New/ProductOffLineServices.cs b/Admin.Core.Service/Service_New/ProductOffLineServices.cs
index cabcee38..8ef43b6b 100644
--- a/Admin.Core.Service/Service_New/ProductOffLineServices.cs
+++ b/Admin.Core.Service/Service_New/ProductOffLineServices.cs
@@ -106,7 +106,15 @@ namespace Admin.Core.Service
try
{
- productOffline = _rep.Query(x => x.ProductSncode == snCode).First();
+ if (snCode.Length < 20)
+ { //手动入库传的SN是产品型号,选取该型号最新一条记录
+ productOffline = _rep.FirstAsync(x => x.ProductCode == snCode).Result;
+ }
+ else
+ {
+ productOffline = _rep.Query(x => x.ProductSncode == snCode).First();
+ }
+
}
catch (Exception e)
{
diff --git a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
index 13eb3ed0..9ceea115 100644
--- a/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
+++ b/Aucma.Core.Palletiz/Business/InstoreBusiness.cs
@@ -1,4 +1,5 @@
-using Admin.Core.Common.Helper;
+using Admin.Core.Common;
+using Admin.Core.Common.Helper;
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
@@ -34,6 +35,11 @@ namespace Aucma.Core.Palletiz.Business
private readonly AppConfig _appConfig;
private AppConfig appConfig = new AppConfig();
+
+ public string storeCode = Appsettings.app("StoreInfo", "PalletizStoreCodeA");
+
+
+ private readonly IRecordInStoreServices? _recordInstoreServices = App.ServiceProvider.GetService<IRecordInStoreServices>();
#region 委托事件
/// <summary>
@@ -62,6 +68,7 @@ namespace Aucma.Core.Palletiz.Business
_appConfig = new AppConfig();
_spaceinfoService = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
_offlineService = App.ServiceProvider.GetService<IProductOffLineServices>();
+ HandPalletizViewModel.HandSendEvent += InStore;
// string AA = ExtractNumber("FD01_012");
}
@@ -109,9 +116,10 @@ namespace Aucma.Core.Palletiz.Business
/// 入库申请
/// </summary>
/// <param name="spaceArea">货道区域</param>
- /// <param name="asciiStr"></param>
+ /// <param name="asciiStr">20位是正常扫码传输的条码,手动入库传的是人工选择的成品型号</param>
private void InStore(string spaceArea, string asciiStr)
{
+ RecordInStore recordInstore = new RecordInStore();
String msg = string.Empty;
try
{
@@ -125,15 +133,7 @@ namespace Aucma.Core.Palletiz.Business
throw new ArgumentException($"入库申请处理异常:货道区域为空");
}
- //if (asciiStr.Contains(";") && asciiStr.Length == BarcodeRef.Length)
- //{
- // string[] splitStr = asciiStr.Split(";");
- // if (splitStr.Length > 1)
- // {
- // asciiStr = splitStr[1];
- // }
- //}
-
+
_offlineService.GetProductInfosBySnCode(asciiStr, out ProductOffline prodInfo);
@@ -143,20 +143,51 @@ namespace Aucma.Core.Palletiz.Business
}
RefreshProductInfoEvent?.Invoke(asciiStr,prodInfo.ProductModel,prodInfo.ProductOrderNo);
+
GetSpaceInfoByMaterialType(spaceArea, prodInfo, out BaseSpaceInfo laseSpaceinfo,
out BaseSpaceInfo spaceinfo);
+
+
+
bool result = false;
- SendInStoreTask(asciiStr,spaceinfo, ref result,Convert.ToInt32(prodInfo.ProductMasterModel),ref msg);
+ SendInStoreTask(asciiStr,spaceinfo, ref result,Convert.ToInt32(prodInfo.ProductMasterModel),ref msg,out int range);
- if (!result)
+ #region 添加入库记录
+
+ recordInstore.StoreCode = storeCode;
+ recordInstore.StoreArea = spaceArea;
+ recordInstore.SpaceCode = spaceinfo.SpaceCode;
+ recordInstore.MaterialType = spaceinfo.MaterialType;
+ recordInstore.MaterialCode = spaceinfo.MaterialType;
+ recordInstore.InStoreTime = DateTime.Now;
+ recordInstore.BarCodeCode = asciiStr;
+ recordInstore.MaterialName = prodInfo.ProductName;
+ recordInstore.InStoreAmount = range ;
+
+ recordInstore.IsFlag = 0;
+ recordInstore.CreatedTime = DateTime.Now;
+ if (asciiStr.Length < 20)
{
+ recordInstore.EntryPattern = 1;
+ }
+ else
+ {
+ recordInstore.EntryPattern = 0;
+ }
+
+ _ = _recordInstoreServices.AddAsync(recordInstore).Result;
+ #endregion
+
+ if (!result)
+ {
msg = msg + "放行失败";
RefreshMsgEvent?.Invoke(msg);
throw new ArgumentException($"入库申请处理异常:入库任务下发至PLC失败");
}
else
{
+
msg = msg + "放行成功";
RefreshMsgEvent?.Invoke(msg);
List<BaseSpaceInfo> spaceinfos = new List<BaseSpaceInfo>();
@@ -169,14 +200,18 @@ namespace Aucma.Core.Palletiz.Business
spaceinfos.Add(spaceinfo);
_spaceinfoService.UpdateSpaceInfo(spaceinfos);
}
+
}
catch (Exception e)
{
msg =$"入库逻辑处理异常:{e.Message}";
RefreshMsgEvent?.Invoke(msg);
}
+
}
+
+
/// <summary>
/// 通过物料型号获取货道信息
/// </summary>
@@ -292,8 +327,10 @@ namespace Aucma.Core.Palletiz.Business
/// <param name="spaceinfo"></param>
/// <param name="result"></param>
/// <exception cref="ArgumentException"></exception>
- private void SendInStoreTask(string asciiStr, BaseSpaceInfo spaceinfo, ref bool result,int prodWeight,ref string msg)
+ private void SendInStoreTask(string asciiStr, BaseSpaceInfo spaceinfo, ref bool result,int prodWeight,ref string msg,out int rangeResult)
{
+ int spinFlag = -1;
+ rangeResult = 0;
if (plcCon == null)
{
throw new ArgumentException($"下发入库任务至PLC逻辑异常:Plc连接为空");
@@ -304,23 +341,9 @@ namespace Aucma.Core.Palletiz.Business
bool isFlag = true;
int spaceCode = StringChange.ParseToInt(spaceinfo.SpaceCode);
- int spinFlag =JudgeRotation(spaceCode, prodWeight);
- //int spinFlag = 3; // 转180度发1，不转发3
- //if (prodWeight < 140)
- //{
- // if (spaceCode % 2 != 0) //偶数 转180°
- // {
- // spinFlag = 1; //4
- // }
- //}
- //else if (prodWeight >= 140)
- //{
- // if (spaceCode % 2 == 0) //偶数 转180°
- // {
- // spinFlag = 1; //4
- // }
- //}
- if(spinFlag == -1)
+ spinFlag =JudgeRotation(spaceCode, prodWeight, out int ranges);
+ rangeResult = ranges;
+ if (spinFlag == -1)
{
msg = $"成品码:{asciiStr},仓库区域:{spaceinfo.SpaceArea},匹配货道:{spaceinfo.SpaceCode}；旋转角度匹配失败，请先设置该型号旋转规则!";
RefreshMsgEvent?.Invoke(msg);
@@ -328,9 +351,14 @@ namespace Aucma.Core.Palletiz.Business
}
msg = $"成品码:{asciiStr},仓库区域:{spaceinfo.SpaceArea},匹配货道:{spaceinfo.SpaceCode}；旋转：{(spinFlag == 3 ? "0°" : "180°")};下发plc放行信号";
RefreshMsgEvent?.Invoke(msg);
-
+ DateTime startTime = DateTime.Now;
while (isFlag)
{
+ if((DateTime.Now - startTime).TotalSeconds > 15)
+ {
+ result = false;
+ return;
+ }
bool answerFlag = _plc.ReadBool("B1000");
if (answerFlag)
@@ -338,7 +366,8 @@ namespace Aucma.Core.Palletiz.Business
isFlag = false;
}
- Task.Delay(1000 * 2).Wait();
+
+ Task.Delay(500).Wait();
}
if (spaceinfo.SpaceArea == "A")
@@ -368,7 +397,7 @@ namespace Aucma.Core.Palletiz.Business
/// </summary>
/// <param name="prodWeight"></param>
/// <returns></returns>
- public int JudgeRotation(int spaceCode,int prodWeight)
+ public int JudgeRotation(int spaceCode,int prodWeight, out int ranges)
{
try
{
@@ -379,11 +408,13 @@ namespace Aucma.Core.Palletiz.Business
{
if (spaceCode % 2 == 0) // 偶数货道
{
- return range.EvenSpaceRange == 0 ? 3 : 1;
+ ranges = range.EvenSpaceRange;
+ return RangeToInt(range.EvenSpaceRange);
}
else
{
- return range.OddSpaceRange == 0 ? 3 : 1;
+ ranges = range.OddSpaceRange;
+ return RangeToInt(range.OddSpaceRange);
}
}
}
@@ -392,8 +423,22 @@ namespace Aucma.Core.Palletiz.Business
{
Console.WriteLine("JudgeRotation"+ex.Message);
}
+ ranges = 0;
return -1;
}
+ public int RangeToInt(int range)
+ {
+
+ int result = -1;
+ switch (range) {
+ case 0: result = 3; break;
+ case 90: result = 1; break;
+ case 180: result = 4; break;
+ case 270: result = 2; break;
+ }
+
+ return result;
+ }
/// <summary>
/// 提取货道号
/// </summary>
diff --git a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
index a5cea95f..62d302f7 100644
--- a/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/HandPalletizViewModel.cs
@@ -1,16 +1,19 @@
using Admin.Core.IService;
using Admin.Core.Model;
+using Admin.Core.Model.ViewModels;
using Admin.Core.Service;
using Aucma.Core.Palletiz.Business;
using Aucma.Core.Palletiz.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using Elasticsearch.Net.Specification.MachineLearningApi;
using log4net;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Linq;
-using System.Windows.Forms;
+using System.Windows;
namespace Aucma.Core.Palletiz.ViewModels
{
@@ -18,115 +21,143 @@ namespace Aucma.Core.Palletiz.ViewModels
{
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(HandPalletizViewModel));
public static StackInfoModel tempStackInfo = new StackInfoModel();
- private readonly IBaseSpaceInfoServices _baseSpaceInfoServices;
+ private readonly IBaseSpaceInfoServices _baseSpaceInfoServices;
private readonly IRecordInStoreServices _recordInstoreServices;
+ private readonly ICodeBindingRecordServices? _codeBindingRecordServices;
+
+ /// <summary>
+ /// 手动入库委托
+ /// </summary>
+ public delegate void HandSend(string spaceArea, string asciiStr);
+ public static event HandSend? HandSendEvent;
+
+
+
public HandPalletizViewModel()
{
- _baseSpaceInfoServices = App.ServiceProvider.GetService<IBaseSpaceInfoServices>();
- _recordInstoreServices = App.ServiceProvider.GetService<IRecordInStoreServices>();
- Range = 1;
- SpaceNo ="001";
- PromptInfo("请选择信息下传......", "White");
+
+ _codeBindingRecordServices = App.ServiceProvider.GetService<ICodeBindingRecordServices>();
+ init();
}
- #region 分垛信息下传
- /// <summary>
- /// 分垛信息下传
- /// </summary>
- [RelayCommand]
- public void Save()
+ public void init()
{
- try
+ List<ProductAllModel> list = _codeBindingRecordServices.GetAllProductModel();
+ if (list == null || list.Count == 0) return;
+ list = list.OrderBy(x => x.ProductMasterModel).ToList();
+ MaterialDataGrid.Clear();
+ Application.Current.Dispatcher.Invoke(() =>
{
-
- DialogResult cr = MessageBox.Show("是否确认下传分垛信息?", "系统提醒", MessageBoxButtons.OKCancel);
- if (cr != DialogResult.OK)
+ foreach (ProductAllModel info in list)
{
- return;
+ MaterialDataGrid.Add(info);
}
- PromptInfo("分垛信息下传中......", "White");
+ });
+ }
- int range = Range;
- int spaceNo =Convert.ToInt32(SpaceNo);
- if (spaceNo==0)
- {
- MessageBox.Show("请选择目的货道！","系统提醒");
- return;
- }
- string hh = "FD01_" + SpaceNo;
- Admin.Core.Model.BaseSpaceInfo spaceInfo = _baseSpaceInfoServices.FirstAsync(X => X.StoreCode.Contains("FD") && X.SpaceCode == "FD01_"+SpaceNo).Result;
- if (spaceInfo == null)
- {
- MessageBox.Show("货道未创建！", "系统提醒");
- return;
- }
-
- }
- catch (Exception ex)
+
+ #region 鼠标双击事件
+ /// <summary>
+ /// 鼠标双击事件
+ /// </summary>
+ /// <param name="obj"></param>
+ public void MouseClick(object obj)
+ {
+
+ var info = SelectedDataItem;
+ if (info != null)
{
- PromptInfo($"分垛信息下传失败:{ex.Message}", "Red");
+ ProductCode = info.ProductCode;
+ ProductModel = info.ProductModel;
}
}
- #endregion
- #region 提示信息
+ #endregion
- private string? msgTxt;
- public string? MsgTxt
+ #region 初始化下拉列表
+ /// <summary>
+ /// 初始化下拉列表
+ /// </summary>
+ private ProductAllModel selectedDataItem;
+ public ProductAllModel SelectedDataItem
{
- get => msgTxt;
- set => SetProperty(ref msgTxt, value);
+ get { return selectedDataItem; }
+ set => SetProperty(ref selectedDataItem, value);
+
}
#endregion
- #region 字体颜色
- private string? msgColor;
+ #region 分垛信息下传
+ /// <summary>
+ /// 分垛信息下传
+ /// </summary>
+ [RelayCommand]
+ public void Save(Window window)
+ {
+ if (string.IsNullOrEmpty(ProductCode))
+ {
+ MessageBox.Show("请先选择产品型号");
+ return;
+ }
+
+ HandSendEvent?.Invoke("A", productCode);
+ MessageBox.Show("手动入库成功");
+ window.Close();
+ // 入库
+
+ }
- public string? MsgColor
+
+ /// <summary>
+ /// 分垛信息下传
+ /// </summary>
+ [RelayCommand]
+ public void Cancel(Window window)
{
- get => msgColor;
- set => SetProperty(ref msgColor, value);
+ window.Close();
+
}
#endregion
- #region 提示信息
+
+ #region 初始化datagrid产品信息
/// <summary>
- /// 提示信息
+ /// 初始化物料信息
/// </summary>
- /// <param name="mesg">提示信息</param>
- /// <param name="color">提示信息颜色</param>
- public void PromptInfo(string mesg, string color)
+ private ObservableCollection<ProductAllModel> materialDataGrid = new ObservableCollection<ProductAllModel>();
+
+ public ObservableCollection<ProductAllModel> MaterialDataGrid
{
- System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
- {
- MsgTxt = mesg;
- MsgColor = color;
- }));
+ get { return materialDataGrid; }
+ set => SetProperty(ref materialDataGrid, value);
}
#endregion
- #region 目的货道
- private string spaceNo;
+ #region 选中条码
+ private string productCode;
- public string SpaceNo
+ public string ProductCode
{
- get => spaceNo;
- set => SetProperty(ref spaceNo, value);
+ get => productCode;
+ set => SetProperty(ref productCode, value);
}
#endregion
- #region 方向
- private int range;
- public int Range
+ #region 选中型号
+ private string productModel;
+
+ public string ProductModel
{
- get => range;
- set => SetProperty(ref range, value);
+ get => productModel;
+ set => SetProperty(ref productModel, value);
}
#endregion
+
+
}
}
diff --git a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs
index 86ba5760..d4257d3c 100644
--- a/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/SelectTypeViewModel.cs
@@ -53,6 +53,10 @@ namespace Aucma.Core.Palletiz.ViewModels
_codeBindingRecordServices = App.ServiceProvider.GetService<ICodeBindingRecordServices>();
_offlineService = App.ServiceProvider.GetService<IProductOffLineServices>();
//_baseMaterialInfoServices = App.ServiceProvider.GetService<IBaseMaterialInfoServices>();
+ if (space == null)
+ {
+ SpaceInfo = new BaseSpaceInfo();
+ }
SpaceInfo = space;
SearchCriteriaViewModel.RefreshConfigDelegateEvent += SaveSearchCriteria;
@@ -134,7 +138,7 @@ namespace Aucma.Core.Palletiz.ViewModels
{
MaterialDataGrid.Add(info);
}
- });
+ });
// 加载页面单选框和下拉框
if (space != null)
{
@@ -207,6 +211,7 @@ namespace Aucma.Core.Palletiz.ViewModels
if (info != null)
{
PlanInfo = info;
+
SpaceInfo.MaterialType = info.ProductCode;
SpaceInfo.typeNameA = info.ProductModel;
}
diff --git a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
index 67e177ae..03338044 100644
--- a/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
+++ b/Aucma.Core.Palletiz/ViewModels/StatisticsPageViewModel.cs
@@ -1,6 +1,11 @@
-using Aucma.Core.Palletiz.Models;
+using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Aucma.Core.Palletiz.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
+using Elasticsearch.Net;
+using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -14,20 +19,41 @@ namespace Aucma.Core.Palletiz.ViewModels
public partial class StatisticsPageViewModel : ObservableObject
{
public StatisticsPageViewModel() { LoadData(); }
-
+ private readonly IRecordInStoreServices? _recordInstoreServices = App.ServiceProvider.GetService<IRecordInStoreServices>();
List<MaterialComplateInfo> materialComplateInfos = new List<MaterialComplateInfo>();
+ public string storeCodeA = Appsettings.app("StoreInfo", "PalletizStoreCodeA");
+
+ public string storeCodeB = Appsettings.app("StoreInfo", "PalletizStoreCodeB");
#region 加载DataGrid数据
- private void LoadData()
+ private async void LoadData()
{
+ try
+ {
+
+ List<RecordInStore> list = await _recordInstoreServices.QueryAsync(x => x.StoreCode == storeCodeA || x.StoreCode == storeCodeB);
+ if (list != null && list.Count > 0)
+ {
+ foreach (RecordInStore record in list)
+ {
+ MaterialDataGrid.Add(record);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("" + ex.Message.ToString());
+
+ }
+
//MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123",MaterialCode = "8659452123", MaterialName = "SC-AUCMA-农夫山泉，SC", PlanAmount = 50, CompleteAmount = 10 });
}
#endregion
#region 初始化datagrid
- private ObservableCollection<MaterialComplateInfo> materialDataGrid = new ObservableCollection<MaterialComplateInfo>();
- public ObservableCollection<MaterialComplateInfo> MaterialDataGrid
+ private ObservableCollection<RecordInStore> materialDataGrid = new ObservableCollection<RecordInStore>();
+ public ObservableCollection<RecordInStore> MaterialDataGrid
{
get { return materialDataGrid; }
set
diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
index b8919b8e..6d65bd96 100644
--- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
+++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml
@@ -5,96 +5,143 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" WindowStartupLocation="CenterScreen" FontFamily="Microsoft YaHei"
- Title="手动分垛" Height="800" Width="800" Name="window" Background="White"
- ResizeMode="NoResize" Topmost="True">
-<Border Margin="5" Background="#1254AB" CornerRadius="10">
- <Border.Effect>
- <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
- </Border.Effect>
+ Title="手动分垛" Height="800" Width="1300" Name="window" Background="White"
+ ResizeMode="NoResize">
- <Grid>
- <Grid.ColumnDefinitions>
+ <Window.Resources>
+ <Style TargetType="{x:Type Slider}">
+ <Style.Resources>
+ <!-- 重写重复触发按钮的样式 -->
+ <Style x:Key="RepeatButtonStyle" TargetType="{x:Type RepeatButton}">
+ <Setter Property="Focusable" Value="false" />
+ <Setter Property="IsTabStop" Value="false" />
+ <Setter Property="Padding" Value="0" />
+ <Setter Property="Width" Value="30" />
+ </Style>
+ </Style.Resources>
+ <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+ <Setter Property="SmallChange" Value="1" />
+ </Style>
+ <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+ <!--<Setter Property="Height" Value="40"/>-->
+ <Setter Property="FontSize" Value="16"/>
+ <Setter Property="VerticalAlignment" Value="Stretch" />
+ <Setter Property="HorizontalAlignment" Value="Left" />
+ </Style>
+ <Style TargetType="DataGrid">
+ <!--网格线颜色-->
+ <Setter Property="CanUserResizeColumns" Value="false"/>
+ <Setter Property="Background" Value="#1152AC" />
+ <Setter Property="BorderBrush" Value="#4285DE" />
+ <Setter Property="Foreground" Value="White"/>
+ <Setter Property="HorizontalGridLinesBrush">
+ <Setter.Value>
+ <SolidColorBrush Color="#4285DE"/>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="VerticalGridLinesBrush">
+ <Setter.Value>
+ <SolidColorBrush Color="#1152AC"/>
+ </Setter.Value>
+ </Setter>
+ </Style>
+ <!--列头标题栏样式-->
+ <Style TargetType="DataGridColumnHeader">
+ <!--<Setter Property="HorizontalContentAlignment" Value="Center"/>
+ <Setter Property="VerticalContentAlignment" Value="Center"/>-->
+ <!--<Setter Property="Background" Value="#dddddd"/>
+ <Setter Property="Foreground" Value="Black"/>-->
+ <!--<Setter Property="BorderThickness" Value="1" />-->
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
+ <Setter Property="BorderBrush" Value="#dddddd" />
+ <Setter Property="Height" Value="48"/>
+ <Setter Property="FontSize" Value="18"/>
+ <Setter Property="Background" Value="#4285DE"/>
+ <Setter Property="Foreground" Value="White"/>
+ </Style>
+
+ <!--单元格样式-->
+ <Style TargetType="DataGridCell">
+ <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+ <Setter Property="BorderThickness" Value="0" />
+ <Setter Property="BorderBrush" Value="Gray" />
+ <Setter Property="Height" Value="40"/>
+ <Setter Property="FontSize" Value="12"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type DataGridCell}">
+ <Grid Background="{TemplateBinding Background}" >
+ <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ <Style.Triggers>
+ <Trigger Property="IsSelected" Value="True">
+ <Setter Property="Background" Value="#4285DE"/>
+ <Setter Property="Foreground" Value="White"/>
+ </Trigger>
+ </Style.Triggers>
+
+ </Style>
+ </Window.Resources>
+ <Border Margin="5" Background="#1254AB" CornerRadius="10">
+ <Border.Effect>
+ <DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
+ </Border.Effect>
+
+ <Grid>
+ <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
- <Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="5,5">
- <Border.Effect>
- <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
- </Border.Effect>
+ <Border Grid.Column="0" BorderBrush="#1254AB" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="5,5">
+ <Border.Effect>
+ <DropShadowEffect Color="#1254AB" Direction="270" BlurRadius="10" ShadowDepth="5" Opacity="0.5"/>
+ </Border.Effect>
- <Grid>
+ <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
- <RowDefinition Height="*"/>
- <RowDefinition Height="2*"/>
- <RowDefinition Height="*"/>
- <RowDefinition Height="*"/>
+ <RowDefinition Height="6*"/>
+
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" >
<TextBlock Text="手动分垛" FontSize="25" Foreground="#FFFFFF" Margin="10,0,0,0"/>
</StackPanel>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0" Visibility="Collapsed">
- <TextBlock Text="成品码:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- <TextBox x:Name="txtBarCode" FontSize="20" Foreground="white" Height="50" Width="400" Style="{x:Null}" Margin="20 0" />
- </StackPanel>
- <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
- <TextBlock Text="所属仓库:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- <Button x:Name="btn_A" Content="A 库" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Cursor="Hand" Click="btn_A_Click" />
- <Button x:Name="btn_B" Content="B 库" FontSize="20" IsEnabled="False" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_B_Click"/>
- </StackPanel>
- <WrapPanel Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
- <WrapPanel Height="50" Orientation="Horizontal" VerticalAlignment="Center" Margin="0 10 0 0">
- <TextBlock Text="目的货道:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- </WrapPanel>
- <TextBlock x:Name="btn_spaceTemp" Text="{Binding SpaceNo,Mode=TwoWay}" Visibility="Collapsed" />
- <WrapPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="5 0 0 0">
- <Button x:Name="btn_space1" Content="1" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="0 0 10 0" Click="btn_space1_Click"/>
- <Button x:Name="btn_space2" Content="2" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space2_Click"/>
- <Button x:Name="btn_space3" Content="3" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space3_Click"/>
- <Button x:Name="btn_space4" Content="4" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space4_Click"/>
- <Button x:Name="btn_space5" Content="5" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space5_Click"/>
- <Button x:Name="btn_space6" Content="6" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space6_Click"/>
- <Button x:Name="btn_space7" Content="7" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space7_Click"/>
- <Button x:Name="btn_space8" Content="8" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space8_Click"/>
+ <Border Grid.Row="1" BorderThickness="4" >
+ <DataGrid ItemsSource="{Binding MaterialDataGrid}" Height="{Binding Path=ActualHeight, ElementName=HeightPanel}"
+ HorizontalAlignment="Left" VerticalAlignment="Top" AlternationCount="2" RowHeaderWidth="0"
+ ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single"
+ SelectedItem="{Binding SelectedDataItem}" SelectionChanged="DataGrid_SelectionChanged" >
+ <DataGrid.Columns>
+ <!--<DataGridTextColumn Binding="{Binding OrderCode}" Width="*" Header="订单编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
+ <DataGridTextColumn Binding="{Binding ProductCode}" Width="3*" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding ProductName}" Width="5*" Header="产品名称" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding ProductModel}" Width="3*" Header="产品型号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding ProductMasterModel}" Width="*" Header="产品大类" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ </DataGrid.Columns>
+ </DataGrid>
- </WrapPanel>
- <WrapPanel Orientation="Horizontal" VerticalAlignment="Center" Height="50" Margin="140 5 0 0">
+ </Border>
+ <Grid Grid.Row="2">
+ <Label Content="产品编码:" Foreground="White" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="108,0,0,0" />
+ <TextBox HorizontalAlignment="Left" Text="{Binding ProductCode}" Foreground="White" FontSize="22" Margin="230,38,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="266"/>
+
+ <Label Content="产品型号:" Foreground="White" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="530,0,0,0" />
+ <TextBox HorizontalAlignment="Left" Text="{Binding ProductModel}" Foreground="White" FontSize="22" Margin="660,0,0,0" TextWrapping="Wrap" VerticalAlignment="Center" Width="303"/>
+
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 10 0">
+ <Button Content="确 认" FontSize="20" Command="{Binding SaveCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
+ <Button Content="取 消" FontSize="20" Command="{Binding CancelCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" />
+ </StackPanel>
+
+ </Grid >
- <Button x:Name="btn_space9" Content="9" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space9_Click"/>
- <Button x:Name="btn_space10" Content="10" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space10_Click"/>
- <Button x:Name="btn_space11" Content="11" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space11_Click"/>
- <Button x:Name="btn_space12" Content="12" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space12_Click"/>
- <Button x:Name="btn_space13" Content="13" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space13_Click"/>
- <Button x:Name="btn_space14" Content="14" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space14_Click"/>
- <!--<Button x:Name="btn_space15" Content="15" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space15_Click"/>
- <Button x:Name="btn_space16" Content="16" FontSize="15" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="50" RenderTransformOrigin="0.5,0.5" Margin="10 0" Click="btn_space16_Click"/>-->
- </WrapPanel>
- </WrapPanel>
- <StackPanel Grid.Row="3" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
- <TextBlock x:Name="btn_RangeTemp" Text="{Binding Range,Mode=TwoWay}" />
- <TextBlock Text="转向方向:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- <Button x:Name="Forward" Content="正向90" FontSize="20" Background="Lime" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_left_Click" />
- <Button x:Name="Reverse" Content="逆向90" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0,0.5" Margin="20 0 20 0" Click="btn_right_Click"/>
- <Button x:Name="Reverse180" Content="逆向180" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="115" RenderTransformOrigin="0,0.5" Margin="20 0 20 0" Click="btn_right180_Click"/>
- <Button x:Name="Unchanged" Content="不 转" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0,0.5" Click="btn_unchanged_Click"/>
- </StackPanel>
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0" Visibility="Collapsed">
- <TextBlock Text="转向角度:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- <Button x:Name="btn_range90" Content="90°" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Click="btn_range90_Click" />
- <Button x:Name="btn_range0" Content="0°" FontSize="20" Background="DarkCyan" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="103" RenderTransformOrigin="0.5,0.5" Margin="20 0" Click="btn_range0_Click"/>
- </StackPanel>
- <StackPanel Grid.Row="4" Orientation="Horizontal" VerticalAlignment="Center" Margin="50,0,0,0">
- <TextBlock Text="提示信息:" FontSize="20" Foreground="#FFFFFF" Margin="10,0,50,0" VerticalAlignment="Center" />
- <TextBlock Text="{Binding MsgTxt}" Foreground="{Binding MsgColor,Mode=TwoWay}" FontWeight="Bold" FontSize="20" Width="400" Height="35"/>
- </StackPanel>
- <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 10 0">
- <Button Content="保 存" FontSize="20" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="0,0,10,0" Height="50" Width="100" />
- <Button Content="取 消" FontSize="20" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" Background="#FF9900" Foreground="white" Margin="10,0,0,0" Height="50" BorderBrush="#FF9900" Width="100" Click="Button_Click_1" />
- </StackPanel>
</Grid>
- </Border>
+ </Border>
- </Grid>
-</Border>
+ </Grid>
+ </Border>
</Window>
diff --git a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml.cs b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml.cs
index 5ccbf815..e7f35d31 100644
--- a/Aucma.Core.Palletiz/Views/HandPalletizView.xaml.cs
+++ b/Aucma.Core.Palletiz/Views/HandPalletizView.xaml.cs
@@ -21,432 +21,22 @@ namespace Aucma.Core.Palletiz.Views
/// </summary>
public partial class HandPalletizView : Window
{
-
- private string store = "A";
- private int space = 1;
- /// <summary>
- /// 转向 1：正向 2:反向 3:不变
- /// </summary>
- private int spaceDirection = 1;
- /// <summary>
- /// 转向角度 1 90
- /// </summary>
- private int range = 1;
+ HandPalletizViewModel viewModel = new HandPalletizViewModel();
-
public HandPalletizView()
+
{
+
InitializeComponent();
- this.DataContext = new HandPalletizViewModel();
+ this.DataContext = viewModel;
}
- #region 所属仓库选择
- private void btn_A_Click(object sender, RoutedEventArgs e)
+ private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
- this.btn_A.Background = Brushes.Lime;
- this.btn_B.Background = Brushes.DarkCyan;
- store = "A";
- }
-
- private void btn_B_Click(object sender, RoutedEventArgs e)
- {
- this.btn_A.Background = Brushes.DarkCyan;
- this.btn_B.Background = Brushes.Lime;
- store = "B";
- }
- #endregion
-
- #region 目的货道选择
- private void btn_space1_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.Lime;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "001";
- }
-
- private void btn_space2_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.Lime;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "002";
- }
-
- private void btn_space3_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.Lime;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "003";
- }
-
- private void btn_space4_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.Lime;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "004";
- }
-
- private void btn_space5_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.Lime;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "005";
- }
-
- private void btn_space6_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.Lime;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "006";
+
+ viewModel.MouseClick(sender);
}
- private void btn_space7_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.Lime;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "007";
- }
- private void btn_space8_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.Lime;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "008";
- }
- private void btn_space9_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.Lime;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "009";
- }
- private void btn_space10_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.Lime;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "010";
- }
- private void btn_space11_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.Lime;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "011";
- }
- private void btn_space12_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.Lime;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "012";
- }
- private void btn_space13_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.Lime;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "013";
- }
- private void btn_space14_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.Lime;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "014";
- }
- private void btn_space15_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.Lime;
- //btn_space16.Background = Brushes.DarkCyan;
- this.btn_spaceTemp.Text = "015";
- }
- private void btn_space16_Click(object sender, RoutedEventArgs e)
- {
- btn_space1.Background = Brushes.DarkCyan;
- btn_space2.Background = Brushes.DarkCyan;
- btn_space3.Background = Brushes.DarkCyan;
- btn_space4.Background = Brushes.DarkCyan;
- btn_space5.Background = Brushes.DarkCyan;
- btn_space6.Background = Brushes.DarkCyan;
- btn_space7.Background = Brushes.DarkCyan;
- btn_space8.Background = Brushes.DarkCyan;
- btn_space9.Background = Brushes.DarkCyan;
- btn_space10.Background = Brushes.DarkCyan;
- btn_space11.Background = Brushes.DarkCyan;
- btn_space12.Background = Brushes.DarkCyan;
- btn_space13.Background = Brushes.DarkCyan;
- btn_space14.Background = Brushes.DarkCyan;
- //btn_space15.Background = Brushes.DarkCyan;
- //btn_space16.Background = Brushes.Lime;
- this.btn_spaceTemp.Text = "016";
- }
- #endregion
-
- #region 转向
- private void btn_left_Click(object sender, RoutedEventArgs e)
- {
- Forward.Background = Brushes.Lime;
- Reverse.Background = Brushes.DarkCyan;
- Unchanged.Background = Brushes.DarkCyan;
- Reverse180.Background = Brushes.DarkCyan;
- this.btn_RangeTemp.Text = "1";
- }
-
- private void btn_right_Click(object sender, RoutedEventArgs e)
- {
- Forward.Background = Brushes.DarkCyan;
- Reverse.Background = Brushes.Lime;
- Unchanged.Background = Brushes.DarkCyan;
- Reverse180.Background = Brushes.DarkCyan;
- this.btn_RangeTemp.Text = "2";
- }
- private void btn_right180_Click(object sender, RoutedEventArgs e)
- {
- Forward.Background = Brushes.DarkCyan;
- Reverse.Background = Brushes.DarkCyan;
- Reverse180.Background = Brushes.Lime;
- Unchanged.Background = Brushes.DarkCyan;
- this.btn_RangeTemp.Text = "4";
- }
- private void btn_unchanged_Click(object sender, RoutedEventArgs e)
- {
- Forward.Background = Brushes.DarkCyan;
- Reverse.Background = Brushes.DarkCyan;
- Unchanged.Background = Brushes.Lime;
- this.btn_RangeTemp.Text = "3";
- }
-
-
- #endregion
-
- #region 转向角度设置Brushes.DarkCyan
- private void btn_range90_Click(object sender, RoutedEventArgs e)
- {
- btn_range90.Background = Brushes.Lime;
- btn_range0.Background = Brushes.DarkCyan;
- //btn_range270.Background = Brushes.DarkCyan;
- range = 90;
- }
-
- private void btn_range0_Click(object sender, RoutedEventArgs e)
- {
- btn_range90.Background = Brushes.DarkCyan;
- btn_range0.Background = Brushes.Lime;
- // btn_range270.Background = Brushes.DarkCyan;
- range = 0;
- }
-
- #endregion
-
-
-
- private void Button_Click_1(object sender, RoutedEventArgs e)
- {
- this.window.Close();
- }
}
}
diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml b/Aucma.Core.Palletiz/Views/IndexPageView.xaml
index 31c67802..dcdfdd2e 100644
--- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml
+++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml
@@ -212,7 +212,7 @@
</Border>
</Grid>-->
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal" Margin="10,0,0,0">
- <Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0"/>
+ <Button Content="异常入库" FontSize="18" x:Name="Minimized" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#FF9900" BorderBrush="#FF9900" Margin="0,0,10,0" Click="Minimized_Click"/>
<Button Content="转向设置" FontSize="18" x:Name="Exit" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="#5283D7" BorderBrush="#5283D7" Margin="0,0,10,0" Click="Exit_Click"/>
<Button Content="{Binding InStoreAmount}" FontSize="18" CommandParameter="{Binding Name,ElementName=Exit}" Style="{StaticResource BUTTON_AGREE}" Width="150" Height="40" Background="Transparent" Margin="0,0,10,0"/>
</StackPanel>
diff --git a/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs b/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs
index 5045fd6e..8b88d1b1 100644
--- a/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs
+++ b/Aucma.Core.Palletiz/Views/IndexPageView.xaml.cs
@@ -33,5 +33,11 @@ namespace Aucma.Core.Palletiz.Views
SetRangeWindow window = new SetRangeWindow();
window.ShowDialog();
}
+
+ private void Minimized_Click(object sender, RoutedEventArgs e)
+ {
+ HandPalletizView window = new HandPalletizView();
+ window.ShowDialog();
+ }
}
}
diff --git a/Aucma.Core.Palletiz/Views/SelectType.xaml b/Aucma.Core.Palletiz/Views/SelectType.xaml
index b11a2605..b9a233a3 100644
--- a/Aucma.Core.Palletiz/Views/SelectType.xaml
+++ b/Aucma.Core.Palletiz/Views/SelectType.xaml
@@ -234,8 +234,9 @@
</ComboBox>
</StackPanel>-->
<StackPanel Grid.Row="6" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Button Content="清除型号" FontSize="23" Command="{Binding DeleteCommand}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900" Margin="0,0,10,0" VerticalAlignment="Center" Height="50" Width="130" />
- <Button Content="保 存" FontSize="23" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Margin="20,0,10,0" Height="50" Width="130" />
+ <Button Content="手动入库" FontSize="23" Command="{Binding HandCommand}" Background="#FF9900" Foreground="white" BorderBrush="#FF9900" Margin="0,0,10,0" VerticalAlignment="Center" Height="50" Width="130" Visibility="Collapsed"/>
+ <Button Content="清除型号" FontSize="23" Command="{Binding DeleteCommand}" Background="#FF0033" BorderBrush="#FF0033" Margin="0,0,10,0" VerticalAlignment="Center" Height="50" Width="130" />
+ <Button Content="保 存" FontSize="23" Command="{Binding SaveCommand}" Background="#FF36B5C1" BorderBrush="#FF36B5C1" Foreground="white" Height="50" Width="130" />
</StackPanel>
</Grid>
</Border>
diff --git a/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml
index 69ac1aa0..17bc55f7 100644
--- a/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml
+++ b/Aucma.Core.Palletiz/Views/SetRangeWindow.xaml
@@ -83,12 +83,16 @@
<Label Foreground="White" FontSize="20" Content="奇数货道旋转角度" HorizontalAlignment="Left" Margin="725,0,0,0" VerticalAlignment="Center"/>
<ComboBox x:Name="OddComboBox" SelectedItem="{Binding SelectedOddNumber, Mode=TwoWay, Converter={StaticResource StringToIntConverter}}" HorizontalAlignment="Left" Margin="915,34,0,0" VerticalAlignment="Top" Width="120" FontSize="25" Foreground="White">
<ComboBoxItem Content="0" Foreground="Blue"/>
+ <ComboBoxItem Content="90" Foreground="Blue"/>
<ComboBoxItem Content="180" Foreground="Blue" />
+ <ComboBoxItem Content="270" Foreground="Blue"/>
</ComboBox>
<Label Foreground="White" FontSize="20" Content="偶数货道旋转角度" HorizontalAlignment="Left" Margin="1089,0,0,0" VerticalAlignment="Center"/>
<ComboBox x:Name="EvenComboBox" SelectedItem="{Binding SelectedEvenNumber, Mode=TwoWay, Converter={StaticResource StringToIntConverter}}" HorizontalAlignment="Left" Margin="1298,0,0,0" Width="120" FontSize="25" Foreground="White">
<ComboBoxItem Content="0" Foreground="Blue"/>
+ <ComboBoxItem Content="90" Foreground="Blue"/>
<ComboBoxItem Content="180" Foreground="Blue" />
+ <ComboBoxItem Content="270" Foreground="Blue"/>
</ComboBox>
diff --git a/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml b/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
index d1fa5e82..803ce203 100644
--- a/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
+++ b/Aucma.Core.Palletiz/Views/StatisticsPageView.xaml
@@ -7,8 +7,8 @@
xmlns:local="clr-namespace:Aucma.Core.Palletiz.Views"
xmlns:cvt="clr-namespace:Aucma.Core.Palletiz.ConvertTo"
mc:Ignorable="d" FontFamily="Microsoft YaHei"
- d:DesignHeight="450"
- d:DesignWidth="800">
+ d:DesignHeight="1000"
+ d:DesignWidth="1800">
<UserControl.Resources>
<cvt:MultiBindingConverter x:Key="QueryConvert"></cvt:MultiBindingConverter>
@@ -106,19 +106,19 @@
</Button>-->
</WrapPanel>
<UniformGrid Grid.Row="1">
- <DataGrid Grid.Row="0" ItemsSource="{Binding MaterialDataGrid}"
+ <DataGrid ItemsSource="{Binding MaterialDataGrid}"
ColumnHeaderHeight="45" FontSize="18"
RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0"
GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden"
ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
Foreground="White" >
<DataGrid.Columns>
- <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="0.5*"/>
- <DataGridTextColumn Binding="{Binding ProductPlanCode}" Header="计划编号" Width="1*" />
- <DataGridTextColumn Binding="{Binding MaterialCode}" Header="物料编号" Width="1*" />
- <DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="3*" />
- <DataGridTextColumn Binding="{Binding PlanAmount}" Header="计划数量" Width="*" />
- <DataGridTextColumn Binding="{Binding CompleteAmount}" Header="完成数量" Width="*" />
+ <DataGridTextColumn Binding="{Binding No}" Header="序号" Width="1*" Visibility="Collapsed"/>
+ <DataGridTextColumn Binding="{Binding BarCodeCode}" Header="成品条码" Width="3*" />
+ <DataGridTextColumn Binding="{Binding MaterialType}" Header="成品型号" Width="3*" />
+ <DataGridTextColumn Binding="{Binding StoreArea}" Header="区域" Width="1*" />
+ <DataGridTextColumn Binding="{Binding InStoreAmount}" Header="旋转角度" Width="*" />
+ <DataGridTextColumn Binding="{Binding InStoreTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="入库时间" Width="2*" />
</DataGrid.Columns>
</DataGrid>
diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
index daa86c24..f1700855 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.3.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.9.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
index 3571cec7..83802a68 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
index c2705992..36364a8e 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
42cf648ef8280b16e9d1d1de3415777f5d872126
-=======
-1ed05d3a7db966fb4671d718249d9d84519ef6c2db9dded8bc345c3230d77c75
->>>>>>> 2448b63167118db0eb16b42f2000c5acb80d1769
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
index ff214ef2..5e32ba4e 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,6 +8,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\
-build_property.EnableComHosting =
-build_property.EnableGeneratedComInterfaceComImportInterop =
+build_property.ProjectDir = E:\c#\AUCMA\new\HwControlLib\
From 8ac6266f5a5b3389d62c713916526556c063db9b Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 28 Mar 2024 19:03:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?change=20-=20=E6=8A=A5=E8=AD=A6=E3=80=81?=
=?UTF-8?q?=E7=94=A8=E7=94=B5=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.idea.Admin.Core/.idea/workspace.xml | 49 +++--
.../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +-
.../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +-
.../net6.0/Admin.Core.Common.AssemblyInfo.cs | 2 +-
...Admin.Core.Common.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.EventBus.AssemblyInfo.cs | 2 +-
...min.Core.EventBus.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.Extensions.AssemblyInfo.cs | 2 +-
...n.Core.Extensions.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.FrameWork.AssemblyInfo.cs | 2 +-
...in.Core.FrameWork.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.IRepository.AssemblyInfo.cs | 2 +-
....Core.IRepository.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.IService.AssemblyInfo.cs | 2 +-
...min.Core.IService.AssemblyInfoInputs.cache | 2 +-
.../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +-
.../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +-
...Admin.Core.RealTimeService.AssemblyInfo.cs | 2 +-
...e.RealTimeService.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.Repository.AssemblyInfo.cs | 2 +-
...n.Core.Repository.AssemblyInfoInputs.cache | 2 +-
.../Admin.Core.Serilog.Es.AssemblyInfo.cs | 2 +-
...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 2 +-
.../net6.0/Admin.Core.Service.AssemblyInfo.cs | 2 +-
...dmin.Core.Service.AssemblyInfoInputs.cache | 2 +-
.../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 2 +-
.../Admin.Core.Tasks.AssemblyInfoInputs.cache | 2 +-
.../DataCollectorFactory.cs | 36 +++-
.../DataCollectorSetup.cs | 36 +++-
.../Factory/BeforeFoamFactory.cs | 38 ++++
.../Factory/BoxFoamFactory.cs | 10 +-
.../Factory/FoamBackFactory.cs | 186 ++++++++++++++++++
.../Factory/LinerPreassembleFactory.cs | 167 ++++++++++++++++
.../Factory/LinerStoreFactory.cs | 67 ++++++-
.../Factory/PalletizFactory.cs | 100 +++++-----
.../Factory/ShellPreassembleFactory.cs | 166 ++++++++++++++++
.../Factory/ShellStoreFactory.cs | 89 +++++++--
Aucma.Core.HwPLc/IPlc.cs | 3 +
Aucma.Core.HwPLc/Impl/MelsecPlc.cs | 29 +++
Aucma.Core.HwPLc/Impl/SiemensPlc.cs | 10 +-
.../Aucma.Core.Palletiz.csproj | 1 +
Aucma.Core.Palletiz/Startup.cs | 3 +
Aucma.Core.Palletiz/appsettings.json | 48 +++++
.../HwControlLib.AssemblyInfo.cs | 2 +-
.../HwControlLib.AssemblyInfoInputs.cache | 2 +-
.../HwControlLib_MarkupCompile.i.cache | 2 +-
46 files changed, 958 insertions(+), 138 deletions(-)
create mode 100644 Aucma.Core.DataCollector/Factory/BeforeFoamFactory.cs
create mode 100644 Aucma.Core.DataCollector/Factory/FoamBackFactory.cs
create mode 100644 Aucma.Core.DataCollector/Factory/LinerPreassembleFactory.cs
create mode 100644 Aucma.Core.DataCollector/Factory/ShellPreassembleFactory.cs
diff --git a/.idea/.idea.Admin.Core/.idea/workspace.xml b/.idea/.idea.Admin.Core/.idea/workspace.xml
index f1fdd6d5..b914ebfb 100644
--- a/.idea/.idea.Admin.Core/.idea/workspace.xml
+++ b/.idea/.idea.Admin.Core/.idea/workspace.xml
@@ -30,7 +30,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="25777d12-9e24-4cff-9537-87192ef77697" name="Changes" comment="">
- <change beforePath="$PROJECT_DIR$/Admin.Core.Api/Admin.Core.Model.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Api/Admin.Core.Model.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/.idea.Admin.Core/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Admin.Core/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs" afterDir="false" />
@@ -61,12 +61,8 @@
<change beforePath="$PROJECT_DIR$/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Admin.Core.sln" beforeDir="false" afterPath="$PROJECT_DIR$/Admin.Core.sln" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/Aucma.Core.Palletiz/Business/InstoreBusiness.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Aucma.Core.Palletiz/Business/InstoreBusiness.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HwControlLib/obj/HwControlLib.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/HwControlLib.csproj.nuget.g.props" afterDir="false" />
<change beforePath="$PROJECT_DIR$/HwControlLib/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/HwControlLib/obj/project.assets.json" afterDir="false" />
@@ -83,35 +79,35 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
- <component name="ProjectColorInfo"><![CDATA[{
- "customColor": "",
- "associatedIndex": 3
-}]]></component>
+ <component name="ProjectColorInfo">{
+ "customColor": "",
+ "associatedIndex": 3
+}</component>
<component name="ProjectId" id="2eCwctxkj4nLTki6aV6rdmatR3Y" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "git-widget-placeholder": "main",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "vue.rearranger.settings.migration": "true"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "main",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\Lenovo\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
- "C:\\Users\\Lenovo\\AppData\\Local\\Symbols\\src"
+ "keyToStringList": {
+ "rider.external.source.directories": [
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\DecompilerCache",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\JetBrains\\Rider2023.3\\resharper-host\\SourcesCache",
+ "C:\\Users\\Lenovo\\AppData\\Local\\Symbols\\src"
]
}
-}]]></component>
+}</component>
<component name="RunManager" selected=".NET Project.Admin.Core.RealTimeService">
<configuration name="Admin.Core.Api: FolderProfile" type="DotNetMsBuildPublish" factoryName="Publish to IIS">
<riderPublish configuration="Release" platform="Any CPU" publish_profile="FolderProfile.pubxml" pubxml_path="$PROJECT_DIR$/Admin.Core.Api/Properties/PublishProfiles/FolderProfile.pubxml" uuid_high="5553381759874844827" uuid_low="-8204134441798954054" />
@@ -493,6 +489,7 @@
<option name="presentableId" value="Default" />
<updated>1711421950913</updated>
<workItem from="1711421956285" duration="332000" />
+ <workItem from="1711506603549" duration="92000" />
</task>
<servers />
</component>
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
index f8b57d1a..57e5b0bb 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
@@ -15,7 +15,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
index d7959ca7..70ae7a7e 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
@@ -1 +1 @@
-5f4e2ee8fc211df14a848b4897149bd6d0e0d55a0665d4227786650c6ae357f5
+995a0e183e4d26b7714e590bc674bf1598e73e09f8aeb5aab829b84e2ab593e0
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
index ee59d74a..b621775c 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
index 7ddf5f94..d795aada 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
@@ -1 +1 @@
-2243688838db6018a22c7440847ec442cd6029eb96e6f1b2bd7ea732d532ed79
+46c74bdf2480bff185fcd121ec7cb38d60038ffc9c6d12d74337261a568828ce
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
index c38f40d8..e35da4eb 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
index 4a80ac50..1787b07c 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
@@ -1 +1 @@
-edb1816a98be2ad63e8a0b77823356dd5a831d47af0a32ba396b318ef10d8d46
+4ea047f08316e91bed4a7bfa28790e4a2cec06376c3d4ccc8ac46cad74f36cfa
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
index ee278a8d..e4db5522 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
index 9ccf2ae0..a057cf91 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
@@ -1 +1 @@
-6a2a15f37be19613480d30f63088b9d1080fb956cbef0ad04ecf6bb66f52fd82
+4beb33250e0f70d033fcab9bba694ecf77320b831f3ce847878c93862915af6e
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
index e302cfac..a018dc9c 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
index 09a6ee6f..0dea309b 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
@@ -1 +1 @@
-fad90fcc3b6583900b74d5fd78b359c3c39898e3edc954e0d716ab6813336265
+006c85e2f6346d3768a5436c2a837ef449e68c0a41706c4a3d7aa5b46d778a99
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
index df484d87..4d9bfa35 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
index c7852b9b..4c3902cc 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
@@ -1 +1 @@
-f1a863a9c1c93bbc362f4256691bb86b79622140ea78a6a12cd325472bfa41f0
+45addee8850bceee5bd10a497cf8557a22350b61fccf5d7e68772e96ff247392
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
index 7cf9a218..c432a8bd 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
index aa4f8759..00111e8a 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
@@ -1 +1 @@
-9ae7f282c9d6d9135b6dcf4a9f310054b6e115fb9214558714daed08f2f8f18d
+359bc4838b66bd6acc960b7940d460416823313184a69faaa379966f1a45a03b
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
index e0d743c1..3605822a 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
index 5bf831d3..61f5747d 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
@@ -1 +1 @@
-beeccfd405f9933ceee30ac8b1790c984f300285ec69f019c89e8ea4ff50c97b
+8a7dd466dc08777c934806f3b9fbd0391e7ac998f9b3fc1f23423e763c7f3959
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
index 2eba9717..fd710e45 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
index 2ef81e1f..81b2ea09 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
@@ -1 +1 @@
-c0f6b19d433d08bad3492dc6a6ba63c6191efddb5b9b20d48fe13f4288ac8673
+f6b00de97539aff6e53cbd3c6252ed46f038e0c2f5d2f1f9c61607b34c899092
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
index 23d178d4..b977d248 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
index c5dad248..9c04c1d5 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
@@ -1 +1 @@
-5c05fe765b469a2fe006672fde747aae73afcf50dd4e37617561877e57644fea
+664c217c277ce07ac70e2d81733564bcbc70269dbeb5740dbdfb8d1a570d0786
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
index 4dcc3430..b334aa40 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
index 028946c8..68d4f2f6 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
@@ -1 +1 @@
-22f95f2142187d0f7ef8d83a364e9cdc519bed1ed3aef683a6f28f512514c4e5
+f59d1862e375e8e54ad9e5218f27b988b8b239823671ce855cdb7fad9304ea07
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
index dda21d21..16ba852e 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
index a66f11e5..bb579a33 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ba3d808e51bfe9172f4ab56a002d8abe8f10368e41dbec2e9421600e70156b85
+1701bfa6f5611d7194cf44ff09851cfb25f4fc63abb93fcc29e110dba6ecee15
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
index c0d54c95..68fe1837 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
index 92318ec6..e51ba1b4 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
@@ -1 +1 @@
-fcced4c252e130567d4415557153ca96b343659fd89117b9500aad7636ec5a3e
+151b14434a80c2311224726e426eb1413901a0dd483fcfffbda057ea1c38c118
diff --git a/Aucma.Core.DataCollector/DataCollectorFactory.cs b/Aucma.Core.DataCollector/DataCollectorFactory.cs
index 3f7218f0..d84c68d8 100644
--- a/Aucma.Core.DataCollector/DataCollectorFactory.cs
+++ b/Aucma.Core.DataCollector/DataCollectorFactory.cs
@@ -22,6 +22,9 @@ namespace Aucma.Core.DataCollector
public readonly IRecordDeviceAlarmInfoServices _deviceAlarmInfoServices;
public readonly IRecordDeviceElectricityServices _deviceElectricityServices;
+ public int AlarmReadTimer = (1000 * 20);
+ public int EleReadTimer = (1000 * 20);
+
public DataCollectorFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices)
{
_deviceParamServices = deviceParamServices;
@@ -39,7 +42,38 @@ namespace Aucma.Core.DataCollector
/// 采集设备用电
/// </summary>
/// <param name="deviceElectricity"></param>
- public abstract void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity);
+ public abstract void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys);
+
+ /// <summary>
+ /// 根据PLC地址读取设备用电
+ /// </summary>
+ /// <param name="address"></param>
+ /// <param name="plc"></param>
+ /// <param name="deviceElectricity"></param>
+ public void ReadDeviceElectricity(string[] address,IPlc plc,ref Record_DeviceElectricity deviceElectricity)
+ {
+ var ground = plc.ReadRandomInt16(address);
+ if (ground != null)
+ {
+ if (ground.Length >= 10)
+ {
+ //deviceElectricity.Glys = ground[0];
+ deviceElectricity.Va = ground[0];
+ deviceElectricity.Vb = ground[1];
+ deviceElectricity.Vc = ground[2];
+ deviceElectricity.Ia = ground[6];
+ deviceElectricity.Ib = ground[7];
+ deviceElectricity.Ic = ground[8];
+ deviceElectricity.Zxyg = ground[9];
+ deviceElectricity.CollectTime = DateTime.Now;
+ deviceElectricity.RecordTime = DateTime.Now;
+ }
+ }
+ else
+ {
+ deviceElectricity = null;
+ }
+ }
/// <summary>
/// 读取PLC数据
diff --git a/Aucma.Core.DataCollector/DataCollectorSetup.cs b/Aucma.Core.DataCollector/DataCollectorSetup.cs
index 2f919465..263dce63 100644
--- a/Aucma.Core.DataCollector/DataCollectorSetup.cs
+++ b/Aucma.Core.DataCollector/DataCollectorSetup.cs
@@ -58,9 +58,43 @@ namespace Aucma.Core.DataCollector
}
else if (stationCode == "1010")//成品分垛
{
+ //Task.Run(() =>
+ //{
+ // DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+
+ // Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
+ //});
+ Task.Run(() =>
+ {
+ DataCollectorFactory collector = new ShellStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+
+ Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
+ });
+
+ Task.Run(() =>
+ {
+ DataCollectorFactory collector = new LinerStoreFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+
+ Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
+ });
+
+ Task.Run(() =>
+ {
+ DataCollectorFactory collector = new ShellPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+
+ Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
+ });
+
+ Task.Run(() =>
+ {
+ DataCollectorFactory collector = new LinerPreassembleFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+
+ Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
+ });
+
Task.Run(() =>
{
- DataCollectorFactory collector = new PalletizFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
+ DataCollectorFactory collector = new FoamBackFactory(_deviceParamServices, _deviceAlarmInfoServices, _deviceElectricityServices);
Parallel.Invoke(() => collector.CollectDeviceAlarmInfo(out var alarmInfos), () => collector.CollectDeviceElectricity(out var electricity));
});
diff --git a/Aucma.Core.DataCollector/Factory/BeforeFoamFactory.cs b/Aucma.Core.DataCollector/Factory/BeforeFoamFactory.cs
new file mode 100644
index 00000000..2ed3682e
--- /dev/null
+++ b/Aucma.Core.DataCollector/Factory/BeforeFoamFactory.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：Aucma.Core.DataCollector.Factory
+* 唯一标识：a4c93b2e-0cca-4fc8-be63-7f560c451cd9
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-28 11:16:52
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace Aucma.Core.DataCollector.Factory
+{
+ /// <summary>
+ /// 泡前数据采集
+ /// </summary>
+ public class BeforeFoamFactory
+ {
+
+ }
+}
diff --git a/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs b/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs
index 30566052..302ce3bd 100644
--- a/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs
+++ b/Aucma.Core.DataCollector/Factory/BoxFoamFactory.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
namespace Aucma.Core.DataCollector.Factory
{
/// <summary>
- /// 泡前库、发泡线、发泡机、泡后库数据采集
+ /// 箱体发泡数据采集
/// </summary>
public class BoxFoamFactory : DataCollectorFactory
{
@@ -34,7 +34,7 @@ namespace Aucma.Core.DataCollector.Factory
if (_plc != null)
{
- Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集泡前库、发泡线、发泡机、泡后库设备报警信息");
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备报警信息");
var plc = _plc.plc;
var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00009");
@@ -68,11 +68,11 @@ namespace Aucma.Core.DataCollector.Factory
base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
}
}
- Task.Delay(1000 * 5).Wait();
+ Task.Delay(base.AlarmReadTimer).Wait();
}
else
{
- Task.Delay(1000 * 5).Wait();
+ Task.Delay(base.AlarmReadTimer).Wait();
_plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
}
}
@@ -83,7 +83,7 @@ namespace Aucma.Core.DataCollector.Factory
}
}
- public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity)
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
{
throw new NotImplementedException();
}
diff --git a/Aucma.Core.DataCollector/Factory/FoamBackFactory.cs b/Aucma.Core.DataCollector/Factory/FoamBackFactory.cs
new file mode 100644
index 00000000..12497354
--- /dev/null
+++ b/Aucma.Core.DataCollector/Factory/FoamBackFactory.cs
@@ -0,0 +1,186 @@
+using Admin.Core.IService.IService_New;
+using Admin.Core.Model.Model_New;
+using Aucma.Core.HwPLc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：Aucma.Core.DataCollector.Factory
+* 唯一标识：d14bf35f-5d0b-4d74-a9a8-f7781f5c12cd
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-28 11:15:55
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace Aucma.Core.DataCollector.Factory
+{
+ /// <summary>
+ /// 泡后数据采集
+ /// </summary>
+ public class FoamBackFactory : DataCollectorFactory
+ {
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("FoamBack"));
+
+ public FoamBackFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
+ {
+ }
+
+ public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
+ {
+ while (true)
+ {
+ try
+ {
+
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集泡后库设备报警信息");
+ var plc = _plc.plc;
+
+ var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00009");
+
+ if (deviceParams != null)
+ {
+ deviceAlarmInfos = new List<Record_DeviceAlarmInfo>();
+ string batchId = System.Guid.NewGuid().ToString("N");
+ foreach (var item in deviceParams)
+ {
+ base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue);
+
+ if (paramValue != 0)
+ {
+ deviceAlarmInfos.Add(new Record_DeviceAlarmInfo()
+ {
+ BatchId = batchId,
+ DeviceCode = item.DeviceCode,
+ DeviceType = "1",
+ ParamCode = item.ParamCode,
+ ParamValue = paramValue.ToString(),
+ AlarmInfo = item.ParamName,
+ AlarmTime = DateTime.Now,
+ CreadtedTime = DateTime.Now,
+ });
+ }
+
+ }
+ if (deviceAlarmInfos.Count > 0)
+ {
+ base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
+ }
+ }
+ Task.Delay(base.AlarmReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("FoamBack"));
+ }
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集泡后库设备报警信息异常:{ex.Message}");
+ }
+ }
+ }
+
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
+ {
+ while (true)
+ {
+ try
+ {
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集泡后库设备用电数据");
+ var plc = _plc.plc;
+
+ deviceElectricitys = new List<Record_DeviceElectricity>();
+
+ //泡后集存库(10柜-主柜)
+ string[] address_10 = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_10 = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00009_0001"
+ };
+
+ base.ReadDeviceElectricity(address_10, plc, ref _deviceElectricity_10);
+
+ if(_deviceElectricity_10 != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_10);
+ }
+
+ //泡后集存库(09柜-分柜)IP10.10.92.40
+ string[] address_09 = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" };
+
+ Record_DeviceElectricity _deviceElectricity_09 = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00009_0002"
+ };
+
+ base.ReadDeviceElectricity(address_09, plc, ref _deviceElectricity_09);
+
+ if (_deviceElectricity_09 != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_09);
+ }
+
+ //泡后集存库(12柜-分柜)
+ string[] address_12 = new string[] { "D7752", "D7764", "D7766", "D7768", "D7760", "D7762", "D7780", "D7784", "D7788", "D7792" };
+
+ Record_DeviceElectricity _deviceElectricity_12 = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00009_0003"
+ };
+
+ base.ReadDeviceElectricity(address_12, plc, ref _deviceElectricity_12);
+
+ if (_deviceElectricity_12 != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_12);
+ }
+
+ if(deviceElectricitys.Count > 0)
+ {
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+ }
+ else
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集泡后库设备用电数据失败，数据为空");
+ }
+
+ Task.Delay(base.EleReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("FoamBack"));
+ }
+
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集泡后库设备用电数据采集异常:{ex.Message}");
+ }
+ }
+ }
+ }
+}
diff --git a/Aucma.Core.DataCollector/Factory/LinerPreassembleFactory.cs b/Aucma.Core.DataCollector/Factory/LinerPreassembleFactory.cs
new file mode 100644
index 00000000..2823b676
--- /dev/null
+++ b/Aucma.Core.DataCollector/Factory/LinerPreassembleFactory.cs
@@ -0,0 +1,167 @@
+using Admin.Core.IService.IService_New;
+using Admin.Core.Model.Model_New;
+using Aucma.Core.HwPLc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：Aucma.Core.DataCollector.Factory
+* 唯一标识：81c294d4-c4ab-4504-b193-9a5d013383d3
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-28 11:57:37
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace Aucma.Core.DataCollector.Factory
+{
+ public class LinerPreassembleFactory : DataCollectorFactory
+ {
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerPreassemble"));
+ public LinerPreassembleFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
+ {
+ }
+
+ public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
+ {
+ while (true)
+ {
+ try
+ {
+
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆预装设备报警信息");
+ var plc = _plc.plc;
+
+ var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00024");
+
+ if (deviceParams != null)
+ {
+ deviceAlarmInfos = new List<Record_DeviceAlarmInfo>();
+ string batchId = System.Guid.NewGuid().ToString("N");
+ foreach (var item in deviceParams)
+ {
+ base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue);
+
+ if (paramValue != 0)
+ {
+ deviceAlarmInfos.Add(new Record_DeviceAlarmInfo()
+ {
+ BatchId = batchId,
+ DeviceCode = item.DeviceCode,
+ DeviceType = "1",
+ ParamCode = item.ParamCode,
+ ParamValue = paramValue.ToString(),
+ AlarmInfo = item.ParamName,
+ AlarmTime = DateTime.Now,
+ CreadtedTime = DateTime.Now,
+ });
+ }
+
+ }
+ if (deviceAlarmInfos.Count > 0)
+ {
+ base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
+ }
+ }
+ Task.Delay(base.AlarmReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerPreassemble"));
+ }
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集内胆预装设备报警信息异常:{ex.Message}");
+ }
+ }
+ }
+
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
+ {
+ while (true)
+ {
+ try
+ {
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆预装设备用电数据");
+ var plc = _plc.plc;
+
+ deviceElectricitys = new List<Record_DeviceElectricity>();
+
+ // 地面内胆预装主柜
+ string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00024_0001"
+ };
+
+ base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground);
+
+ if(_deviceElectricity_ground != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_ground);
+ }
+
+ //平台内胆预装远程
+ string[] platform = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" };
+
+ Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00024_0002"
+ };
+
+ base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform);
+
+ if (_deviceElectricity_platform != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_platform);
+ }
+
+ if(deviceElectricitys.Count > 0)
+ {
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+ }
+ else
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆预装设备用电数据失败，数据为空");
+ }
+
+ Task.Delay(base.EleReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerPreassemble"));
+ }
+
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集内胆预装用电数据采集异常:{ex.Message}");
+ }
+ }
+ }
+ }
+}
diff --git a/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs b/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs
index d8f90199..eda4bc38 100644
--- a/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs
+++ b/Aucma.Core.DataCollector/Factory/LinerStoreFactory.cs
@@ -15,14 +15,14 @@ namespace Aucma.Core.DataCollector.Factory
/// </summary>
public class LinerStoreFactory : DataCollectorFactory
{
- private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerStore"));
public LinerStoreFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
{
}
/// <summary>
- /// 采集内胆预装、内胆库设备报警信息
+ /// 采集内胆库设备报警信息
/// </summary>
/// <param name="deviceAlarmInfos"></param>
public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
@@ -34,10 +34,10 @@ namespace Aucma.Core.DataCollector.Factory
if (_plc != null)
{
- Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆预装、内胆库设备报警信息");
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆库设备报警信息");
var plc = _plc.plc;
- var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00024" || x.DeviceCode == "E00032");
+ var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00032");
if (deviceParams != null)
{
@@ -68,24 +68,71 @@ namespace Aucma.Core.DataCollector.Factory
base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
}
}
- Task.Delay(1000 * 5).Wait();
+ Task.Delay(base.AlarmReadTimer).Wait();
}
else
{
- Task.Delay(1000 * 5).Wait();
- _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerStore"));
}
}
catch (Exception ex)
{
- base._logger.Error($"采集内胆预装、内胆库设备报警信息异常:{ex.Message}");
+ base._logger.Error($"采集内胆库设备报警信息异常:{ex.Message}");
}
}
}
- public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity)
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
{
- throw new NotImplementedException();
+ while (true)
+ {
+ try
+ {
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆库设备用电数据");
+ var plc = _plc.plc;
+
+ deviceElectricitys = new List<Record_DeviceElectricity>();
+
+ string[] address = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_address = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00032_0001"
+ };
+
+ base.ReadDeviceElectricity(address, plc, ref _deviceElectricity_address);
+
+ if( _deviceElectricity_address != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_address);
+ }
+
+ if(deviceElectricitys.Count > 0 )
+ {
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+ }
+ else
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集内胆库设备用电数据失败，数据为空");
+ }
+
+ Task.Delay(base.EleReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("LinerStore"));
+ }
+
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集内胆库设备用电数据采集异常:{ex.Message}");
+ }
+ }
}
}
}
diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
index 43ae9cc9..b813f9d9 100644
--- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
+++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
@@ -12,7 +12,7 @@ namespace Aucma.Core.DataCollector.Factory
/// </summary>
public class PalletizFactory : DataCollectorFactory
{
- private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
public PalletizFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
{
@@ -66,12 +66,12 @@ namespace Aucma.Core.DataCollector.Factory
base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
}
}
- Task.Delay(1000 * 5).Wait();
+ Task.Delay(base.AlarmReadTimer).Wait();
}
else
{
- Task.Delay(1000 * 5).Wait();
- _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
}
}
catch(Exception ex)
@@ -86,7 +86,7 @@ namespace Aucma.Core.DataCollector.Factory
/// </summary>
/// <param name="deviceElectricity"></param>
/// <exception cref="NotImplementedException"></exception>
- public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity)
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
{
while (true)
{
@@ -97,69 +97,61 @@ namespace Aucma.Core.DataCollector.Factory
Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备用电数据");
var plc = _plc.plc;
- var info = plc.Read("D7500", 40);
+ deviceElectricitys = new List<Record_DeviceElectricity>();
- if (info != null)
+ string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity()
{
- deviceElectricity = new Record_DeviceElectricity()
- {
- MonitorId = "E00002",
- CollectTime = DateTime.Now,
- RecordTime = DateTime.Now,
- };
-
- var ins = ParseAndReverseByteArray(info, 0, info.Length);
-
- #region 数据解析 Delete By Wenjy 2024-03-26 14:04:00 封装解析方法
- //int temp = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(0).Take(2).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp2 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(4).Take(6).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp3 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(8).Take(10).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp4 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(12).Take(14).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp5 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(16).Take(18).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp6 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(20).Take(22).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp7 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(24).Take(26).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp8 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(28).Take(30).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp9 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(32).Take(34).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp10 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(36).Take(38).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- //int temp11 = ushort.Parse(StringChange.bytesToHexStr(array(info.Skip(40).Take(42).ToArray()), 2), System.Globalization.NumberStyles.HexNumber);
- #endregion
-
- if(ins != null)
- {
- if(ins.Length >= 20)
- {
- deviceElectricity.Glys = ins[0];
- deviceElectricity.Va = ins[2];
- deviceElectricity.Vb = ins[4];
- deviceElectricity.Vc = ins[6];
- deviceElectricity.Ia = ins[14];
- deviceElectricity.Ib = ins[16];
- deviceElectricity.Ic = ins[18];
- deviceElectricity.Zxyg = ins[20];
- }
- }
+ MonitorId = "E0003"
+ };
- if(deviceElectricity.Zxyg > 0)
- {
- var result = base._deviceElectricityServices.AddAsync(deviceElectricity);
- }
- }
- Task.Delay(1000 * 5).Wait();
+ base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground);
+
+ deviceElectricitys.Add(_deviceElectricity_ground);
+
+ string[] platform = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" };
+
+ Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity()
+ {
+ MonitorId = "E0004"
+ };
+
+ base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform);
+
+ deviceElectricitys.Add(_deviceElectricity_platform);
+
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+
+ Task.Delay(base.EleReadTimer).Wait();
}
else
{
- Task.Delay(1000 * 5).Wait();
- _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Palletiz"));
}
}
- catch(Exception ex)
+ catch (Exception ex)
{
- base._logger.Error($"成品分垛设备用电数据采集异常:{ex.Message}");
+ base._logger.Error($"采集成品分垛设备用电数据采集异常:{ex.Message}");
}
}
}
+ public byte[] array(byte[] data)
+ {
+ if (data == null) return null;
+ for (int i = 0; i < data.Length; i += 2)
+ {
+ byte temp = data[i];
+ data[i] = data[i + 1];
+ data[i + 1] = temp;
+ }
+
+ return data;
+ }
+
/// <summary>
/// 用电数据解析
/// </summary>
diff --git a/Aucma.Core.DataCollector/Factory/ShellPreassembleFactory.cs b/Aucma.Core.DataCollector/Factory/ShellPreassembleFactory.cs
new file mode 100644
index 00000000..5f672eab
--- /dev/null
+++ b/Aucma.Core.DataCollector/Factory/ShellPreassembleFactory.cs
@@ -0,0 +1,166 @@
+using Admin.Core.IService.IService_New;
+using Admin.Core.Model.Model_New;
+using Aucma.Core.HwPLc;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：Aucma.Core.DataCollector.Factory
+* 唯一标识：f88ccab0-cc8a-4d6f-8be8-1a0dbc687b9e
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-03-28 11:53:14
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace Aucma.Core.DataCollector.Factory
+{
+ /// <summary>
+ /// 箱壳预装数据采集
+ /// </summary>
+ public class ShellPreassembleFactory : DataCollectorFactory
+ {
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellPreassemble"));
+
+ public ShellPreassembleFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
+ {
+ }
+
+ public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
+ {
+ while (true)
+ {
+ try
+ {
+
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳预装设备报警信息");
+ var plc = _plc.plc;
+
+ var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00019");
+
+ if (deviceParams != null)
+ {
+ deviceAlarmInfos = new List<Record_DeviceAlarmInfo>();
+ string batchId = System.Guid.NewGuid().ToString("N");
+ foreach (var item in deviceParams)
+ {
+ base.ReadParamValueByPlc(plc, item.ParamAddress, item.ParamType, out int paramValue);
+
+ if (paramValue != 0)
+ {
+ deviceAlarmInfos.Add(new Record_DeviceAlarmInfo()
+ {
+ BatchId = batchId,
+ DeviceCode = item.DeviceCode,
+ DeviceType = "1",
+ ParamCode = item.ParamCode,
+ ParamValue = paramValue.ToString(),
+ AlarmInfo = item.ParamName,
+ AlarmTime = DateTime.Now,
+ CreadtedTime = DateTime.Now,
+ });
+ }
+
+ }
+ if (deviceAlarmInfos.Count > 0)
+ {
+ base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
+ }
+ }
+ Task.Delay(base.AlarmReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellPreassemble"));
+ }
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集箱壳预装设备报警信息异常:{ex.Message}");
+ }
+ }
+ }
+
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
+ {
+ while (true)
+ {
+ try
+ {
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳预装设备用电数据");
+ var plc = _plc.plc;
+
+ deviceElectricitys = new List<Record_DeviceElectricity>();
+
+ // 地面箱壳预装远程
+ string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_ground = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00019_0001"
+ };
+
+ base.ReadDeviceElectricity(ground, plc, ref _deviceElectricity_ground);
+
+ if(_deviceElectricity_ground != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_ground);
+ }
+
+ //平台箱壳预装主柜
+ string[] platform = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" };
+
+ Record_DeviceElectricity _deviceElectricity_platform = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00019_0002"
+ };
+
+ base.ReadDeviceElectricity(platform, plc, ref _deviceElectricity_platform);
+
+ if(_deviceElectricity_platform != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_platform);
+ }
+
+ if(deviceElectricitys.Count > 0)
+ {
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+ }
+ else
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳预装设备用电数据失败，数据为空");
+ }
+
+ Task.Delay(base.EleReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellPreassemble"));
+ }
+
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集箱壳库设备用电数据采集异常:{ex.Message}");
+ }
+ }
+ }
+ }
+}
diff --git a/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs b/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs
index 31eed6cc..2bf9978a 100644
--- a/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs
+++ b/Aucma.Core.DataCollector/Factory/ShellStoreFactory.cs
@@ -11,18 +11,18 @@ using System.Threading.Tasks;
namespace Aucma.Core.DataCollector.Factory
{
/// <summary>
- /// 箱壳预装、箱壳库数据采集
+ /// 箱壳库数据采集
/// </summary>
public class ShellStoreFactory : DataCollectorFactory
{
- private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ private PlcModel _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellStore"));
public ShellStoreFactory(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
{
}
/// <summary>
- /// 采集箱壳预装、箱壳库设备报警信息
+ /// 采集箱壳库设备报警信息
/// </summary>
/// <param name="deviceAlarmInfos"></param>
public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
@@ -34,10 +34,10 @@ namespace Aucma.Core.DataCollector.Factory
if (_plc != null)
{
- Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳预装、箱壳库设备报警信息");
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳库设备报警信息");
var plc = _plc.plc;
- var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00019" || x.DeviceCode == "E00031");
+ var deviceParams = base._deviceParamServices.Query(x => x.DeviceCode == "E00031");
if (deviceParams != null)
{
@@ -68,24 +68,91 @@ namespace Aucma.Core.DataCollector.Factory
base._deviceAlarmInfoServices.AddAsync(deviceAlarmInfos);
}
}
- Task.Delay(1000 * 5).Wait();
+ Task.Delay(base.AlarmReadTimer).Wait();
}
else
{
- Task.Delay(1000 * 5).Wait();
- _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("Test"));
+ Task.Delay(base.AlarmReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellStore"));
}
}
catch (Exception ex)
{
- base._logger.Error($"采集箱壳预装、箱壳库设备报警信息异常:{ex.Message}");
+ base._logger.Error($"采集箱壳库设备报警信息异常:{ex.Message}");
}
}
}
- public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity)
+ /// <summary>
+ /// 采集箱壳库设备用电
+ /// </summary>
+ /// <param name="deviceElectricitys"></param>
+ public override void CollectDeviceElectricity(out List<Record_DeviceElectricity> deviceElectricitys)
{
- throw new NotImplementedException();
+ while (true)
+ {
+ try
+ {
+ if (_plc != null)
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳库设备用电数据");
+ var plc = _plc.plc;
+
+ deviceElectricitys = new List<Record_DeviceElectricity>();
+
+ //箱壳主柜
+ string[] mainCabinet = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
+
+ Record_DeviceElectricity _deviceElectricity_mainCabinet = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00031_0001"
+ };
+
+ base.ReadDeviceElectricity(mainCabinet, plc, ref _deviceElectricity_mainCabinet);
+
+ if(_deviceElectricity_mainCabinet != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_mainCabinet);
+ }
+
+ //箱壳远程柜
+ string[] rangeCabinet = new string[] { "D7652", "D7664", "D7666", "D7668", "D7660", "D7662", "D7680", "D7684", "D7688", "D7692" };
+
+ Record_DeviceElectricity _deviceElectricity_rangeCabinet = new Record_DeviceElectricity()
+ {
+ MonitorId = "E00031_0002"
+ };
+
+ base.ReadDeviceElectricity(rangeCabinet, plc, ref _deviceElectricity_rangeCabinet);
+
+ if(_deviceElectricity_rangeCabinet != null)
+ {
+ deviceElectricitys.Add(_deviceElectricity_rangeCabinet);
+ }
+
+ if(deviceElectricitys.Count > 0)
+ {
+ var result = base._deviceElectricityServices.AddAsync(deviceElectricitys);
+ }
+ else
+ {
+ Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集箱壳库设备用电数据失败，数据为空");
+ }
+
+ Task.Delay(base.EleReadTimer).Wait();
+ }
+ else
+ {
+ Task.Delay(base.EleReadTimer).Wait();
+ _plc = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("ShellStore"));
+ }
+
+ }
+ catch (Exception ex)
+ {
+ base._logger.Error($"采集箱壳库设备用电数据采集异常:{ex.Message}");
+ }
+ }
}
}
}
diff --git a/Aucma.Core.HwPLc/IPlc.cs b/Aucma.Core.HwPLc/IPlc.cs
index 5ec8df31..275b5e65 100644
--- a/Aucma.Core.HwPLc/IPlc.cs
+++ b/Aucma.Core.HwPLc/IPlc.cs
@@ -26,6 +26,9 @@ namespace Aucma.Core.HwPLc
/// </summary>
/// <returns></returns>
bool DisConnect();
+
+ public short[] ReadRandomInt16(string[] address);
+
/// <summary>
/// 读取byte数据
/// </summary>
diff --git a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
index 298135c7..e09e4ab6 100644
--- a/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
+++ b/Aucma.Core.HwPLc/Impl/MelsecPlc.cs
@@ -513,6 +513,34 @@ namespace Aucma.Core.HwPLc
#endregion
+ /// <summary>
+ /// 根据数组读取
+ /// </summary>
+ /// <param name="address"></param>
+ /// <returns></returns>
+ public short[] ReadRandomInt16(string[] address)
+ {
+ try
+ {
+ var info = melsecMcNet.ReadRandomInt16(address);
+ if (info.IsSuccess)
+ {
+ IsConnected = true;
+
+ return info.Content;
+ }
+ else
+ {
+ Console.WriteLine($"读取失败信息：{info.Message}");
+ }
+ }catch (Exception ex)
+ {
+
+ Console.WriteLine($"读取失败信息：{ex.Message}");
+ }
+ return null;
+ }
+
/// <summary>
/// 读取byte
/// </summary>
@@ -521,6 +549,7 @@ namespace Aucma.Core.HwPLc
/// <returns></returns>
public byte[] Read(string address, ushort len)
{
+
OperateResult<byte[]> readbyte = melsecMcNet.Read(address, len);
if (readbyte.IsSuccess)
{
diff --git a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs
index 114fa91e..75951a4c 100644
--- a/Aucma.Core.HwPLc/Impl/SiemensPlc.cs
+++ b/Aucma.Core.HwPLc/Impl/SiemensPlc.cs
@@ -561,6 +561,14 @@ namespace Aucma.Core.HwPLc
throw new NotImplementedException();
}
-
+ /// <summary>
+ /// 根据数组读取
+ /// </summary>
+ /// <param name="address"></param>
+ /// <returns></returns>
+ public short[] ReadRandomInt16(string[] address)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
index f3c45321..3204c4ac 100644
--- a/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
+++ b/Aucma.Core.Palletiz/Aucma.Core.Palletiz.csproj
@@ -76,6 +76,7 @@
<ItemGroup>
<ProjectReference Include="..\Admin.Core.Extensions\Admin.Core.Extensions.csproj" />
+ <ProjectReference Include="..\Aucma.Core.DataCollector\Aucma.Core.DataCollector.csproj" />
</ItemGroup>
<ItemGroup>
diff --git a/Aucma.Core.Palletiz/Startup.cs b/Aucma.Core.Palletiz/Startup.cs
index 2ea4d246..63bc7b8b 100644
--- a/Aucma.Core.Palletiz/Startup.cs
+++ b/Aucma.Core.Palletiz/Startup.cs
@@ -8,6 +8,7 @@ using Admin.Core.Repository;
using Admin.Core.Service;
using Admin.Core.Socket;
using Admin.Core.Tasks;
+using Aucma.Core.DataCollector;
using Aucma.Core.RunPlc;
using Aucma.Core.Scanner;
using Autofac;
@@ -110,6 +111,8 @@ namespace Aucma.Core.Palletiz
// Socket����ɨ����
app.UseTouchSocketMildd(socket);
+
+ app.UseDataCollectorExtensions();
}
#region ע�����
diff --git a/Aucma.Core.Palletiz/appsettings.json b/Aucma.Core.Palletiz/appsettings.json
index 95a7b24f..2450cebb 100644
--- a/Aucma.Core.Palletiz/appsettings.json
+++ b/Aucma.Core.Palletiz/appsettings.json
@@ -198,6 +198,54 @@
"Enabled": true,
"IP": "10.10.92.80", //10.10.92.80
"Port": 2015
+ },
+ {
+ "Id": 2,
+ "EquipName": "ShellStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.22",
+ "Port": 2016
+ },
+ {
+ "Id": 3,
+ "EquipName": "LinerStore",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.29",
+ "Port": 2016
+ },
+ {
+ "Id": 4,
+ "EquipName": "ShellPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.10",
+ "Port": 2014
+ },
+ {
+ "Id": 5,
+ "EquipName": "LinerPreassemble",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.1",
+ "Port": 2014
+ },
+ {
+ "Id": 6,
+ "EquipName": "FoamBack",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.49",
+ "Port": 2014
+ },
+ {
+ "Id": 7,
+ "EquipName": "Palletiz",
+ "PlcType": "Melsec",
+ "Enabled": true,
+ "IP": "10.10.92.80", //10.10.92.80
+ "Port": 2015
}
],
"StoreInfo": {
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
index c6feafe5..42b5d7f0 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+08f039f79c4354fdb0c81441e2a211c05029eb3e")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
index d74d346d..aaf0dc50 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1ed05d3a7db966fb4671d718249d9d84519ef6c2db9dded8bc345c3230d77c75
+b43f99769f32ec72bcb4b687077057c7b377ea14e6b7f313f44a9fdbedd892eb
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
index 80297457..ff0e609b 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
194-2005446070
Themes\Generic.xaml;
-True
+False
From fba8cd4d68ad6743f2dbb1218c1a88c540b73c72 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 28 Mar 2024 19:05:57 +0800
Subject: [PATCH 3/4] change - push
---
...Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig | 6 ++++--
...min.Core.Model.GeneratedMSBuildEditorConfig.editorconfig | 4 +++-
.../Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs | 6 +-----
.../HwControlLib.GeneratedMSBuildEditorConfig.editorconfig | 6 +-----
.../Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache | 6 +++---
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
index 6c5e02be..60b6cf63 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig
@@ -9,9 +9,11 @@ build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Api
build_property.RootNamespace = Admin.Core.Api
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Api\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
-build_property.MSBuildProjectDirectory = E:\c#\AUCMA\new\Admin.Core.Api
+build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api
build_property._RazorSourceGeneratorDebug =
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
index 0b5bdcb9..4bea6c27 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Model\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
index abee43ae..daa86c24 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs
@@ -15,11 +15,7 @@ namespace XamlGeneratedNamespace {
/// GeneratedInternalTypeHelper
/// </summary>
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
-<<<<<<< HEAD
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.9.0")]
-=======
- [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.2.0")]
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "8.0.3.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
index 831c6929..ff214ef2 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,10 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = HwControlLib
-<<<<<<< HEAD
-build_property.ProjectDir = E:\c#\AUCMA\new\HwControlLib\
-=======
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
index 86094acd..80297457 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
@@ -4,7 +4,7 @@
library
C#
.cs
-D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
+E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib
none
false
@@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769
71208292394
-194-428966090
+194-2005446070
Themes\Generic.xaml;
-False
+True
From 65b33b663b68e04b5294882dfabf68f4a2439e52 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 28 Mar 2024 19:10:51 +0800
Subject: [PATCH 4/4] change- push
---
.../Admin.Core.Api.csproj.nuget.dgspec.json | 804 +++++++++++-------
.../obj/Admin.Core.Api.csproj.nuget.g.props | 14 +-
.../net6.0/Admin.Core.Api.AssemblyInfo.cs | 2 +-
.../Admin.Core.Api.AssemblyInfoInputs.cache | 2 +-
.../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 143016 -> 144998 bytes
Admin.Core.Api/obj/project.assets.json | 52 +-
Admin.Core.Api/obj/project.nuget.cache | 458 +++++-----
.../net6.0/Admin.Core.Common.AssemblyInfo.cs | 6 +-
...Admin.Core.Common.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.EventBus.AssemblyInfo.cs | 6 +-
...min.Core.EventBus.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.Extensions.AssemblyInfo.cs | 2 +-
...n.Core.Extensions.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.FrameWork.AssemblyInfo.cs | 6 +-
...in.Core.FrameWork.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 6 +-
.../Admin.Core.IRepository.AssemblyInfo.cs | 6 +-
....Core.IRepository.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.IService.AssemblyInfo.cs | 6 +-
...min.Core.IService.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Model.AssemblyInfo.cs | 2 +-
.../Admin.Core.Model.AssemblyInfoInputs.cache | 2 +-
...Admin.Core.RealTimeService.AssemblyInfo.cs | 6 +-
...e.RealTimeService.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 6 +-
.../Admin.Core.Repository.AssemblyInfo.cs | 6 +-
...n.Core.Repository.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Admin.Core.Serilog.Es.AssemblyInfo.cs | 6 +-
...n.Core.Serilog.Es.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Service.AssemblyInfo.cs | 6 +-
...dmin.Core.Service.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../net6.0/Admin.Core.Tasks.AssemblyInfo.cs | 6 +-
.../Admin.Core.Tasks.AssemblyInfoInputs.cache | 6 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
Aucma.Core.DataCollector/Factory/Class1.cs | 27 -
.../Factory/PalletizFactory.cs | 5 +-
.../HwControlLib.AssemblyInfo.cs | 2 +-
.../HwControlLib.AssemblyInfoInputs.cache | 2 +-
.../net6.0-windows/HwControlLib.assets.cache | Bin 198 -> 324 bytes
.../HwControlLib_MarkupCompile.i.cache | 2 +-
.../obj/HwControlLib.csproj.nuget.dgspec.json | 31 +-
.../obj/HwControlLib.csproj.nuget.g.props | 10 +-
HwControlLib/obj/project.assets.json | 33 +-
HwControlLib/obj/project.nuget.cache | 4 +-
52 files changed, 872 insertions(+), 756 deletions(-)
delete mode 100644 Aucma.Core.DataCollector/Factory/Class1.cs
diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
index 5173e3e6..d14128d3 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json
@@ -1,23 +1,26 @@
{
"format": 1,
"restore": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
},
"projects": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -25,22 +28,22 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -49,6 +52,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -83,24 +91,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
"projectName": "Admin.Core.Common",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -108,15 +119,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj"
}
}
}
@@ -125,6 +137,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -272,24 +289,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
"projectName": "Admin.Core.EventBus",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -297,15 +317,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -314,6 +335,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -345,24 +371,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
"projectName": "Admin.Core.Extensions",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -370,51 +399,52 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj"
}
}
}
@@ -423,6 +453,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -450,24 +485,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
"projectName": "Admin.Core.IRepository",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -475,18 +513,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -495,6 +534,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -516,24 +560,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
"projectName": "Admin.Core.IService",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -541,18 +588,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -561,6 +609,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -582,24 +635,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
"projectName": "Admin.Core.Model",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -607,15 +663,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -624,6 +681,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -645,24 +707,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
"projectName": "Admin.Core.Repository",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Repository\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -670,15 +735,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
}
}
}
@@ -687,6 +753,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -708,24 +779,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
"projectName": "Admin.Core.Serilog.Es",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Serilog.Es\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -733,8 +807,9 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
@@ -746,6 +821,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -797,24 +877,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
"projectName": "Admin.Core.Service",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -822,21 +905,22 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
}
}
}
@@ -845,6 +929,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -866,24 +955,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj",
"projectName": "Admin.Core.Socket",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\Admin.Core.Socket.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Socket\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\Admin.Core.Socket.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Socket\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -891,18 +983,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
}
}
}
@@ -911,6 +1004,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -946,24 +1044,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
"projectName": "Admin.Core.Tasks",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -971,27 +1072,28 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
}
}
}
@@ -1000,6 +1102,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1027,24 +1134,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
"projectName": "Aucma.Core.HwPLc",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1052,8 +1162,9 @@
"netstandard2.1"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1065,6 +1176,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1092,24 +1208,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj",
"projectName": "Aucma.Core.PerfusionTask",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PerfusionTask\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\Aucma.Core.PerfusionTask.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PerfusionTask\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1117,21 +1236,22 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
}
}
}
@@ -1140,6 +1260,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1161,24 +1286,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
"projectName": "Aucma.Core.PLc",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1186,8 +1314,9 @@
"netstandard2.1"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1199,6 +1328,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1226,24 +1360,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
"projectName": "Aucma.Core.RunPlc",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.RunPlc\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1251,18 +1388,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
}
}
}
@@ -1271,6 +1409,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1292,24 +1435,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
"projectName": "Aucma.Core.ScannerGun",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.ScannerGun\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1317,15 +1463,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -1334,6 +1481,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1361,24 +1513,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
"projectName": "Aucma.Core.Scanner",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Scanner\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1386,18 +1541,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
}
}
}
@@ -1406,6 +1562,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1433,24 +1594,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj",
"projectName": "Aucma.Core.SheetMetalTasks",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.SheetMetalTasks\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\Aucma.Core.SheetMetalTasks.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.SheetMetalTasks\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1458,18 +1622,19 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
}
}
}
@@ -1478,6 +1643,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1499,24 +1669,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
"projectName": "Aucma.Core.Tasks",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.Tasks\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1524,21 +1697,22 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
}
}
}
@@ -1547,6 +1721,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1568,24 +1747,27 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj",
"projectName": "Aucma.Core.TemperatureTask",
- "projectPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Aucma.Core.TemperatureTask\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\Aucma.Core.TemperatureTask.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.TemperatureTask\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -1593,15 +1775,16 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
}
}
}
@@ -1610,6 +1793,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -1631,7 +1819,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
index 3652bdb0..58649efa 100644
--- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
+++ b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.g.props
@@ -5,20 +5,22 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.9.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\ADMIN\.nuget\packages\" />
- <SourceRoot Include="D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages\" />
+ <SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" />
+ <SourceRoot Include="D:\开发环境\DevExpress\Components\Offline Packages\" />
+ <SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
+ <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
</ItemGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\3.0.0\build\Microsoft.Extensions.ApiDescription.Server.props')" />
<Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\5.6.3\build\Swashbuckle.AspNetCore.props')" />
</ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <PkgTouchSocket_Core Condition=" '$(PkgTouchSocket_Core)' == '' ">C:\Users\ADMIN\.nuget\packages\touchsocket.core\2.0.0</PkgTouchSocket_Core>
- <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\ADMIN\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0</PkgMicrosoft_Extensions_ApiDescription_Server>
+ <PkgTouchSocket_Core Condition=" '$(PkgTouchSocket_Core)' == '' ">C:\Users\Lenovo\.nuget\packages\touchsocket.core\2.0.0</PkgTouchSocket_Core>
+ <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Lenovo\.nuget\packages\microsoft.extensions.apidescription.server\3.0.0</PkgMicrosoft_Extensions_ApiDescription_Server>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
index 4043b923..a5b05827 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfo.cs
@@ -15,7 +15,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ac6266f5a5b3389d62c713916526556c063db9b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Api")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
index 58c698aa..344bf0d4 100644
--- a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
+++ b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.AssemblyInfoInputs.cache
@@ -1 +1 @@
-6608f80269768d5f9f4b079b5eb86bb2aed1cd2aa7194f894eeec6c70841fa38
+d876449b0e8a05ad524d60c64b588e410c53f85521599b7ff943b815ccce8343
diff --git a/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache b/Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.assets.cache
index 3cfa2f5f8df812ab46d54659a5b6acd7b4253bf5..f43e60d74734ea0f581f7adaa9524bc31dbaac05 100644
GIT binary patch
delta 20976
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
delta 18407
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
Uf)_fOO-t&TDX+6H*sRk32Yp@Q0RR91
diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json
index c8370bf1..89ecd636 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -7170,12 +7170,11 @@
]
},
"System.Collections.NonGeneric/4.3.0": {
- "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==",
+ "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==",
"type": "package",
"path": "system.collections.nongeneric/4.3.0",
"files": [
".nupkg.metadata",
- ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -9908,12 +9907,11 @@
]
},
"System.Runtime.Serialization.Primitives/4.3.0": {
- "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==",
+ "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==",
"type": "package",
"path": "system.runtime.serialization.primitives/4.3.0",
"files": [
".nupkg.metadata",
- ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -11489,23 +11487,28 @@
]
},
"packageFolders": {
- "C:\\Users\\ADMIN\\.nuget\\packages\\": {},
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages": {}
+ "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {},
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -11513,22 +11516,22 @@
"net6.0"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "C:\\Program Files\\dotnet\\sdk\\7.0.306\\Sdks\\Microsoft.NET.Sdk.Web\\library-packs": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\c#\\AUCMA\\new\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -11537,6 +11540,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -11571,7 +11579,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache
index 8ebc06cc..98ce8b8f 100644
--- a/Admin.Core.Api/obj/project.nuget.cache
+++ b/Admin.Core.Api/obj/project.nuget.cache
@@ -1,236 +1,236 @@
{
"version": 2,
- "dgSpecHash": "bbwFP5UR7DH6007kWBqdCEnSEMxI5ppX8XjGi0doQvdUrFXMvUj+YuL+nyQFBGrrjAK5W7qqw4pW3XcEXiAM2g==",
+ "dgSpecHash": "x1SJPkfgPOwX87+jGbmfVAlm3GQ3PS7NkQ0MIPnrDP1KJlVgkYM207ypxoNFNwZrdNzBfROB2/PWP2lACikOMA==",
"success": true,
- "projectFilePath": "E:\\c#\\AUCMA\\new\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"expectedPackageFiles": [
- "C:\\Users\\ADMIN\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.speech\\7.0.0\\system.speech.7.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\touchsocket\\2.0.0\\touchsocket.2.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\touchsocket.core\\2.0.0\\touchsocket.core.2.0.0.nupkg.sha512",
- "C:\\Users\\ADMIN\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
+ "C:\\Users\\Lenovo\\.nuget\\packages\\aspnetcoreratelimit\\4.0.1\\aspnetcoreratelimit.4.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\autofac\\6.2.0\\autofac.6.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extensions.dependencyinjection\\7.1.0\\autofac.extensions.dependencyinjection.7.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\autofac.extras.dynamicproxy\\6.0.0\\autofac.extras.dynamicproxy.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\automapper\\10.1.1\\automapper.10.1.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\automapper.extensions.microsoft.dependencyinjection\\8.1.1\\automapper.extensions.microsoft.dependencyinjection.8.1.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\castle.core\\4.4.0\\castle.core.4.4.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\consul\\1.6.10.3\\consul.1.6.10.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\elasticsearch.net\\7.8.1\\elasticsearch.net.7.8.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\initq\\1.0.0.7\\initq.1.0.0.7.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\log4net\\2.0.15\\log4net.2.0.15.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.authentication.jwtbearer\\5.0.9\\microsoft.aspnetcore.authentication.jwtbearer.5.0.9.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.connections.abstractions\\5.0.9\\microsoft.aspnetcore.connections.abstractions.5.0.9.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cryptography.internal\\2.2.0\\microsoft.aspnetcore.cryptography.internal.2.2.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection\\2.2.0\\microsoft.aspnetcore.dataprotection.2.2.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.dataprotection.abstractions\\2.2.0\\microsoft.aspnetcore.dataprotection.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.2\\microsoft.aspnetcore.http.2.2.2.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.http.features\\5.0.9\\microsoft.aspnetcore.http.features.5.0.9.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\5.0.9\\microsoft.aspnetcore.jsonpatch.5.0.9.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.mvc.newtonsoftjson.5.0.9.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.session\\2.2.0\\microsoft.aspnetcore.session.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.common\\5.0.9\\microsoft.aspnetcore.signalr.common.5.0.9.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson\\5.0.9\\microsoft.aspnetcore.signalr.protocols.newtonsoftjson.5.0.9.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient\\2.1.4\\microsoft.data.sqlclient.2.1.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlclient.sni.runtime\\2.1.1\\microsoft.data.sqlclient.sni.runtime.2.1.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite\\7.0.5\\microsoft.data.sqlite.7.0.5.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.data.sqlite.core\\7.0.5\\microsoft.data.sqlite.core.7.0.5.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.apidescription.server\\3.0.0\\microsoft.extensions.apidescription.server.3.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.abstractions\\5.0.0\\microsoft.extensions.caching.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.caching.memory\\5.0.0\\microsoft.extensions.caching.memory.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration\\5.0.0\\microsoft.extensions.configuration.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\5.0.0\\microsoft.extensions.configuration.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.binder\\5.0.0\\microsoft.extensions.configuration.binder.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\5.0.0\\microsoft.extensions.configuration.fileextensions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.configuration.json\\5.0.0\\microsoft.extensions.configuration.json.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\5.0.2\\microsoft.extensions.dependencyinjection.5.0.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\5.0.0\\microsoft.extensions.dependencyinjection.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.dependencymodel\\3.1.6\\microsoft.extensions.dependencymodel.3.1.6.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\5.0.0\\microsoft.extensions.fileproviders.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\5.0.0\\microsoft.extensions.fileproviders.physical.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\5.0.0\\microsoft.extensions.filesystemglobbing.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting\\2.1.0\\microsoft.extensions.hosting.2.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.8\\microsoft.extensions.hosting.abstractions.3.1.8.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging\\5.0.0\\microsoft.extensions.logging.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\5.0.0\\microsoft.extensions.logging.abstractions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.debug\\5.0.0\\microsoft.extensions.logging.debug.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.logging.log4net.aspnetcore\\5.0.3\\microsoft.extensions.logging.log4net.aspnetcore.5.0.3.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options\\5.0.0\\microsoft.extensions.options.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.options.configurationextensions\\5.0.0\\microsoft.extensions.options.configurationextensions.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.extensions.primitives\\5.0.1\\microsoft.extensions.primitives.5.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identity.client\\4.21.1\\microsoft.identity.client.4.21.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.jsonwebtokens\\6.8.0\\microsoft.identitymodel.jsonwebtokens.6.8.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.logging\\6.8.0\\microsoft.identitymodel.logging.6.8.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.8.0\\microsoft.identitymodel.protocols.6.8.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.8.0\\microsoft.identitymodel.protocols.openidconnect.6.8.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.8.0\\microsoft.identitymodel.tokens.6.8.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.registry\\4.7.0\\microsoft.win32.registry.4.7.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore\\4.2.22\\miniprofiler.aspnetcore.4.2.22.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.aspnetcore.mvc\\4.2.22\\miniprofiler.aspnetcore.mvc.4.2.22.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\miniprofiler.shared\\4.2.22\\miniprofiler.shared.4.2.22.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\mysqlconnector\\2.2.5\\mysqlconnector.2.2.5.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json\\13.0.3\\newtonsoft.json.13.0.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\npgsql\\5.0.7\\npgsql.5.0.7.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\npoi\\2.5.5\\npoi.2.5.5.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\pipelines.sockets.unofficial\\2.2.0\\pipelines.sockets.unofficial.2.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\polly\\7.2.2\\polly.7.2.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\portable.bouncycastle\\1.8.10\\portable.bouncycastle.1.8.10.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\quartz\\3.3.3\\quartz.3.3.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\rabbitmq.client\\6.2.2\\rabbitmq.client.6.2.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.linux-x64.runtime.native.system.io.ports\\8.0.0\\runtime.linux-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.io.ports\\8.0.0\\runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-arm64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-arm64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx-x64.runtime.native.system.io.ports\\8.0.0\\runtime.osx-x64.runtime.native.system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.0\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\scrutor\\3.3.0\\scrutor.3.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog\\2.10.0\\serilog.2.10.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.aspnetcore\\4.1.0\\serilog.aspnetcore.4.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.hosting\\4.1.2\\serilog.extensions.hosting.4.1.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.extensions.logging\\3.0.1\\serilog.extensions.logging.3.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.compact\\1.1.0\\serilog.formatting.compact.1.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.formatting.elasticsearch\\8.4.1\\serilog.formatting.elasticsearch.8.4.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.settings.configuration\\3.1.0\\serilog.settings.configuration.3.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.console\\3.1.1\\serilog.sinks.console.3.1.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.debug\\2.0.0\\serilog.sinks.debug.2.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.elasticsearch\\8.4.1\\serilog.sinks.elasticsearch.8.4.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.file\\4.1.0\\serilog.sinks.file.4.1.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\serilog.sinks.periodicbatching\\2.1.1\\serilog.sinks.periodicbatching.2.1.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sharpziplib\\1.3.2\\sharpziplib.1.3.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.4\\sqlitepclraw.bundle_e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.core\\2.1.4\\sqlitepclraw.core.2.1.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.4\\sqlitepclraw.lib.e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlitepclraw.provider.e_sqlite3\\2.1.4\\sqlitepclraw.provider.e_sqlite3.2.1.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore\\5.1.4.100\\sqlsugarcore.5.1.4.100.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.dm\\1.2.0\\sqlsugarcore.dm.1.2.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\sqlsugarcore.kdbndp\\7.4.0\\sqlsugarcore.kdbndp.7.4.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\stackexchange.redis\\2.2.50\\stackexchange.redis.2.2.50.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore\\5.6.3\\swashbuckle.aspnetcore.5.6.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters\\7.0.2\\swashbuckle.aspnetcore.filters.7.0.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.filters.abstractions\\7.0.2\\swashbuckle.aspnetcore.filters.abstractions.7.0.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.6.3\\swashbuckle.aspnetcore.swagger.5.6.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.6.3\\swashbuckle.aspnetcore.swaggergen.5.6.3.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.1.5\\swashbuckle.aspnetcore.swaggerui.6.1.5.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.3.0\\system.collections.immutable.1.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.nongeneric\\4.3.0\\system.collections.nongeneric.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.specialized\\4.3.0\\system.collections.specialized.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel\\4.3.0\\system.componentmodel.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.primitives\\4.3.0\\system.componentmodel.primitives.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.componentmodel.typeconverter\\4.3.0\\system.componentmodel.typeconverter.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.configuration.configurationmanager\\6.0.0\\system.configuration.configurationmanager.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.data.common\\4.3.0\\system.data.common.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.7.1\\system.diagnostics.diagnosticsource.4.7.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.performancecounter\\6.0.1\\system.diagnostics.performancecounter.6.0.1.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.diagnostics.stacktrace\\4.3.0\\system.diagnostics.stacktrace.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracesource\\4.3.0\\system.diagnostics.tracesource.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices\\6.0.1\\system.directoryservices.6.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.directoryservices.protocols\\6.0.1\\system.directoryservices.protocols.6.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.dynamic.runtime\\4.3.0\\system.dynamic.runtime.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.identitymodel.tokens.jwt\\6.8.0\\system.identitymodel.tokens.jwt.6.8.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.pipelines\\5.0.1\\system.io.pipelines.5.0.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.io.ports\\8.0.0\\system.io.ports.8.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit\\4.7.0\\system.reflection.emit.4.7.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.4.1\\system.reflection.metadata.1.4.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.caching\\4.7.0\\system.runtime.caching.4.7.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.6.0\\system.runtime.compilerservices.unsafe.4.6.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.accesscontrol\\6.0.0\\system.security.accesscontrol.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.cng\\4.5.0\\system.security.cryptography.cng.4.5.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.pkcs\\4.5.0\\system.security.cryptography.pkcs.4.5.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.protecteddata\\6.0.0\\system.security.cryptography.protecteddata.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.security.cryptography.xml\\4.5.0\\system.security.cryptography.xml.4.5.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.permissions\\6.0.0\\system.security.permissions.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.security.principal.windows\\4.7.0\\system.security.principal.windows.4.7.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.speech\\7.0.0\\system.speech.7.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.codepages\\5.0.0\\system.text.encoding.codepages.5.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.channels\\4.7.1\\system.threading.channels.4.7.1.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.tasks.extensions\\4.3.0\\system.threading.tasks.extensions.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.threading.tasks.parallel\\4.3.0\\system.threading.tasks.parallel.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.xml.xmldocument\\4.3.0\\system.xml.xmldocument.4.3.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\touchsocket\\2.0.0\\touchsocket.2.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\touchsocket.core\\2.0.0\\touchsocket.core.2.0.0.nupkg.sha512",
+ "C:\\Users\\Lenovo\\.nuget\\packages\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
index 91fb2074..b8f0bc30 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
index 977dfe5b..96ac78bd 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-46c74bdf2480bff185fcd121ec7cb38d60038ffc9c6d12d74337261a568828ce
-=======
-3c08b2a6f95957043123cba0d01dcd1675663fc7
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+6be9db650a8d8bff4140d0bbf31c83bd11865db201599fd593f5a315e63ce2bf
diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
index e43b7078..e37f6034 100644
--- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Common
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Common\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Common\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
index fcd8054e..d9aa6bef 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
index 116e335b..ed520ab8 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4ea047f08316e91bed4a7bfa28790e4a2cec06376c3d4ccc8ac46cad74f36cfa
-=======
-2af60005099f8dd0481f84ac0dfadb89cc4b6f1d
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+0ee46d7000a959c5af737321e5a6fa9902809161139b4d504e5b9ce11007b118
diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
index 987e6af9..bf1e4ba3 100644
--- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.EventBus
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.EventBus\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.EventBus\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
index 93109f44..b5d4f7b4 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
index e1c9b3c1..d5bd9535 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4beb33250e0f70d033fcab9bba694ecf77320b831f3ce847878c93862915af6e
-=======
-790ffd47e6e46a3c8a83558ad3550154a5c81377
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+0067d3d82de1193dcddb43c7d3e102921aadf588776d3e1ec96644e223ad55dc
diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
index 75d65c67..9ff4dd0c 100644
--- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Extensions\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
index 1878a1a1..37a2fdbd 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
index 6ca2ac0f..7474b7f3 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-006c85e2f6346d3768a5436c2a837ef449e68c0a41706c4a3d7aa5b46d778a99
-=======
-7d60a94dd38c10522cbfe4a021ccb6e9c5da0354
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+b9ee2cda1f5bf1572094fc104d8a4ebb8e8bca2323bfccbd0589759456144781
diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
index 78bd9222..d158aae3 100644
--- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,9 +1,5 @@
is_global = true
build_property.RootNamespace = Admin.Core.FrameWork
-<<<<<<< HEAD
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.FrameWork\
-=======
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.FrameWork\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
index 63083466..98dcab4a 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
index 19f95980..628e768e 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-45addee8850bceee5bd10a497cf8557a22350b61fccf5d7e68772e96ff247392
-=======
-80bb097f76aa594dc58289065a284d1acbd8bdff
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+d398f3b0eab633951c1c8519654d02bbe6acbd8ccfe1cd726a70d2fe1f12f0a8
diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
index 7d227ef6..8e921e97 100644
--- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IRepository\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
index f39909d5..5586c51c 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
index 9c7f400c..a466be4c 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-359bc4838b66bd6acc960b7940d460416823313184a69faaa379966f1a45a03b
-=======
-51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+99a95143dfe1df5d5d28153c6b714eb0c8be066326c7d297e89d609c9328934b
diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
index 7ccb1e1e..ddd2b80b 100644
--- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.IService\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
index 9980d38a..e7430eb8 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ac6266f5a5b3389d62c713916526556c063db9b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
index bbe9abe1..d36e9596 100644
--- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
+++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache
@@ -1 +1 @@
-f6af4f2983ca7fe495be456901efbe746435add2d0f2f6f533cdda5e1fdf8b31
+4585e0f8a2b4013148250ceaa63875923bfb14b411030bcd783fc8a6e36fb829
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
index 24907b61..6c8f3c91 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
index 85dca559..ca00f36c 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f6b00de97539aff6e53cbd3c6252ed46f038e0c2f5d2f1f9c61607b34c899092
-=======
-0868e6bde5b49a65a126b91d794e990427a11761
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+8140cee0110192d338783b7d890859de94d8e7ce570515eb1724f535615ad9db
diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
index eba502bd..a5e40532 100644
--- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,10 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.RealTimeService
-<<<<<<< HEAD
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.RealTimeService\
-=======
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.RealTimeService\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
->>>>>>> 346821a670b23ccc6bf0121bb0363fb2fb2b4f48
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
index 8246c17b..d4c1aa5d 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
index b241eb8f..cb589cc7 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-664c217c277ce07ac70e2d81733564bcbc70269dbeb5740dbdfb8d1a570d0786
-=======
-046606c52f7e20e88e6dd5ffc01e33664c4b9ff8
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+97962d578fd64685d0ef3a4a853a70a8c076186aeba8bc5ae941a5bd4a5f80bc
diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
index 567ae76f..8f3ae2b8 100644
--- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Repository\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
index 8a1d4398..ceef934c 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
index 0f15a468..9f3beb56 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-f59d1862e375e8e54ad9e5218f27b988b8b239823671ce855cdb7fad9304ea07
-=======
-dbec6c73777a8ebf7006f00f1928199755951ac1
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+afc06f10a959a325d63a96d622d3efb448e14ac9b2cbea6611ea5b02ee0c233c
diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
index a8331c60..614f9a4b 100644
--- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Serilog.Es
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Serilog.Es\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Serilog.Es\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
index 1e8397bf..228f9312 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
index e912d64f..6404ed5c 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1701bfa6f5611d7194cf44ff09851cfb25f4fc63abb93fcc29e110dba6ecee15
-=======
-ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+2abb3a48977f91def2b27b81fa2d16987041c6823d1a2c8d734d8ee095f2989a
diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
index ade53e61..7659a045 100644
--- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Service\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
index 95c7214c..73e9d6d3 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs
@@ -14,11 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-<<<<<<< HEAD
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d543bd47abbff9762adec5f4401d6abc5fc05815")]
-=======
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
index 7c09e26e..10c30bb3 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-151b14434a80c2311224726e426eb1413901a0dd483fcfffbda057ea1c38c118
-=======
-da4240456d30e56fa6c5e71babf5565adb3e1436
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+81197e7a019dbcaf54123c23552597fbc7c696b79a7fcaa2c269210f12d6d871
diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
index aa57dd8c..9a880b7c 100644
--- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,6 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks
-build_property.ProjectDir = E:\c#\AUCMA\new\Admin.Core.Tasks\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\
+build_property.EnableComHosting =
+build_property.EnableGeneratedComInterfaceComImportInterop =
diff --git a/Aucma.Core.DataCollector/Factory/Class1.cs b/Aucma.Core.DataCollector/Factory/Class1.cs
deleted file mode 100644
index 1b5c4494..00000000
--- a/Aucma.Core.DataCollector/Factory/Class1.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Admin.Core.IService.IService_New;
-using Admin.Core.Model.Model_New;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Aucma.Core.DataCollector.Factory
-{
- internal class Class1 : DataCollectorFactory
- {
- public Class1(IBaseDeviceParamServices deviceParamServices, IRecordDeviceAlarmInfoServices deviceAlarmInfoServices, IRecordDeviceElectricityServices deviceElectricityServices) : base(deviceParamServices, deviceAlarmInfoServices, deviceElectricityServices)
- {
- }
-
- public override void CollectDeviceAlarmInfo(out List<Record_DeviceAlarmInfo> deviceAlarmInfos)
- {
- throw new NotImplementedException();
- }
-
- public override void CollectDeviceElectricity(out Record_DeviceElectricity deviceElectricity)
- {
- throw new NotImplementedException();
- }
- }
-}
diff --git a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
index 801ad970..b74c1597 100644
--- a/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
+++ b/Aucma.Core.DataCollector/Factory/PalletizFactory.cs
@@ -97,11 +97,8 @@ namespace Aucma.Core.DataCollector.Factory
Console.WriteLine($"{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}采集设备用电数据");
var plc = _plc.plc;
-<<<<<<< HEAD
deviceElectricitys = new List<Record_DeviceElectricity>();
-=======
- var info = plc.Read("D7602", 40);
->>>>>>> 4526e6c3694f43fe635f9bd2d04e8613542e144b
+
string[] ground = new string[] { "D7602", "D7604", "D7606", "D7608", "D7610", "D7612", "D7630", "D7634", "D7638", "D7642" };
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
index 0a8f64ad..e915e44d 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+8ac6266f5a5b3389d62c713916526556c063db9b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fba8cd4d68ad6743f2dbb1218c1a88c540b73c72")]
[assembly: System.Reflection.AssemblyProductAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyTitleAttribute("HwControlLib")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
index 0965dae0..510378c0 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.AssemblyInfoInputs.cache
@@ -1 +1 @@
-1b7365ac981710914468231997c0fa32c8211baf516f31dc79d9def8e3dc9f73
+884193e333d4b722a3816ea6e579b624e393398a42dd9b3834e4ef7fa5893d77
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
index 2dc5ad687129f0c7389800c9ff71513b09a49a2d..51e71961ca4bb7875ddebacffd8186c27e2916c4 100644
GIT binary patch
literal 324
zcmWIWc6a1qU|`sGdAgrO8>i-UpIHtQ)-KHuOGwyVKb`lHg01>-=I~o>4vauWL;@C|
zIt6E|n9$<XqT(2z)V%z%{20Bw()84ln1aOQ?8Nlc;uw%wW-eASPxmxD?VtF(Z~fCn
z%`q;iWv&$kMXANbG0yq91^IcYc_qa${%L7BnR%%S0Z_dlt>$p8Pq#09+PXa^EVH;Y
zF-IY|q%<WnU%|-0&@v`CBe5toCC0DRJ+%Z`uRhRi0Y&-gMTxlzZkahi$E4(!<N+O5
aoRSSu?UtC6lLWNQEk7qEwFqP%J^%nw174s2
literal 198
zcmWIWc6a1qU|=|Y*e#`<wUIeIcIq)f_c9iN)_nc#YaXAmbJArzC%?h$5Ks-VfC;Ej
z-q|W9v^ce>IL6V%*V8XXFRwH`wIrq>F*!RiJ+(LnWR|9jRZMPbab99_aDG}zOtNxJ
ZS+S9Ukx@)>N_LE2se5Wk08}|4n*n@tDNz6b
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
index 80297457..ff0e609b 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache
@@ -16,5 +16,5 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
194-2005446070
Themes\Generic.xaml;
-True
+False
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
index bd88c141..a108c74c 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
@@ -1,23 +1,26 @@
{
"format": 1,
"restore": {
- "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj": {}
+ "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {}
},
"projects": {
- "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj": {
+ "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -25,8 +28,9 @@
"net6.0-windows"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -38,6 +42,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -62,7 +71,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
index 410044ed..29d9b574 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
@@ -5,12 +5,14 @@
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
- <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\ADMIN\.nuget\packages\;D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Lenovo\.nuget\packages\;D:\开发环境\DevExpress\Components\Offline Packages;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.6.0</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.9.1</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\ADMIN\.nuget\packages\" />
- <SourceRoot Include="D:\mesnacSoft\c#\vs2022\sdk\NuGetPackages\" />
+ <SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" />
+ <SourceRoot Include="D:\开发环境\DevExpress\Components\Offline Packages\" />
+ <SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
+ <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json
index 3fc6acff..a3f1b835 100644
--- a/HwControlLib/obj/project.assets.json
+++ b/HwControlLib/obj/project.assets.json
@@ -8,23 +8,28 @@
"net6.0-windows7.0": []
},
"packageFolders": {
- "C:\\Users\\ADMIN\\.nuget\\packages\\": {},
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages": {}
+ "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages": {},
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\ADMIN\\.nuget\\packages\\",
- "outputPath": "E:\\c#\\AUCMA\\new\\HwControlLib\\obj\\",
+ "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
+ "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
"fallbackFolders": [
- "D:\\mesnacSoft\\c#\\vs2022\\sdk\\NuGetPackages"
+ "D:\\开发环境\\DevExpress\\Components\\Offline Packages",
+ "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
+ "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
],
"configFilePaths": [
- "C:\\Users\\ADMIN\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
+ "C:\\Program Files (x86)\\NuGet\\Config\\DevExpress 22.1.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
@@ -32,8 +37,9 @@
"net6.0-windows"
],
"sources": {
- "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
- "https://api.nuget.org/v3/index.json": {}
+ "D:\\开发环境\\DevExpress\\Components\\System\\Components\\Packages": {},
+ "https://api.nuget.org/v3/index.json": {},
+ "https://nuget.cnblogs.com/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -45,6 +51,11 @@
"warnAsError": [
"NU1605"
]
+ },
+ "restoreAuditProperties": {
+ "enableAudit": "true",
+ "auditLevel": "low",
+ "auditMode": "direct"
}
},
"frameworks": {
@@ -69,7 +80,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.306\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.202\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache
index a248d686..6939b358 100644
--- a/HwControlLib/obj/project.nuget.cache
+++ b/HwControlLib/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "o/CJUnM2bXJ203H1fZyY0hmxjifnu4IrxmXTTw01t8RbPVUTNGgU/9KCdt8cN6ejTY2ysaA++55IbCdsledzFg==",
+ "dgSpecHash": "8VHCZjfxPgjrzPcG94ZcZRTYMLoR3BoZWYVsc5F8CcWA2w5qr9WzBXilpzCvLkq4aV7eWTwXrr0qnESvVVeeyQ==",
"success": true,
- "projectFilePath": "E:\\c#\\AUCMA\\new\\HwControlLib\\HwControlLib.csproj",
+ "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file