From f7d77c366f5d2a0e86725de68d84d9293ecdf0da Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 4 Jan 2024 09:22:20 +0800
Subject: [PATCH 1/4] =?UTF-8?q?add=20-=20=E9=97=A8=E4=BD=93=E5=8F=91?=
=?UTF-8?q?=E6=B3=A1=E6=B7=BB=E5=8A=A0=E5=8F=91=E6=B3=A1=E6=9C=BA=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Aucma.Core.DoorFoam.csproj | 3 +
.../Aucma.Core.DoorFoam.csproj.user | 3 +
.../Business/CollectionFoamMachine.cs | 261 +++++++++
.../Models/FoamMachinesModel.cs | 310 ++++++++++
.../Models/LastShotRecordModel.cs | 56 ++
.../ViewModels/FoamMachinesPageViewModel.cs | 514 +++++++++++++++++
.../ViewModels/MainWindowViewModel.cs | 4 +
.../Views/FoamMachinesPageView.xaml | 531 ++++++++++++++++++
.../Views/FoamMachinesPageView.xaml.cs | 30 +
Aucma.Core.DoorFoam/Views/MainWindow.xaml | 2 +-
10 files changed, 1713 insertions(+), 1 deletion(-)
create mode 100644 Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
create mode 100644 Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
create mode 100644 Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs
create mode 100644 Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
create mode 100644 Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
create mode 100644 Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs
diff --git a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
index 18b7ed36..87091b19 100644
--- a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
+++ b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj
@@ -79,6 +79,9 @@
</ItemGroup>
<ItemGroup>
+ <Compile Update="Views\FoamMachinesPageView.xaml.cs">
+ <SubType>Code</SubType>
+ </Compile>
<Compile Update="Views\StatisticsPageView.xaml.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
index 951b24be..e085db73 100644
--- a/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
+++ b/Aucma.Core.DoorFoam/Aucma.Core.DoorFoam.csproj.user
@@ -12,6 +12,9 @@
</Compile>
</ItemGroup>
<ItemGroup>
+ <Page Update="Views\FoamMachinesPageView.xaml">
+ <SubType>Designer</SubType>
+ </Page>
<Page Update="Views\IndexPageView.xaml">
<SubType>Designer</SubType>
</Page>
diff --git a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
new file mode 100644
index 00000000..0024adfe
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
@@ -0,0 +1,261 @@
+using Admin.Core.Common.Helper;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.HwPLc;
+
+using NetTaste;
+using NPOI.Util;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+
+namespace Aucma.Core.DoorFoam.Business
+{
+ /// <summary>
+ /// 采集发泡机数据
+ /// </summary>
+ public class CollectionFoamMachine
+ {
+ private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
+ List<FoamMachinesModel> foamMachinesList = new List<FoamMachinesModel>();
+ private static BoxLastShotRecord tempLastRecord = null;
+
+ public void startCollect()
+ {
+ Task.Run( () =>
+ {
+ Task.Delay(2000);
+
+ //Thread.Sleep(6000);
+ var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamMachinePlc"));
+ if (obj != null)
+ {
+ ReadEquipSystem(obj, "DB50.388"); //采集1系统
+ //ReadEquipSystem(obj, "DB50.642"); //采集2系统
+ //ReadGunData(obj, "DB50.896"); //A1枪数据
+ //ReadGunData(obj, "DB50.1084"); //A1枪数据
+ //ReadGunData(obj, "DB50.1272"); //A1枪数据
+ //ReadGunData(obj, "DB50.1460"); //A1枪数据
+
+ }
+
+ });
+ }
+
+ /// <summary>
+ /// 采集设备系统参数
+ /// </summary>
+ /// <returns></returns>
+ static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr)
+ {
+ if (obj == null && !obj.plc.IsConnected) return;
+ if (obj.plc.IsConnected)
+ {
+ FoamMachinesModel mode=new FoamMachinesModel();
+ byte[] info = obj.plc.Read(startStr, 170);
+ int temp1 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray()));
+ int temp2 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray()));
+ float temp3 = byteToFloat(info.Skip(2).Take(4).ToArray());
+
+ float temp4 = byteToFloat(info.Skip(14).Take(4).ToArray());
+ float temp5 = byteToFloat(info.Skip(18).Take(4).ToArray());
+ float temp6 = byteToFloat(info.Skip(22).Take(4).ToArray());
+
+ float temp7 = byteToFloat(info.Skip(34).Take(4).ToArray());
+ float temp8 = byteToFloat(info.Skip(38).Take(4).ToArray());
+ float temp9 = byteToFloat(info.Skip(42).Take(4).ToArray());
+
+ float temp10 = byteToFloat(info.Skip(82).Take(4).ToArray());
+
+ float temp11 = byteToFloat(info.Skip(94).Take(4).ToArray());
+ float temp12 = byteToFloat(info.Skip(98).Take(4).ToArray());
+ float temp13 = byteToFloat(info.Skip(102).Take(4).ToArray());
+
+ float temp14 = byteToFloat(info.Skip(114).Take(4).ToArray());
+ float temp15 = byteToFloat(info.Skip(118).Take(4).ToArray());
+ float temp16 = byteToFloat(info.Skip(122).Take(4).ToArray());
+
+ float temp17 = byteToFloat(info.Skip(162).Take(4).ToArray());
+ float temp18 = byteToFloat(info.Skip(166).Take(4).ToArray());
+
+ }
+ }
+
+ /// <summary>
+ /// 每一枪数据 ---A1,B1,A2,B2
+ /// </summary>
+ /// <returns></returns>
+ static void ReadGunData(HwPLc.PlcModel obj, string startStr)
+ {
+ if (obj == null && !obj.plc.IsConnected) return;
+ if (obj.plc.IsConnected)
+ {
+
+ byte[] info = obj.plc.Read(startStr, 88);
+
+ float temp1 = byteToFloat(info.Skip(0).Take(4).ToArray());
+ float temp2 = byteToFloat(info.Skip(4).Take(4).ToArray());
+ float temp3 = byteToFloat(info.Skip(8).Take(4).ToArray());
+ float temp4 = byteToFloat(info.Skip(12).Take(4).ToArray());
+ float temp5 = byteToFloat(info.Skip(16).Take(4).ToArray());
+ float temp6 = byteToFloat(info.Skip(20).Take(4).ToArray());
+ float temp7 = byteToFloat(info.Skip(24).Take(4).ToArray());
+ float temp8 = byteToFloat(info.Skip(28).Take(4).ToArray());
+
+ short temp9 = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber);
+ int temp10 = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+ float temp11 = byteToFloat(info.Skip(42).Take(4).ToArray());
+ float temp12 = byteToFloat(info.Skip(46).Take(4).ToArray());
+ float temp13 = byteToFloat(info.Skip(50).Take(4).ToArray());
+ float temp14 = byteToFloat(info.Skip(54).Take(4).ToArray());
+ int temp15 = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+ int temp16 = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+ float temp17 = byteToFloat(info.Skip(66).Take(4).ToArray());
+ float temp18 = byteToFloat(info.Skip(70).Take(4).ToArray());
+ int temp19 = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+ int temp20 = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+ int temp21 = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
+
+ int temp22 = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray()));
+ }
+ }
+
+ ///// <summary>
+ ///// 采集最后一枪数据
+ ///// </summary>
+ ///// <returns></returns>
+ //public async Task CollectLast()
+ //{
+ // var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("Plc1"));
+ // if (obj != null && obj.plc.IsConnected)
+ // {
+ // BoxLastShotRecord lastShotRecord = new BoxLastShotRecord();
+ // byte[] info = obj.plc.ReadBytes("DB50.896", (ushort)88);
+ // IByteTransform byteTransform = new RegularByteTransform();
+
+ // lastShotRecord.System = "1";
+ // lastShotRecord.GunCode = "A1";
+ // lastShotRecord.GunCode = "A1";
+ // #region 赋值
+ // lastShotRecord.PolTemp = Encoding.ASCII.GetString(info.Skip(0).Take(4).ToArray());
+ // lastShotRecord.PolHp = StringChange.bytesToHexStr(info.Skip(4).Take(4).ToArray(), 4);
+ // lastShotRecord.PolVol = StringChange.bytesToHexStr(info.Skip(8).Take(4).ToArray(), 4);
+ // lastShotRecord.PolUsage = StringChange.bytesToHexStr(info.Skip(12).Take(4).ToArray(), 4);
+ // lastShotRecord.IsoTemp = StringChange.bytesToHexStr(info.Skip(16).Take(4).ToArray(), 4);
+ // lastShotRecord.IsoHp = StringChange.bytesToHexStr(info.Skip(20).Take(4).ToArray(), 4);
+ // lastShotRecord.IsoVol = StringChange.bytesToHexStr(info.Skip(24).Take(4).ToArray(), 4);
+ // lastShotRecord.IsoUsage = StringChange.bytesToHexStr(info.Skip(28).Take(4).ToArray(), 4);
+ // lastShotRecord.PourNu = StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2);
+ // lastShotRecord.SetTime = StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4);
+ // lastShotRecord.SetWeight = StringChange.bytesToHexStr(info.Skip(42).Take(4).ToArray(), 4);
+ // lastShotRecord.SetRatio = StringChange.bytesToHexStr(info.Skip(46).Take(4).ToArray(), 4);
+ // lastShotRecord.PourWeight = StringChange.bytesToHexStr(info.Skip(50).Take(4).ToArray(), 4);
+ // lastShotRecord.PourRatio = StringChange.bytesToHexStr(info.Skip(54).Take(4).ToArray(), 4);
+ // lastShotRecord.MpTime = StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4);
+ // lastShotRecord.HpTime = StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4);
+ // lastShotRecord.HydrPress = StringChange.bytesToHexStr(info.Skip(66).Take(4).ToArray(), 4);
+ // lastShotRecord.HydrTemp = StringChange.bytesToHexStr(info.Skip(70).Take(4).ToArray(), 4);
+ // lastShotRecord.MixpistOn = StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4);
+ // lastShotRecord.MixpistOff = StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4);
+ // lastShotRecord.TotalYield = StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4);
+ // lastShotRecord.PourEnd = StringChange.bytesToHexStr(info.Skip(87).Take(1).ToArray(), 1);
+ // lastShotRecord.CreateTime = DateTime.Now;
+ // #endregion
+
+ // //if (tempLastRecord == null)
+ // //{
+ // // //数据库查
+ // // tempLastRecord = _lastShotRecordServices.Query(x => x.System == lastShotRecord.System && x.ProductLineCode == lastShotRecord.ProductLineCode && x.GunCode == lastShotRecord.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ // //}
+ // //if (tempLastRecord == null || !tempLastRecord.MixpistOff.Equals(lastShotRecord.MixpistOff))
+ // //{
+ // // // 刷新页面
+ // // RefreshLastShotDataDelegateEvent?.Invoke(lastShotRecord);
+ // // //保存
+ // // _lastShotRecordServices.AddAsync(lastShotRecord);
+ // // tempLastRecord = lastShotRecord;
+ // //}
+ // }
+ //}
+
+ #region 字符工具转换方法
+ /// byte[]转十进制ascii码
+ /// </summary>
+ /// <param name="bytes"></param>
+ static string ByteArrayToString(byte[] bytes)
+ {
+ string result = string.Empty;
+ foreach (byte b in bytes)
+ {
+ int decimalValue = Convert.ToInt32(b); // 将字节转换为十进制值
+ result += decimalValue;
+ }
+ return result;
+ }
+ /// <summary>
+ /// byte[]转二进制
+ /// </summary>
+ /// <param name="bytes"></param>
+ static string ByteArrayToBinary(byte[] bytes)
+ {
+ StringBuilder binaryString = new StringBuilder();
+
+ foreach (byte b in bytes)
+ {
+ binaryString.Append(Convert.ToString(b, 2).PadLeft(8, '0'));
+ }
+
+ // Console.WriteLine(binaryString);
+
+ string reversedStr = new string(binaryString.ToString().Reverse().ToArray());
+ // Console.WriteLine(reversedStr);
+
+ return reversedStr;
+ }
+
+ /// <summary>
+ /// 根据二进制字符串确定夹具状态 1正常生产 2暂停生产
+ /// </summary>
+ static int judgeStatus(string str1)
+ {
+ int item1 = 0;
+ if (str1.Substring(0, 1) == "1")
+ {
+ item1 = 1; //
+ }
+ else if (str1.Substring(1, 1) == "1")
+ {
+ item1 = 2; //
+ }
+ return item1;
+ }
+
+
+ /// <summary>
+ /// byte数组转换为float
+ /// </summary>
+ static float byteToFloat(byte[] list)
+ {
+ float result = 0.00f;
+ Array.Reverse(list);
+ result = BitConverter.ToSingle(list, 0);
+ return result;
+
+ }
+
+ #endregion
+ }
+
+
+}
+
+
+
+
+
diff --git a/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
new file mode 100644
index 00000000..f145cb7f
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
@@ -0,0 +1,310 @@
+using Admin.Core.IService;
+using Admin.Core.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+ public partial class FoamMachinesModel
+ {
+ #region 料位
+ /// <summary>
+ /// POL料位
+ /// </summary>
+ public int Syst1_POLMaterialLevel { get; set; }
+
+ /// <summary>
+ /// ISO料位
+ /// </summary>
+ public int Syst1_ISOMaterialLevel { get; set; }
+ #endregion
+
+ #region 温度
+ /// <summary>
+ /// Plo温度
+ /// </summary>
+ public string Syst1_PolTmperature { get; set; }
+ /// <summary>
+ /// ISO温度
+ /// </summary>
+ public string Syst1_IsoTmperature { get; set; }
+
+ #endregion
+
+ #region 压力
+ /// <summary>
+ /// Pol压力
+ /// </summary>
+ public string Syst1_PolPressure { get; set; }
+
+ /// <summary>
+ /// Iso压力
+ /// </summary>
+ public string Syst1_IsoPressure { get; set; }
+
+ #endregion
+
+ #region 温度
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ public string Syst1_PolTemperature { get; set; }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ public string Syst1_IsoTemperature { get; set; }
+ #endregion
+
+ #region 输出压力
+ /// <summary>
+ /// POL输出压力
+ /// </summary>
+ public string Syst1_PolOutputPressure { get; set; }
+ /// <summary>
+ /// ISO输出压力
+ /// </summary>
+ public string Syst1_IsoOutputPressure { get; set; }
+ #endregion
+
+ #region 流量
+ /// <summary>
+ /// POL流量
+ /// </summary>
+ public string Syst1_PolFlow { get; set; }
+ /// <summary>
+ /// ISO流量
+ /// </summary>
+ public string Syst1_IsoFlow { get; set; }
+ #endregion
+
+ #region 原料用量
+ /// <summary>
+ /// POL流量
+ /// </summary>
+ public string Syst1_PolMaterialLeve { get; set; }
+ /// <summary>
+ /// ISO流量
+ /// </summary>
+ public string Syst1_IsoMaterialLeve { get; set; }
+ #endregion
+
+ #region 液压
+ /// <summary>
+ /// 液压压力
+ /// </summary>
+ public string Syst1_Pressure { get; set; }
+ /// <summary>
+ /// 液压
+ /// </summary>
+ public string Syst1_Temperature { get; set; }
+ #endregion
+
+ #region 结束信号
+ /// <summary>
+ /// A1结束信号
+ /// </summary>
+ public string Syst1_A1_End { get; set; }
+ /// <summary>
+ /// 结束信号
+ /// </summary>
+ public string Syst1_B1_End { get; set; }
+ #endregion
+
+ #region A1-B1 POL注料压力
+ /// <summary>
+ /// A1 POL注料压力
+ /// </summary>
+ public string Syst1_A1_POLPressure { get; set; }
+ /// <summary>
+ /// B1 POL注料压力
+ /// </summary>
+ public string Syst1_B1_POLPressure { get; set; }
+ #endregion
+
+ #region A1-B1 POL注料温度
+ /// <summary>
+ /// A1 POL注料温度
+ /// </summary>
+ public string Syst1_A1_POLTemperature { get; set; }
+ /// <summary>
+ /// B1 POL注料温度
+ /// </summary>
+ public string Syst1_B1_POLTemperature { get; set; }
+ #endregion
+
+ #region A1-B1 ISO注料压力
+ /// <summary>
+ /// A1 ISO注料压力
+ /// </summary>
+ public string Syst1_A1_ISOPressure { get; set; }
+ /// <summary>
+ /// B1 ISO注料压力
+ /// </summary>
+ public string Syst1_B1_ISOPressure { get; set; }
+ #endregion
+
+ #region A1-B1 ISO注料压力
+ /// <summary>
+ /// A1 ISO注料压力
+ /// </summary>
+ public string Syst1_A1_ISOTemperature { get; set; }
+ /// <summary>
+ /// B1 ISO注料压力
+ /// </summary>
+ public string Syst1_B1_ISOTemperature { get; set; }
+ #endregion
+
+
+ #region 系统2料位
+ /// <summary>
+ /// POL料位
+ /// </summary>
+ public int Syst2_POLMaterialLevel { get; set; }
+
+ /// <summary>
+ /// ISO料位
+ /// </summary>
+ public int Syst2_ISOMaterialLevel { get; set; }
+ #endregion
+
+ #region 系统2温度
+ /// <summary>
+ /// Plo温度
+ /// </summary>
+ public string Syst2_PolTmperature { get; set; }
+ /// <summary>
+ /// ISO温度
+ /// </summary>
+ public string Syst2_IsoTmperature { get; set; }
+
+ #endregion
+
+ #region 系统2压力
+ /// <summary>
+ /// Pol压力
+ /// </summary>
+ public string Syst2_PolPressure { get; set; }
+
+ /// <summary>
+ /// Iso压力
+ /// </summary>
+ public string Syst2_IsoPressure { get; set; }
+
+ #endregion
+
+ #region 系统2温度
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ public string Syst2_PolTemperature { get; set; }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ public string Syst2_IsoTemperature { get; set; }
+ #endregion
+
+ #region 系统2输出压力
+ /// <summary>
+ /// POL输出压力
+ /// </summary>
+ public string Syst2_PolOutputPressure { get; set; }
+ /// <summary>
+ /// ISO输出压力
+ /// </summary>
+ public string Syst2_IsoOutputPressure { get; set; }
+ #endregion
+
+ #region 系统2流量
+ /// <summary>
+ /// POL流量
+ /// </summary>
+ public string Syst2_PolFlow { get; set; }
+ /// <summary>
+ /// ISO流量
+ /// </summary>
+ public string Syst2_IsoFlow { get; set; }
+ #endregion
+
+ #region 系统2原料用量
+ /// <summary>
+ /// POL流量
+ /// </summary>
+ public string Syst2_PolMaterialLeve { get; set; }
+ /// <summary>
+ /// ISO流量
+ /// </summary>
+ public string Syst2_IsoMaterialLeve { get; set; }
+ #endregion
+
+ #region 系统2液压
+ /// <summary>
+ /// 液压压力
+ /// </summary>
+ public string Syst2_Pressure { get; set; }
+ /// <summary>
+ /// 液压
+ /// </summary>
+ public string Syst2_Temperature { get; set; }
+ #endregion
+
+ #region 系统2结束信号
+ /// <summary>
+ /// A1结束信号
+ /// </summary>
+ public string Syst2_A1_End { get; set; }
+ /// <summary>
+ /// 结束信号
+ /// </summary>
+ public string Syst2_B1_End { get; set; }
+ #endregion
+
+ #region 系统2 A1-B1 POL注料压力
+ /// <summary>
+ /// A1 POL注料压力
+ /// </summary>
+ public string Syst2_A1_POLPressure { get; set; }
+ /// <summary>
+ /// B1 POL注料压力
+ /// </summary>
+ public string Syst2_B1_POLPressure { get; set; }
+ #endregion
+
+ #region 系统2 A1-B1 POL注料温度
+ /// <summary>
+ /// A1 POL注料温度
+ /// </summary>
+ public string Syst2_A1_POLTemperature { get; set; }
+ /// <summary>
+ /// B1 POL注料温度
+ /// </summary>
+ public string Syst2_B1_POLTemperature { get; set; }
+ #endregion
+
+ #region 系统2 A1-B1 ISO注料压力
+ /// <summary>
+ /// A1 ISO注料压力
+ /// </summary>
+ public string Syst2_A1_ISOPressure { get; set; }
+ /// <summary>
+ /// B1 ISO注料压力
+ /// </summary>
+ public string Syst2_B1_ISOPressure { get; set; }
+ #endregion
+
+ #region 系统2 A1-B1 ISO注料压力
+ /// <summary>
+ /// A1 ISO注料压力
+ /// </summary>
+ public string Syst2_A1_ISOTemperature { get; set; }
+ /// <summary>
+ /// B1 ISO注料压力
+ /// </summary>
+ public string Syst2_B1_ISOTemperature { get; set; }
+ #endregion
+ }
+}
diff --git a/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs b/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs
new file mode 100644
index 00000000..818421a6
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Models/LastShotRecordModel.cs
@@ -0,0 +1,56 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.Models
+{
+ public class LastShotRecordModel
+ {
+ public int No { get; set; }
+ /// <summary>
+ /// 所属系统;1系统 2系统
+ /// </summary>
+ public string System { get; set; }
+ /// <summary>
+ /// 枪头
+ /// </summary>
+ public string GunHead { get; set; }
+ /// <summary>
+ /// 工位号
+ /// </summary>
+ public string StationNumber { get; set; }
+
+ /// <summary>
+ /// POL注料压力
+ /// </summary>
+ public string PolInjectionpressure { get; set; }
+
+ /// <summary>
+ /// ISO注料压力
+ /// </summary>
+ public string IsoInjectionpressure { get; set; }
+
+ /// <summary>
+ /// POL注料温度
+ /// </summary>
+ public string PolInjectiontemperature { get; set; }
+
+ /// <summary>
+ /// ISO注料温度
+ /// </summary>
+ public string IsoInjectiontemperature { get; set; }
+
+ /// <summary>
+ /// 最后一次时间
+ /// </summary>
+ public DateTime LastTime { get; set; }
+
+ /// <summary>
+ /// 创建时间
+ /// </summary>
+ public DateTime Createtime { get; set; }
+ }
+}
diff --git a/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
new file mode 100644
index 00000000..0e5687d9
--- /dev/null
+++ b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
@@ -0,0 +1,514 @@
+using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Model;
+using Admin.Core.Model.ViewModels;
+using Admin.Core.Service;
+using Admin.Core.Tasks;
+using Aucma.Core.DoorFoam.Models;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Aucma.Core.DoorFoam.ViewModels
+{
+ public partial class FoamMachinesPageViewModel : ObservableObject
+ {
+ IBoxLastShotRecordServices _boxLastShotRecordServices;
+
+ public FoamMachinesPageViewModel()
+ {
+ Job_BoxFoamLastData_Quartz.RefreshLastShotDataDelegateEvent += RefreshData;
+ _boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
+ // LoadData();
+ //Task.WaitAll(LoadData());
+ }
+
+ public void RefreshData(BoxLastShotRecord record)
+ {
+ System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+ {
+ string system = string.Empty;
+ if (record.System == "1") {
+ system = "1系统";
+
+ // PolFlow1 = record.POLInjecFlowRate;
+ // IsoFlow1 = record.ISOInjecFlowRate;
+ // PoleTmperature1 = record.POLInjecTemperatureOfGunHead;
+ // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead;
+
+ }
+ if (record.System == "2") { system = "2系统"; }
+ LastShotRecordDataGrid.Add(new LastShotRecordModel()
+ {
+ No = LastShotRecordDataGrid.Count+1,
+ System = system,
+ GunHead = record.GunCode,
+ // StationNumber = record.StationNumber,
+ PolInjectionpressure = record.PolHp,
+ IsoInjectionpressure = record.IsoHp,
+ PolInjectiontemperature = record.PolTemp,
+ IsoInjectiontemperature = record.IsoTemp,
+ LastTime = record.CreateTime,
+ Createtime = record.CreateTime
+ });
+
+ }));
+
+
+ }
+
+
+
+ #region 加载DataGrid数据
+ private async Task LoadData()
+ {
+ System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
+ {
+ LastShotRecordDataGrid.Clear();
+
+ int i = 1;
+ var list = await _boxLastShotRecordServices.QueryAsync();
+ if (list == null) return;
+ list.OrderByDescending(d => d.CreateTime);
+ foreach (var item in list.Take(50))
+ {
+ string system = string.Empty;
+ if (item.System == "1") { system = "1系统"; }
+ if (item.System == "2") { system = "2系统"; }
+ LastShotRecordDataGrid.Add(new LastShotRecordModel()
+ {
+ No = i,
+ System = system,
+ GunHead=item.GunCode,
+ // StationNumber=item.StationNumber,
+ PolInjectionpressure = item.PolHp,
+ IsoInjectionpressure = item.IsoHp,
+ PolInjectiontemperature = item.PolTemp,
+ IsoInjectiontemperature = item.IsoTemp,
+ LastTime = item.CreateTime,
+ Createtime = item.CreateTime
+ });
+ i++;
+ };
+ // Datalist.Insert(0, Datalist[Datalist.Count - 1]);
+ // Datalist.RemoveAt(Datalist.Count - 1);
+ }));
+ }
+
+ #endregion
+
+ #region 初始化datagrid
+ private ObservableCollection<LastShotRecordModel> _lastShotRecordDataGrid = new ObservableCollection<LastShotRecordModel>();
+ public ObservableCollection<LastShotRecordModel> LastShotRecordDataGrid
+ {
+ get { return _lastShotRecordDataGrid; }
+ set
+ {
+ _lastShotRecordDataGrid = value;
+ OnPropertyChanged();//属性通知
+ }
+ }
+ #endregion
+
+
+ #region 1系统属性
+ /// <summary>
+ /// POL输入压力
+ /// </summary>
+ private string _PolInputPressure = "0.00";
+ public string PolInputPressure1
+ {
+ get => _PolInputPressure;
+ set => SetProperty(ref _PolInputPressure, value);
+ }
+ /// <summary>
+ /// ISO输入压力
+ /// </summary>
+ private string _IsoInputPressure = "0.00";
+ public string IsoInputPressure1
+ {
+ get => _IsoInputPressure;
+ set => SetProperty(ref _IsoInputPressure, value);
+ }
+ /// <summary>
+ /// POL输出压力
+ /// </summary>
+ private string _polOutputPressure = "0.0";
+ public string PolOutputPressure1
+ {
+ get => _polOutputPressure;
+ set => SetProperty(ref _polOutputPressure, value);
+ }
+ /// <summary>
+ /// ISO输出压力
+ /// </summary>
+ private string _isoOutputPressure1 = "0.0";
+ public string IsoOutputPressure1
+ {
+ get => _isoOutputPressure1;
+ set => SetProperty(ref _isoOutputPressure1, value);
+ }
+ /// <summary>
+ /// Pol流量
+ /// </summary>
+ private string _Polflow1 = "0";
+ public string PolFlow1
+ {
+ get => _Polflow1;
+ set => SetProperty(ref _Polflow1, value);
+ }
+ /// <summary>
+ /// Iso流量
+ /// </summary>
+ private string _isoflow1 = "0";
+ public string IsoFlow1
+ {
+ get => _isoflow1;
+ set => SetProperty(ref _isoflow1, value);
+ }
+
+ /// <summary>
+ /// Pol温度
+ /// </summary>
+ private string _PoleTmperature = "0";
+ public string PoleTmperature1
+ {
+ get => _PoleTmperature;
+ set => SetProperty(ref _PoleTmperature, value);
+ }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ private string _isoTemperature = "0";
+ public string IsoTemperature1
+ {
+ get => _isoTemperature;
+ set => SetProperty(ref _isoTemperature, value);
+ }
+
+ /// <summary>
+ /// 料位
+ /// </summary>
+ private string _PolMaterialLevel1 = "0";
+ public string PolMaterialLevel1
+ {
+ get => _PolMaterialLevel1;
+ set => SetProperty(ref _PolMaterialLevel1, value);
+ }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ private string _IsoMaterialLevel1 = "0";
+ public string IsoMaterialLevel1
+ {
+ get => _IsoMaterialLevel1;
+ set => SetProperty(ref _IsoMaterialLevel1, value);
+ }
+
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _pressure1 = "0.00";
+ public string Pressure1
+ {
+ get => _pressure1;
+ set => SetProperty(ref _pressure1, value);
+ }
+ /// <summary>
+ /// 温度
+ /// </summary>
+ private string _temperature1 = "0.00";
+ public string Temperature1
+ {
+ get => _temperature1;
+ set => SetProperty(ref _temperature1, value);
+ }
+ /// <summary>
+ /// A枪状态
+ /// </summary>
+ private string _status1;
+ public string Status1
+ {
+ get => _status1;
+ set => SetProperty(ref _status1, value);
+ }
+ /// <summary>
+ /// B枪状态
+ /// </summary>
+ private string _status11;
+ public string Status11
+ {
+ get => _status11;
+ set => SetProperty(ref _status11, value);
+ }
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _POLPressure1 = "0.00";
+ public string POLPressure1
+ {
+ get => _POLPressure1;
+ set => SetProperty(ref _POLPressure1, value);
+ }
+ /// <summary>
+ /// A枪POL温度
+ /// </summary>
+ private string _POLTemperature1 = "0.00";
+ public string POLTemperature1
+ {
+ get => _POLTemperature1;
+ set => SetProperty(ref _POLTemperature1, value);
+ }
+ /// <summary>
+ /// B枪POL温度
+ /// </summary>
+ private string _POLTemperature11 = "0.0";
+ public string POLTemperature11
+ {
+ get => _POLTemperature11;
+ set => SetProperty(ref _POLTemperature11, value);
+ }
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _ISOPressure1 = "0.00";
+ public string ISOPressure1
+ {
+ get => _ISOPressure1;
+ set => SetProperty(ref _ISOPressure1, value);
+ }
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _ISOPressure11 = "0.00";
+ public string ISOPressure11
+ {
+ get => _ISOPressure11;
+ set => SetProperty(ref _ISOPressure11, value);
+ }
+ /// <summary>
+ /// 温度
+ /// </summary>
+ private string _ISOTemperature11 = "0.0";
+ public string ISOTemperature11
+ {
+ get => _ISOTemperature11;
+ set => SetProperty(ref _ISOTemperature11, value);
+ }
+
+ #endregion
+
+ #region 2系统属性
+ /// <summary>
+ /// POL输入压力
+ /// </summary>
+ private string _PolInputPressure2 = "0.00";
+ public string PolInputPressure2
+ {
+ get => _PolInputPressure2;
+ set => SetProperty(ref _PolInputPressure2, value);
+ }
+ /// <summary>
+ /// ISO输入压力
+ /// </summary>
+ private string _IsoInputPressure2 = "0.00";
+ public string IsoInputPressure2
+ {
+ get => _IsoInputPressure2;
+ set => SetProperty(ref _IsoInputPressure2, value);
+ }
+ /// <summary>
+ /// POL输出压力
+ /// </summary>
+ private string _polOutputPressure2 = "0.00";
+ public string PolOutputPressure2
+ {
+ get => _polOutputPressure2;
+ set => SetProperty(ref _polOutputPressure2, value);
+ }
+ /// <summary>
+ /// ISO输出压力
+ /// </summary>
+ private string _isoOutputPressure2 = "0.00";
+ public string IsoOutputPressure2
+ {
+ get => _isoOutputPressure2;
+ set => SetProperty(ref _isoOutputPressure2, value);
+ }
+ /// <summary>
+ /// Pol流量
+ /// </summary>
+ private string _Polflow2 = "0";
+ public string PolFlow2
+ {
+ get => _Polflow2;
+ set => SetProperty(ref _Polflow2, value);
+ }
+ /// <summary>
+ /// Iso流量
+ /// </summary>
+ private string _isoflow2 = "0";
+ public string IsoFlow2
+ {
+ get => _isoflow2;
+ set => SetProperty(ref _isoflow2, value);
+ }
+
+ /// <summary>
+ /// Pol温度
+ /// </summary>
+ private string _PoleTmperature2 = "0";
+ public string PoleTmperature2
+ {
+ get => _PoleTmperature2;
+ set => SetProperty(ref _PoleTmperature2, value);
+ }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ private string _isoTemperature2 = "0";
+ public string IsoTemperature2
+ {
+ get => _isoTemperature2;
+ set => SetProperty(ref _isoTemperature2, value);
+ }
+
+ /// <summary>
+ /// 料位
+ /// </summary>
+ private string _PolMaterialLevel2 = "0";
+ public string PolMaterialLevel2
+ {
+ get => _PolMaterialLevel2;
+ set => SetProperty(ref _PolMaterialLevel2, value);
+ }
+ /// <summary>
+ /// Iso温度
+ /// </summary>
+ private string _IsoMaterialLevel2 = "0";
+ public string IsoMaterialLevel2
+ {
+ get => _IsoMaterialLevel2;
+ set => SetProperty(ref _IsoMaterialLevel2, value);
+ }
+
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _pressure2 = "0.00";
+ public string Pressure2
+ {
+ get => _pressure2;
+ set => SetProperty(ref _pressure2, value);
+ }
+ /// <summary>
+ /// 温度
+ /// </summary>
+ private string _temperature2 = "0.00";
+ public string Temperature2
+ {
+ get => _temperature2;
+ set => SetProperty(ref _temperature2, value);
+ }
+ /// <summary>
+ /// A枪状态
+ /// </summary>
+ private string _status2 = "";
+ public string Status2
+ {
+ get => _status2;
+ set => SetProperty(ref _status2, value);
+ }
+ /// <summary>
+ /// B枪状态
+ /// </summary>
+ private string _status12 = "";
+ public string Status12
+ {
+ get => _status12;
+ set => SetProperty(ref _status12, value);
+ }
+ /// <summary>
+ /// 压力
+ /// </summary>
+ private string _POLPressure2 = "0.00";
+ public string POLPressure2
+ {
+ get => _POLPressure2;
+ set => SetProperty(ref _POLPressure2, value);
+ }
+ /// <summary>
+ /// 温度
+ /// </summary>
+ private string _POLTemperature2 = "0.00";
+ public string POLTemperature2
+ {
+ get => _POLTemperature2;
+ set => SetProperty(ref _POLTemperature2, value);
+ }
+ /// <summary>
+ /// A枪压力
+ /// </summary>
+ private string _ISOPressure2 = "0.00";
+ public string ISOPressure2
+ {
+ get => _ISOPressure2;
+ set => SetProperty(ref _ISOPressure2, value);
+ }
+ /// <summary>
+ ///A枪温度
+ /// </summary>
+ private string _ISOTemperature22 = "0.0";
+ public string ISOTemperature22
+ {
+ get => _ISOTemperature22;
+ set => SetProperty(ref _ISOTemperature22, value);
+ }
+ /// <summary>
+ /// B枪温度
+ /// </summary>
+ private string _ISOTemperature222 = "0.0";
+ public string ISOTemperature222
+ {
+ get => _ISOTemperature222;
+ set => SetProperty(ref _ISOTemperature222, value);
+ }
+ /// <summary>
+ /// B枪温度
+ /// </summary>
+ private string _POLPressure22 = "0.0";
+ public string POLPressure22
+ {
+ get => _POLPressure22;
+ set => SetProperty(ref _POLPressure22, value);
+ }
+
+ /// <summary>
+ /// B枪ISO温度
+ /// </summary>
+ private string _POLTemperature22 = "0.0";
+ public string POLTemperature22
+ {
+ get => _POLTemperature22;
+ set => SetProperty(ref _POLTemperature22, value);
+ }
+
+ /// <summary>
+ /// B枪ISO压力
+ /// </summary>
+ private string _ISOPressure22 = "0.0";
+ public string ISOPressure22
+ {
+ get => _ISOPressure22;
+ set => SetProperty(ref _ISOPressure22, value);
+ }
+
+
+ #endregion
+ }
+}
diff --git a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
index 462d5336..6e4c3687 100644
--- a/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/MainWindowViewModel.cs
@@ -20,6 +20,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
private IndexPageView firstPage = new IndexPageView();//首页
//private StatisticsPageView recordPage = new StatisticsPageView();
RealTimePageView realTimePageView = new RealTimePageView();
+ FoamMachinesPageView foamMachinesPageView = new FoamMachinesPageView();
public MainWindowViewModel()
{
UserContent = firstPage;
@@ -193,6 +194,9 @@ namespace Aucma.Core.DoorFoam.ViewModels
case "RealTimePage":
UserContent = realTimePageView;
break;
+ case "FoamMachinesPage":
+ UserContent = foamMachinesPageView;
+ break;
default:
break;
}
diff --git a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
new file mode 100644
index 00000000..ce551214
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
@@ -0,0 +1,531 @@
+<UserControl x:Class="Aucma.Core.DoorFoam.Views.FoamMachinesPageView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+ xmlns:local="clr-namespace:Aucma.Core.DoorFoam.Views"
+ mc:Ignorable="d"
+ FontFamily="Microsoft YaHei"
+ d:DesignHeight="1080"
+ d:DesignWidth="1920"
+ Foreground="White"
+ FontSize="18">
+
+ <UserControl.Resources>
+ <Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
+ <Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="HorizontalAlignment" Value="Left" />
+ <Setter Property="Margin" Value="5 0 0 0" />
+ </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="Left" />
+ <Setter Property="BorderBrush" Value="#dddddd" />
+ <Setter Property="Height" Value="40"/>
+ <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="18"/>
+
+ <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>
+ </UserControl.Resources>
+
+ <Border x:Name="HeightHelperPanel" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="5">
+ <Grid>
+ <Grid.Resources>
+ <Style TargetType="TextBlock">
+ <Setter Property="VerticalAlignment" Value="Center"/>
+ <Setter Property="HorizontalAlignment" Value="Center"/>
+ <Setter Property="FontSize" Value="16"/>
+ <Setter Property="FontFamily" Value="Microsoft YaHei"/>
+ </Style>
+ <Style TargetType="Border">
+ <Setter Property="BorderBrush" Value="#0288d1"/>
+ <Setter Property="BorderThickness" Value="1"/>
+ </Style>
+ </Grid.Resources>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*" />
+ <RowDefinition Height="0.6*" />
+ </Grid.RowDefinitions>
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition />
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <Border Grid.Column="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="0.08*" />
+ <RowDefinition />
+ </Grid.RowDefinitions>
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1" >
+ <TextBlock Text="1系统" FontSize="23" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+ </Border>
+ <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="0.5*"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+ <StackPanel Grid.Column="0" Grid.Row="0" VerticalAlignment="Center"/>
+ <StackPanel Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <TextBlock Text="POL" FontSize="18" FontWeight="Bold" Foreground="White" />
+ </StackPanel>
+ <StackPanel Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center" >
+ <TextBlock Text="ISO" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </StackPanel>
+ <StackPanel Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" >
+ <TextBlock Text="输入压力" FontSize="18" Foreground="White"/>
+ </StackPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POPressure}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White" />
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+
+ <WrapPanel Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="输出压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoOutputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="流量" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="g/s" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoFlow1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="g/s" FontSize="18" Foreground="White" />
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PoleTmperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White" />
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White" />
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="料位" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="%" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoMaterialLevel1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="%" FontSize="18" Foreground="White" />
+ </WrapPanel>
+
+ <Border Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" >
+ <TextBlock Text="液压" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <WrapPanel Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding Pressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding Temperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <Border Grid.Column="0" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <Border Grid.Column="1" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="A枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <Border Grid.Column="2" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="B枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <WrapPanel Grid.Column="0" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="状态" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <TextBlock Text="{Binding Status1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <TextBlock Text="{Binding Status11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOPressure11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+ <Border Grid.Column="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="0.08*" />
+ <RowDefinition />
+ </Grid.RowDefinitions>
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" Margin="1" >
+ <TextBlock Text="2系统" FontSize="23" FontWeight="Bold" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+ </Border>
+ <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <Border Grid.Row="0" BorderBrush="#0288d1" BorderThickness="0" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="0.5*"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition/>
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+ <StackPanel Grid.Column="0" Grid.Row="0" VerticalAlignment="Center"/>
+ <StackPanel Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
+ <TextBlock Text="POL" FontSize="18" FontWeight="Bold" Foreground="White" />
+ </StackPanel>
+ <StackPanel Grid.Row="0" Grid.Column="2" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center" >
+ <TextBlock Text="ISO" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </StackPanel>
+ <StackPanel Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" >
+ <TextBlock Text="输入压力" FontSize="18" Foreground="White"/>
+ </StackPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White" />
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoInputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+
+ <WrapPanel Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="输出压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoOutputPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="流量" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="g/s" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoFlow2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="g/s" FontSize="18" Foreground="White" />
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PoleTmperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White" />
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="料位" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding PolMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="%" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding IsoMaterialLevel2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="%" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <Border Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="3" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9" >
+ <TextBlock Text="液压" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <WrapPanel Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="7" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding Pressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="8" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding Temperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <Border Grid.Column="0" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <Border Grid.Column="1" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="A枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <Border Grid.Column="2" Grid.Row="9" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="0" Background="#1157b9">
+ <TextBlock Text="B枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
+ </Border>
+ <WrapPanel Grid.Column="0" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="状态" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding Status2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="50"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10 0 0 0">
+ <TextBlock Text="{Binding Status22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="50"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding POLTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="MPa" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+
+ <WrapPanel Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Right">
+ <TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ <WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{Binding ISOTemperature222}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="℃" FontSize="18" Foreground="White"/>
+ </WrapPanel>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+ <Border Grid.Row="1" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Background="Transparent" Margin="1,1,5,5">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="auto"/>
+ <RowDefinition Height="*"/>
+ </Grid.RowDefinitions>
+
+ <DataGrid Grid.Row="0" ItemsSource="{Binding LastShotRecordDataGrid}" Background="#00000000"
+ ColumnHeaderHeight="40"
+ RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" FontSize="20"
+ GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Auto"
+ ScrollViewer.VerticalScrollBarVisibility="Auto" BorderThickness="0" CanUserAddRows="False" SelectionMode="Single" IsReadOnly="True"
+ Foreground="White" >
+ <!--修改选中字体颜色-->
+ <DataGrid.Columns>
+ <DataGridTextColumn Binding="{Binding No}" Header="编号" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding System}" Header="系统" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding GunHead}" Header="注料枪头" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding StationNumber}" Header="注料工位号" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding PolInjectionpressure}" Header="POL注料压力" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding IsoInjectionpressure}" Header="ISO注料压力" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding PolInjectiontemperature}" Header="POL注料温度" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
+ <DataGridTextColumn Binding="{Binding IsoInjectiontemperature}" Header="ISO注料温度" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ <DataGridTextColumn Binding="{Binding LastTime ,StringFormat=\{0:MM-dd HH:mm\}}" Header="采集时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
+ </DataGrid.Columns>
+ </DataGrid>
+ </Grid>
+ </Border>
+ </Grid>
+ </Border>
+
+</UserControl>
diff --git a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs
new file mode 100644
index 00000000..f26eb259
--- /dev/null
+++ b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml.cs
@@ -0,0 +1,30 @@
+using Aucma.Core.DoorFoam.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Aucma.Core.DoorFoam.Views
+{
+ /// <summary>
+ /// FoamMachinesPageView.xaml 的交互逻辑
+ /// </summary>
+ public partial class FoamMachinesPageView : UserControl
+ {
+ public FoamMachinesPageView()
+ {
+ InitializeComponent();
+ this.DataContext = new FoamMachinesPageViewModel();
+ }
+ }
+}
diff --git a/Aucma.Core.DoorFoam/Views/MainWindow.xaml b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
index c7d2a4cd..448a039b 100644
--- a/Aucma.Core.DoorFoam/Views/MainWindow.xaml
+++ b/Aucma.Core.DoorFoam/Views/MainWindow.xaml
@@ -65,7 +65,7 @@
<StackPanel Grid.Row="1" Height="50" Orientation="Horizontal" Margin="5 0" HorizontalAlignment="Left">
<Button Content="发泡线监控" x:Name="FoamLinePage" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamLinePage}" Margin="5 0" />
- <!--<Button Content="发泡机监控" x:Name="FoamMachinesPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMachinesPage}" />-->
+ <Button Content="发泡机监控" x:Name="FoamMachinesPage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=FoamMachinesPage}" />
<Button Content="生产统计" x:Name="RealTimePage" Margin="5 0" Command="{Binding SwitchPagesCommand}" CommandParameter="{Binding Name,ElementName=RealTimePage}" />
<Button Content="键 盘" x:Name="TabTip" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=TabTip}" />
<Button Content="最小化" x:Name="Minimized" Margin="5 0" Command="{Binding FormControlCommand}" CommandParameter="{Binding Name,ElementName=Minimized}" Width="100" Background="#FF9900" BorderBrush="#FF9900" />
From 4011dce31582fbde8105f34be6ebbda114a0ca1c Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 4 Jan 2024 09:44:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?change=20-=20=E9=97=A8=E4=BD=93=E5=8F=91?=
=?UTF-8?q?=E6=B3=A1=E6=9C=BA=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Business/CollectionFoamMachine.cs | 312 +++++++-----
.../Models/FoamMachinesModel.cs | 275 ++---------
.../ViewModels/FoamMachinesPageViewModel.cs | 451 ++++++++++++------
.../ViewModels/IndexPageViewModel.cs | 9 +-
.../Views/FoamMachinesPageView.xaml | 46 +-
Aucma.Core.DoorFoam/appsettings.json | 6 +-
6 files changed, 567 insertions(+), 532 deletions(-)
diff --git a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
index 0024adfe..76a82503 100644
--- a/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
+++ b/Aucma.Core.DoorFoam/Business/CollectionFoamMachine.cs
@@ -3,7 +3,7 @@ using Admin.Core.IService;
using Admin.Core.Model;
using Aucma.Core.DoorFoam.Models;
using Aucma.Core.HwPLc;
-
+using Microsoft.Extensions.DependencyInjection;
using NetTaste;
using NPOI.Util;
using System;
@@ -22,29 +22,115 @@ namespace Aucma.Core.DoorFoam.Business
/// </summary>
public class CollectionFoamMachine
{
+ /// <summary>
+ /// 刷新最后一枪DATAGRID
+ /// </summary>
+ public delegate void RefreshLastShotDataDelegate(BoxLastShotRecord record);
+ public static event RefreshLastShotDataDelegate RefreshLastShotDataDelegateEvent;
+
+ /// <summary>
+ /// 刷新每一枪数据
+ /// </summary>
+ public delegate void RefreshGunDataDelegate(Dictionary<string, BoxLastShotRecord> keys);
+ public static event RefreshGunDataDelegate RefreshGunDataDelegateEvent;
+
+ /// <summary>
+ /// 刷新系统数据
+ /// </summary>
+ public delegate void RefreshSystemDataDelegate(Dictionary<string, FoamMachinesModel> keys);
+ public static event RefreshSystemDataDelegate RefreshSystemDataDelegateEvent;
+
private static System.Text.ASCIIEncoding asciiEncoding = new System.Text.ASCIIEncoding();
List<FoamMachinesModel> foamMachinesList = new List<FoamMachinesModel>();
- private static BoxLastShotRecord tempLastRecord = null;
-
- public void startCollect()
+
+ Dictionary<string, BoxLastShotRecord> gunKeys = new Dictionary<string, BoxLastShotRecord>();
+ Dictionary<string, BoxLastShotRecord> tempKeys = new Dictionary<string, BoxLastShotRecord>();
+ // 系统参数
+ Dictionary<string, FoamMachinesModel> systemKeys = new Dictionary<string, FoamMachinesModel>();
+ Semaphore semaphore = new Semaphore(1, 1);
+
+ private readonly IBoxLastShotRecordServices? _lastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
+
+
+ public CollectionFoamMachine()
+ {
+
+ }
+
+ public void startCollect()
{
- Task.Run( () =>
+ Task.Run(() =>
{
- Task.Delay(2000);
-
- //Thread.Sleep(6000);
- var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamMachinePlc"));
- if (obj != null)
+ while (true)
{
- ReadEquipSystem(obj, "DB50.388"); //采集1系统
- //ReadEquipSystem(obj, "DB50.642"); //采集2系统
- //ReadGunData(obj, "DB50.896"); //A1枪数据
- //ReadGunData(obj, "DB50.1084"); //A1枪数据
- //ReadGunData(obj, "DB50.1272"); //A1枪数据
- //ReadGunData(obj, "DB50.1460"); //A1枪数据
-
+
+ try
+ {
+ Thread.Sleep(3000);
+ var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("FoamPlc"));
+ if (obj != null)
+ {
+ ReadEquipSystem(obj, "DB50.388", systemKeys, "1"); //采集1系统
+ ReadEquipSystem(obj, "DB50.642", systemKeys, "2"); //采集2系统
+
+ ReadGunData(obj, "DB50.896", gunKeys, "A1"); //A1枪数据
+ ReadGunData(obj, "DB50.1084", gunKeys, "B1"); //B1枪数据
+ ReadGunData(obj, "DB50.1272", gunKeys, "A2"); //A2枪数据
+ ReadGunData(obj, "DB50.1460", gunKeys, "B2"); //A2枪数据
+ RefreshSystemDataDelegateEvent?.Invoke(systemKeys);
+ RefreshGunDataDelegateEvent?.Invoke(gunKeys);
+
+
+ foreach (KeyValuePair<string, BoxLastShotRecord> kvPair in gunKeys)
+ {
+ //程序启动缓存没数据查数据库
+ if (!tempKeys.ContainsKey(kvPair.Key))
+ {
+ BoxLastShotRecord record = _lastShotRecordServices.Query(x => x.System == kvPair.Value.System && x.ProductLineCode == kvPair.Value.ProductLineCode && x.GunCode == kvPair.Value.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault();
+ if (record == null)
+ {
+ // 数据库也没数据
+ int a = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
+ RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
+ continue;
+ }
+ tempKeys.Add(kvPair.Key, record);
+ }
+ if (!kvPair.Value.MixpistOff.Equals(tempKeys[kvPair.Key].MixpistOff))
+ {
+ int b = _lastShotRecordServices.AddAsync(kvPair.Value).Result;
+ RefreshLastShotDataDelegateEvent?.Invoke(kvPair.Value);
+ }
+
+
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex);
+ }
+ finally
+ {
+
+ foreach (KeyValuePair<string, BoxLastShotRecord> kvp in gunKeys)
+ {
+ if (tempKeys.ContainsKey(kvp.Key))
+ {
+ // 键已存在，更新值
+ tempKeys[kvp.Key] = kvp.Value;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ tempKeys.Add(kvp.Key, kvp.Value);
+ }
+ }
+ // tempKeys = gunKeys;
+ }
}
-
+
});
}
@@ -52,38 +138,54 @@ namespace Aucma.Core.DoorFoam.Business
/// 采集设备系统参数
/// </summary>
/// <returns></returns>
- static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr)
+ static void ReadEquipSystem(HwPLc.PlcModel obj, string startStr, Dictionary<string, FoamMachinesModel> keys, string systemId)
{
- if (obj == null && !obj.plc.IsConnected) return;
+ if (obj == null || !obj.plc.IsConnected) return;
if (obj.plc.IsConnected)
{
- FoamMachinesModel mode=new FoamMachinesModel();
+
byte[] info = obj.plc.Read(startStr, 170);
- int temp1 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray()));
- int temp2 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray()));
- float temp3 = byteToFloat(info.Skip(2).Take(4).ToArray());
-
- float temp4 = byteToFloat(info.Skip(14).Take(4).ToArray());
- float temp5 = byteToFloat(info.Skip(18).Take(4).ToArray());
- float temp6 = byteToFloat(info.Skip(22).Take(4).ToArray());
+ if (info == null) return;
+ FoamMachinesModel model = new FoamMachinesModel();
+ model.systemId = systemId;
+
+ model.Machine_Status_0 = judgeStatus(ByteArrayToBinary(info.Skip(0).Take(1).ToArray())).ToString();
+ model.Machine_Status_1 = judgeStatus(ByteArrayToBinary(info.Skip(1).Take(1).ToArray())).ToString();
+ model.POL_Level = byteToFloat(info.Skip(2).Take(4).ToArray()).ToString();
+
+ model.POL_Temp = byteToFloat(info.Skip(14).Take(4).ToArray()).ToString();
+ model.POL_LP = byteToFloat(info.Skip(18).Take(4).ToArray()).ToString();
+ model.POL_HP = byteToFloat(info.Skip(22).Take(4).ToArray()).ToString();
- float temp7 = byteToFloat(info.Skip(34).Take(4).ToArray());
- float temp8 = byteToFloat(info.Skip(38).Take(4).ToArray());
- float temp9 = byteToFloat(info.Skip(42).Take(4).ToArray());
+ model.POL_Vol = byteToFloat(info.Skip(34).Take(4).ToArray()).ToString();
+ model.POL_Usage = byteToFloat(info.Skip(38).Take(4).ToArray()).ToString();
+ model.POL_Freq_Speed = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString();
- float temp10 = byteToFloat(info.Skip(82).Take(4).ToArray());
+ model.ISO_Level = byteToFloat(info.Skip(82).Take(4).ToArray()).ToString();
- float temp11 = byteToFloat(info.Skip(94).Take(4).ToArray());
- float temp12 = byteToFloat(info.Skip(98).Take(4).ToArray());
- float temp13 = byteToFloat(info.Skip(102).Take(4).ToArray());
+ model.ISO_Temp = byteToFloat(info.Skip(94).Take(4).ToArray()).ToString();
+ model.ISO_LP = byteToFloat(info.Skip(98).Take(4).ToArray()).ToString();
+ model.ISO_HP = byteToFloat(info.Skip(102).Take(4).ToArray()).ToString();
- float temp14 = byteToFloat(info.Skip(114).Take(4).ToArray());
- float temp15 = byteToFloat(info.Skip(118).Take(4).ToArray());
- float temp16 = byteToFloat(info.Skip(122).Take(4).ToArray());
+ model.ISO_Vol = byteToFloat(info.Skip(114).Take(4).ToArray()).ToString();
+ model.ISO_Usage = byteToFloat(info.Skip(118).Take(4).ToArray()).ToString();
+ model.ISO_Freq_Speed = byteToFloat(info.Skip(122).Take(4).ToArray()).ToString();
- float temp17 = byteToFloat(info.Skip(162).Take(4).ToArray());
- float temp18 = byteToFloat(info.Skip(166).Take(4).ToArray());
+ model.Hydr_Press = byteToFloat(info.Skip(162).Take(4).ToArray()).ToString();
+ model.Hydr_Temp = byteToFloat(info.Skip(166).Take(4).ToArray()).ToString();
+ model.collectTime = DateTime.Now;
+
+ if (keys.ContainsKey(systemId))
+ {
+ // 键已存在，更新值
+ keys[systemId] = model;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ keys.Add(systemId, model);
+ }
}
}
@@ -91,98 +193,57 @@ namespace Aucma.Core.DoorFoam.Business
/// 每一枪数据 ---A1,B1,A2,B2
/// </summary>
/// <returns></returns>
- static void ReadGunData(HwPLc.PlcModel obj, string startStr)
+ static void ReadGunData(HwPLc.PlcModel obj, string startStr, Dictionary<string, BoxLastShotRecord> keys, string gunCode)
{
- if (obj == null && !obj.plc.IsConnected) return;
+ if (obj == null || !obj.plc.IsConnected) return;
if (obj.plc.IsConnected)
{
-
byte[] info = obj.plc.Read(startStr, 88);
-
- float temp1 = byteToFloat(info.Skip(0).Take(4).ToArray());
- float temp2 = byteToFloat(info.Skip(4).Take(4).ToArray());
- float temp3 = byteToFloat(info.Skip(8).Take(4).ToArray());
- float temp4 = byteToFloat(info.Skip(12).Take(4).ToArray());
- float temp5 = byteToFloat(info.Skip(16).Take(4).ToArray());
- float temp6 = byteToFloat(info.Skip(20).Take(4).ToArray());
- float temp7 = byteToFloat(info.Skip(24).Take(4).ToArray());
- float temp8 = byteToFloat(info.Skip(28).Take(4).ToArray());
-
- short temp9 = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber);
- int temp10 = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
- float temp11 = byteToFloat(info.Skip(42).Take(4).ToArray());
- float temp12 = byteToFloat(info.Skip(46).Take(4).ToArray());
- float temp13 = byteToFloat(info.Skip(50).Take(4).ToArray());
- float temp14 = byteToFloat(info.Skip(54).Take(4).ToArray());
- int temp15 = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
- int temp16 = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
- float temp17 = byteToFloat(info.Skip(66).Take(4).ToArray());
- float temp18 = byteToFloat(info.Skip(70).Take(4).ToArray());
- int temp19 = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
- int temp20 = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
- int temp21 = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber);
-
- int temp22 = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray()));
+ if (info == null) return;
+ BoxLastShotRecord lastShotRecord = new BoxLastShotRecord();
+ lastShotRecord.System = gunCode.Substring(1, 1);
+ lastShotRecord.GunCode = gunCode;
+ lastShotRecord.ProductLineCode = "CX_02";
+
+ lastShotRecord.PolTemp = byteToFloat(info.Skip(0).Take(4).ToArray()).ToString();
+ lastShotRecord.PolHp = byteToFloat(info.Skip(4).Take(4).ToArray()).ToString();
+ lastShotRecord.PolVol = byteToFloat(info.Skip(8).Take(4).ToArray()).ToString();
+ lastShotRecord.PolUsage = byteToFloat(info.Skip(12).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoTemp = byteToFloat(info.Skip(16).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoHp = byteToFloat(info.Skip(20).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoVol = byteToFloat(info.Skip(24).Take(4).ToArray()).ToString();
+ lastShotRecord.IsoUsage = byteToFloat(info.Skip(28).Take(4).ToArray()).ToString();
+
+ lastShotRecord.PourNu = short.Parse(StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.SetTime = int.Parse(StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.SetWeight = byteToFloat(info.Skip(42).Take(4).ToArray()).ToString();
+ lastShotRecord.SetRatio = byteToFloat(info.Skip(46).Take(4).ToArray()).ToString(); ;
+ lastShotRecord.PourWeight = byteToFloat(info.Skip(50).Take(4).ToArray()).ToString();
+ lastShotRecord.PourRatio = byteToFloat(info.Skip(54).Take(4).ToArray()).ToString();
+ lastShotRecord.MpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.HpTime = int.Parse(StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.HydrPress = byteToFloat(info.Skip(66).Take(4).ToArray()).ToString();
+ lastShotRecord.HydrTemp = byteToFloat(info.Skip(70).Take(4).ToArray()).ToString();
+ lastShotRecord.MixpistOn = int.Parse(StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString();
+ lastShotRecord.MixpistOff = int.Parse(StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ;
+ lastShotRecord.TotalYield = int.Parse(StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4), System.Globalization.NumberStyles.HexNumber).ToString(); ;
+ lastShotRecord.PourEnd = judgeStatus(ByteArrayToBinary(info.Skip(87).Take(1).ToArray())).ToString();
+
+ lastShotRecord.CreateTime = DateTime.Now;
+
+ if (keys.ContainsKey(gunCode))
+ {
+ // 键已存在，更新值
+ keys[gunCode] = lastShotRecord;
+ }
+ else
+ {
+ // 键不存在，添加键值对
+ keys.Add(gunCode, lastShotRecord);
+ }
}
}
- ///// <summary>
- ///// 采集最后一枪数据
- ///// </summary>
- ///// <returns></returns>
- //public async Task CollectLast()
- //{
- // var obj = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("Plc1"));
- // if (obj != null && obj.plc.IsConnected)
- // {
- // BoxLastShotRecord lastShotRecord = new BoxLastShotRecord();
- // byte[] info = obj.plc.ReadBytes("DB50.896", (ushort)88);
- // IByteTransform byteTransform = new RegularByteTransform();
-
- // lastShotRecord.System = "1";
- // lastShotRecord.GunCode = "A1";
- // lastShotRecord.GunCode = "A1";
- // #region 赋值
- // lastShotRecord.PolTemp = Encoding.ASCII.GetString(info.Skip(0).Take(4).ToArray());
- // lastShotRecord.PolHp = StringChange.bytesToHexStr(info.Skip(4).Take(4).ToArray(), 4);
- // lastShotRecord.PolVol = StringChange.bytesToHexStr(info.Skip(8).Take(4).ToArray(), 4);
- // lastShotRecord.PolUsage = StringChange.bytesToHexStr(info.Skip(12).Take(4).ToArray(), 4);
- // lastShotRecord.IsoTemp = StringChange.bytesToHexStr(info.Skip(16).Take(4).ToArray(), 4);
- // lastShotRecord.IsoHp = StringChange.bytesToHexStr(info.Skip(20).Take(4).ToArray(), 4);
- // lastShotRecord.IsoVol = StringChange.bytesToHexStr(info.Skip(24).Take(4).ToArray(), 4);
- // lastShotRecord.IsoUsage = StringChange.bytesToHexStr(info.Skip(28).Take(4).ToArray(), 4);
- // lastShotRecord.PourNu = StringChange.bytesToHexStr(info.Skip(36).Take(2).ToArray(), 2);
- // lastShotRecord.SetTime = StringChange.bytesToHexStr(info.Skip(38).Take(4).ToArray(), 4);
- // lastShotRecord.SetWeight = StringChange.bytesToHexStr(info.Skip(42).Take(4).ToArray(), 4);
- // lastShotRecord.SetRatio = StringChange.bytesToHexStr(info.Skip(46).Take(4).ToArray(), 4);
- // lastShotRecord.PourWeight = StringChange.bytesToHexStr(info.Skip(50).Take(4).ToArray(), 4);
- // lastShotRecord.PourRatio = StringChange.bytesToHexStr(info.Skip(54).Take(4).ToArray(), 4);
- // lastShotRecord.MpTime = StringChange.bytesToHexStr(info.Skip(58).Take(4).ToArray(), 4);
- // lastShotRecord.HpTime = StringChange.bytesToHexStr(info.Skip(62).Take(4).ToArray(), 4);
- // lastShotRecord.HydrPress = StringChange.bytesToHexStr(info.Skip(66).Take(4).ToArray(), 4);
- // lastShotRecord.HydrTemp = StringChange.bytesToHexStr(info.Skip(70).Take(4).ToArray(), 4);
- // lastShotRecord.MixpistOn = StringChange.bytesToHexStr(info.Skip(74).Take(4).ToArray(), 4);
- // lastShotRecord.MixpistOff = StringChange.bytesToHexStr(info.Skip(78).Take(4).ToArray(), 4);
- // lastShotRecord.TotalYield = StringChange.bytesToHexStr(info.Skip(82).Take(4).ToArray(), 4);
- // lastShotRecord.PourEnd = StringChange.bytesToHexStr(info.Skip(87).Take(1).ToArray(), 1);
- // lastShotRecord.CreateTime = DateTime.Now;
- // #endregion
-
- // //if (tempLastRecord == null)
- // //{
- // // //数据库查
- // // tempLastRecord = _lastShotRecordServices.Query(x => x.System == lastShotRecord.System && x.ProductLineCode == lastShotRecord.ProductLineCode && x.GunCode == lastShotRecord.GunCode).OrderByDescending(x => x.CreateTime).FirstOrDefault();
- // //}
- // //if (tempLastRecord == null || !tempLastRecord.MixpistOff.Equals(lastShotRecord.MixpistOff))
- // //{
- // // // 刷新页面
- // // RefreshLastShotDataDelegateEvent?.Invoke(lastShotRecord);
- // // //保存
- // // _lastShotRecordServices.AddAsync(lastShotRecord);
- // // tempLastRecord = lastShotRecord;
- // //}
- // }
- //}
#region 字符工具转换方法
/// byte[]转十进制ascii码
@@ -259,3 +320,4 @@ namespace Aucma.Core.DoorFoam.Business
+
diff --git a/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
index f145cb7f..ecef0ae1 100644
--- a/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
+++ b/Aucma.Core.DoorFoam/Models/FoamMachinesModel.cs
@@ -12,299 +12,104 @@ namespace Aucma.Core.DoorFoam.Models
{
public partial class FoamMachinesModel
{
- #region 料位
/// <summary>
- /// POL料位
+ /// 系统编号;1系统 2系统
/// </summary>
- public int Syst1_POLMaterialLevel { get; set; }
+ public string systemId { get; set; }
/// <summary>
- /// ISO料位
+ /// 开关机信号
/// </summary>
- public int Syst1_ISOMaterialLevel { get; set; }
- #endregion
+ public string Machine_Status_0 { get; set; }
- #region 温度
/// <summary>
- /// Plo温度
+ ///运行状态（自/手动）
/// </summary>
- public string Syst1_PolTmperature { get; set; }
- /// <summary>
- /// ISO温度
- /// </summary>
- public string Syst1_IsoTmperature { get; set; }
-
- #endregion
-
- #region 压力
- /// <summary>
- /// Pol压力
- /// </summary>
- public string Syst1_PolPressure { get; set; }
-
- /// <summary>
- /// Iso压力
- /// </summary>
- public string Syst1_IsoPressure { get; set; }
-
- #endregion
+ public string Machine_Status_1 { get; set; }
- #region 温度
/// <summary>
- /// Iso温度
+ ///POL料位
/// </summary>
- public string Syst1_PolTemperature { get; set; }
- /// <summary>
- /// Iso温度
- /// </summary>
- public string Syst1_IsoTemperature { get; set; }
- #endregion
+ public string POL_Level { get; set; }
- #region 输出压力
/// <summary>
- /// POL输出压力
+ ///POL温度
/// </summary>
- public string Syst1_PolOutputPressure { get; set; }
- /// <summary>
- /// ISO输出压力
- /// </summary>
- public string Syst1_IsoOutputPressure { get; set; }
- #endregion
+ public string POL_Temp { get; set; }
- #region 流量
- /// <summary>
- /// POL流量
- /// </summary>
- public string Syst1_PolFlow { get; set; }
/// <summary>
- /// ISO流量
+ ///POL输入压力
/// </summary>
- public string Syst1_IsoFlow { get; set; }
- #endregion
+ public string POL_LP { get; set; }
- #region 原料用量
- /// <summary>
- /// POL流量
- /// </summary>
- public string Syst1_PolMaterialLeve { get; set; }
/// <summary>
- /// ISO流量
+ ///POL输出压力
/// </summary>
- public string Syst1_IsoMaterialLeve { get; set; }
- #endregion
+ public string POL_HP { get; set; }
- #region 液压
- /// <summary>
- /// 液压压力
- /// </summary>
- public string Syst1_Pressure { get; set; }
/// <summary>
- /// 液压
+ ///POL流量
/// </summary>
- public string Syst1_Temperature { get; set; }
- #endregion
+ public string POL_Vol { get; set; }
- #region 结束信号
/// <summary>
- /// A1结束信号
+ ///POL原料用量
/// </summary>
- public string Syst1_A1_End { get; set; }
- /// <summary>
- /// 结束信号
- /// </summary>
- public string Syst1_B1_End { get; set; }
- #endregion
+ public string POL_Usage { get; set; }
- #region A1-B1 POL注料压力
/// <summary>
- /// A1 POL注料压力
+ ///POL变频器转速
/// </summary>
- public string Syst1_A1_POLPressure { get; set; }
- /// <summary>
- /// B1 POL注料压力
- /// </summary>
- public string Syst1_B1_POLPressure { get; set; }
- #endregion
+ public string POL_Freq_Speed { get; set; }
- #region A1-B1 POL注料温度
- /// <summary>
- /// A1 POL注料温度
- /// </summary>
- public string Syst1_A1_POLTemperature { get; set; }
/// <summary>
- /// B1 POL注料温度
+ ///ISO料位
/// </summary>
- public string Syst1_B1_POLTemperature { get; set; }
- #endregion
+ public string ISO_Level { get; set; }
- #region A1-B1 ISO注料压力
- /// <summary>
- /// A1 ISO注料压力
- /// </summary>
- public string Syst1_A1_ISOPressure { get; set; }
/// <summary>
- /// B1 ISO注料压力
+ ///ISO温度
/// </summary>
- public string Syst1_B1_ISOPressure { get; set; }
- #endregion
+ public string ISO_Temp { get; set; }
- #region A1-B1 ISO注料压力
- /// <summary>
- /// A1 ISO注料压力
- /// </summary>
- public string Syst1_A1_ISOTemperature { get; set; }
/// <summary>
- /// B1 ISO注料压力
+ ///ISO输入压力
/// </summary>
- public string Syst1_B1_ISOTemperature { get; set; }
- #endregion
+ public string ISO_LP { get; set; }
-
- #region 系统2料位
/// <summary>
- /// POL料位
+ ///ISO输出压力
/// </summary>
- public int Syst2_POLMaterialLevel { get; set; }
+ public string ISO_HP { get; set; }
/// <summary>
- /// ISO料位
+ ///ISO流量
/// </summary>
- public int Syst2_ISOMaterialLevel { get; set; }
- #endregion
+ public string ISO_Vol { get; set; }
- #region 系统2温度
- /// <summary>
- /// Plo温度
- /// </summary>
- public string Syst2_PolTmperature { get; set; }
/// <summary>
- /// ISO温度
+ ///ISO原料用量
/// </summary>
- public string Syst2_IsoTmperature { get; set; }
+ public string ISO_Usage { get; set; }
- #endregion
-
- #region 系统2压力
/// <summary>
- /// Pol压力
+ ///ISO变频器转速
/// </summary>
- public string Syst2_PolPressure { get; set; }
+ public string ISO_Freq_Speed { get; set; }
/// <summary>
- /// Iso压力
+ ///液压压力
/// </summary>
- public string Syst2_IsoPressure { get; set; }
-
- #endregion
+ public string Hydr_Press { get; set; }
- #region 系统2温度
/// <summary>
- /// Iso温度
+ ///液压温度
/// </summary>
- public string Syst2_PolTemperature { get; set; }
- /// <summary>
- /// Iso温度
- /// </summary>
- public string Syst2_IsoTemperature { get; set; }
- #endregion
+ public string Hydr_Temp { get; set; }
- #region 系统2输出压力
- /// <summary>
- /// POL输出压力
- /// </summary>
- public string Syst2_PolOutputPressure { get; set; }
- /// <summary>
- /// ISO输出压力
- /// </summary>
- public string Syst2_IsoOutputPressure { get; set; }
- #endregion
-
- #region 系统2流量
- /// <summary>
- /// POL流量
- /// </summary>
- public string Syst2_PolFlow { get; set; }
- /// <summary>
- /// ISO流量
- /// </summary>
- public string Syst2_IsoFlow { get; set; }
- #endregion
-
- #region 系统2原料用量
- /// <summary>
- /// POL流量
- /// </summary>
- public string Syst2_PolMaterialLeve { get; set; }
- /// <summary>
- /// ISO流量
- /// </summary>
- public string Syst2_IsoMaterialLeve { get; set; }
- #endregion
-
- #region 系统2液压
- /// <summary>
- /// 液压压力
- /// </summary>
- public string Syst2_Pressure { get; set; }
- /// <summary>
- /// 液压
- /// </summary>
- public string Syst2_Temperature { get; set; }
- #endregion
-
- #region 系统2结束信号
- /// <summary>
- /// A1结束信号
- /// </summary>
- public string Syst2_A1_End { get; set; }
- /// <summary>
- /// 结束信号
- /// </summary>
- public string Syst2_B1_End { get; set; }
- #endregion
-
- #region 系统2 A1-B1 POL注料压力
- /// <summary>
- /// A1 POL注料压力
- /// </summary>
- public string Syst2_A1_POLPressure { get; set; }
- /// <summary>
- /// B1 POL注料压力
- /// </summary>
- public string Syst2_B1_POLPressure { get; set; }
- #endregion
-
- #region 系统2 A1-B1 POL注料温度
- /// <summary>
- /// A1 POL注料温度
- /// </summary>
- public string Syst2_A1_POLTemperature { get; set; }
- /// <summary>
- /// B1 POL注料温度
- /// </summary>
- public string Syst2_B1_POLTemperature { get; set; }
- #endregion
-
- #region 系统2 A1-B1 ISO注料压力
- /// <summary>
- /// A1 ISO注料压力
- /// </summary>
- public string Syst2_A1_ISOPressure { get; set; }
- /// <summary>
- /// B1 ISO注料压力
- /// </summary>
- public string Syst2_B1_ISOPressure { get; set; }
- #endregion
-
- #region 系统2 A1-B1 ISO注料压力
- /// <summary>
- /// A1 ISO注料压力
- /// </summary>
- public string Syst2_A1_ISOTemperature { get; set; }
/// <summary>
- /// B1 ISO注料压力
+ ///采集时间
/// </summary>
- public string Syst2_B1_ISOTemperature { get; set; }
- #endregion
+ public DateTime collectTime { get; set; }
}
}
diff --git a/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
index 0e5687d9..63425f66 100644
--- a/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/FoamMachinesPageViewModel.cs
@@ -4,6 +4,7 @@ using Admin.Core.Model;
using Admin.Core.Model.ViewModels;
using Admin.Core.Service;
using Admin.Core.Tasks;
+using Aucma.Core.DoorFoam.Business;
using Aucma.Core.DoorFoam.Models;
using CommunityToolkit.Mvvm.ComponentModel;
using Microsoft.Extensions.DependencyInjection;
@@ -22,48 +23,188 @@ namespace Aucma.Core.DoorFoam.ViewModels
public FoamMachinesPageViewModel()
{
- Job_BoxFoamLastData_Quartz.RefreshLastShotDataDelegateEvent += RefreshData;
+ CollectionFoamMachine.RefreshLastShotDataDelegateEvent += RefreshData;
+ CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData;
+ CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData;
_boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
- // LoadData();
+ LoadData();
//Task.WaitAll(LoadData());
}
+
+ #region 刷新系统参数---系统1，系统2
+ /// <summary>
+ /// 系统1，系统2数据刷新
+ /// </summary>
+ public void RefreshSystemData(Dictionary<string, FoamMachinesModel> keys)
+ {
+ foreach (KeyValuePair<string, FoamMachinesModel> kvp in keys)
+ {
+ if (kvp.Key.Equals("1"))
+ {
+ RefreshSystem1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("2"))
+ {
+ RefreshSystem2(kvp.Value);
+
+ }
+ }
+ }
+ /// <summary>
+ /// 刷新系统1
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshSystem1(FoamMachinesModel record)
+ {
+ PolInputPressure1 = record.POL_LP;
+ IsoInputPressure1 = record.ISO_LP;
+ PolOutputPressure1 = record.POL_HP;
+ IsoOutputPressure1 = record.ISO_HP;
+ PolFlow1 = record.POL_Vol;
+ IsoFlow1 = record.ISO_Vol;
+ PoleTmperature1 = record.POL_Temp;
+ IsoTemperature1 = record.ISO_Temp;
+ PolMaterialLevel1 = record.POL_Level;
+ IsoMaterialLevel1 = record.ISO_Level;
+ Pressure1 = record.Hydr_Press;
+ Temperature1 = record.Hydr_Temp;
+ }
+ /// <summary>
+ /// 刷新系统2
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshSystem2(FoamMachinesModel record)
+ {
+ PolInputPressure2 = record.POL_LP;
+ IsoInputPressure2 = record.ISO_LP;
+ PolOutputPressure2 = record.POL_HP;
+ IsoOutputPressure2 = record.ISO_HP;
+ PolFlow2 = record.POL_Vol;
+ IsoFlow2 = record.ISO_Vol;
+ PoleTmperature2 = record.POL_Temp;
+ IsoTemperature2 = record.ISO_Temp;
+ PolMaterialLevel2 = record.POL_Level;
+ IsoMaterialLevel2 = record.ISO_Level;
+ Pressure2 = record.Hydr_Press;
+ Temperature2 = record.Hydr_Temp;
+ }
+
+ #endregion
+
+
+
+ #region 刷新每一枪数据
+ /// <summary>
+ /// A1,B1,A2,B2枪数据刷新
+ /// </summary>
+ public void RefreshGunData(Dictionary<string, BoxLastShotRecord> keys)
+ {
+ foreach (KeyValuePair<string, BoxLastShotRecord> kvp in keys)
+ {
+ if (kvp.Key.Equals("A1"))
+ {
+ RefreshA1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("B1"))
+ {
+ RefreshB1(kvp.Value);
+ }
+ else if (kvp.Key.Equals("A2"))
+ {
+ RefreshA2(kvp.Value);
+ }
+ else if (kvp.Key.Equals("B2"))
+ {
+ RefreshB2(kvp.Value);
+ }
+ }
+ }
+ /// <summary>
+ /// 刷新A1数据
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshA1(BoxLastShotRecord record)
+ {
+ POLPressure1a = record.PolHp;
+ POLTemperature1a = record.PolTemp;
+ ISOPressure1a = record.IsoHp;
+ ISOTemperature1a = record.IsoTemp;
+ }
+ /// <summary>
+ /// 刷新B1数据
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshB1(BoxLastShotRecord record)
+ {
+ POLPressure1b = record.PolHp;
+ POLTemperature1b = record.PolTemp;
+ ISOPressure1b = record.IsoHp;
+ ISOTemperature1b = record.IsoTemp;
+
+ }
+ /// <summary>
+ /// 刷新A2数据
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshA2(BoxLastShotRecord record)
+ {
+ POLPressure2a = record.PolHp;
+ POLTemperature2a = record.PolTemp;
+ ISOPressure2a = record.IsoHp;
+ ISOTemperature2a = record.IsoTemp;
+ }
+
+ /// <summary>
+ /// 刷新B2数据
+ /// </summary>
+ /// <param name="record"></param>
+ public void RefreshB2(BoxLastShotRecord record)
+ {
+ POLPressure2b = record.PolHp;
+ POLTemperature2b = record.PolTemp;
+ ISOPressure2b = record.IsoHp;
+ ISOTemperature2b = record.IsoTemp;
+ }
+ #endregion
+
+ /// <summary>
+ /// datagrid刷新
+ /// </summary>
+ /// <param name="record"></param>
public void RefreshData(BoxLastShotRecord record)
{
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
{
- string system = string.Empty;
- if (record.System == "1") {
+ string system = string.Empty;
+ if (record.System == "1")
+ {
system = "1系统";
-
- // PolFlow1 = record.POLInjecFlowRate;
- // IsoFlow1 = record.ISOInjecFlowRate;
- // PoleTmperature1 = record.POLInjecTemperatureOfGunHead;
- // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead;
+ // PolFlow1 = record.POLInjecFlowRate;
+ // IsoFlow1 = record.ISOInjecFlowRate;
+ // PoleTmperature1 = record.POLInjecTemperatureOfGunHead;
+ // IsoTemperature1 = record.ISOInjecTemperatureOfGunHead;
}
- if (record.System == "2") { system = "2系统"; }
- LastShotRecordDataGrid.Add(new LastShotRecordModel()
- {
- No = LastShotRecordDataGrid.Count+1,
- System = system,
- GunHead = record.GunCode,
- // StationNumber = record.StationNumber,
- PolInjectionpressure = record.PolHp,
- IsoInjectionpressure = record.IsoHp,
- PolInjectiontemperature = record.PolTemp,
- IsoInjectiontemperature = record.IsoTemp,
- LastTime = record.CreateTime,
- Createtime = record.CreateTime
- });
-
+ if (record.System == "2") { system = "2系统"; }
+ LastShotRecordModel model = new LastShotRecordModel();
+ model.No = LastShotRecordDataGrid.Count + 1;
+ model.System = system;
+ model.GunHead = record.GunCode;
+ // StationNumber = record.StationNumber,
+ model.IsoInjectionpressure = record.PolHp;
+ model.IsoInjectionpressure = record.IsoHp;
+ model.PolInjectiontemperature = record.PolTemp;
+ model.IsoInjectiontemperature = record.IsoTemp;
+ model.PolInjectionpressure = record.PolHp;
+ model.StationNumber = record.PourNu;
+ model.LastTime = record.CreateTime;
+ model.Createtime = record.CreateTime;
+ LastShotRecordDataGrid.Insert(0, model);
}));
-
}
-
-
-
+
#region 加载DataGrid数据
private async Task LoadData()
{
@@ -74,29 +215,33 @@ namespace Aucma.Core.DoorFoam.ViewModels
int i = 1;
var list = await _boxLastShotRecordServices.QueryAsync();
if (list == null) return;
- list.OrderByDescending(d => d.CreateTime);
- foreach (var item in list.Take(50))
+ list.OrderByDescending(d => d.CreateTime).Take(30);
+ foreach (var item in list)
{
string system = string.Empty;
if (item.System == "1") { system = "1系统"; }
if (item.System == "2") { system = "2系统"; }
- LastShotRecordDataGrid.Add(new LastShotRecordModel()
+ LastShotRecordModel model = new LastShotRecordModel();
+ if (LastShotRecordDataGrid.Count() == 0)
+ {
+ model.No = 1;
+ }
+ else
{
- No = i,
- System = system,
- GunHead=item.GunCode,
- // StationNumber=item.StationNumber,
- PolInjectionpressure = item.PolHp,
- IsoInjectionpressure = item.IsoHp,
- PolInjectiontemperature = item.PolTemp,
- IsoInjectiontemperature = item.IsoTemp,
- LastTime = item.CreateTime,
- Createtime = item.CreateTime
- });
- i++;
- };
- // Datalist.Insert(0, Datalist[Datalist.Count - 1]);
- // Datalist.RemoveAt(Datalist.Count - 1);
+ model.No = LastShotRecordDataGrid.Count() + 1;
+ }
+ model.No = i;
+ model.System = system;
+ model.GunHead = item.GunCode;
+ model.PolInjectionpressure = item.PolHp;
+ model.IsoInjectionpressure = item.IsoHp;
+ model.PolInjectiontemperature = item.PolTemp;
+ model.IsoInjectiontemperature = item.IsoTemp;
+ model.LastTime = item.CreateTime;
+ model.Createtime = item.CreateTime;
+ model.StationNumber = item.PourNu;
+ LastShotRecordDataGrid.Insert(0, model);
+ }
}));
}
@@ -228,79 +373,103 @@ namespace Aucma.Core.DoorFoam.ViewModels
get => _temperature1;
set => SetProperty(ref _temperature1, value);
}
+
+
/// <summary>
/// A枪状态
/// </summary>
- private string _status1;
- public string Status1
+ //private string _status1a;
+ //public string Status1a
+ //{
+ // get => _status1a;
+ // set => SetProperty(ref _status1a, value);
+ //}
+
+ /// <summary>
+ /// pol压力
+ /// </summary>
+ private string _POLPressure1a = "0.00";
+ public string POLPressure1a
{
- get => _status1;
- set => SetProperty(ref _status1, value);
+ get => _POLPressure1a;
+ set => SetProperty(ref _POLPressure1a, value);
}
+
/// <summary>
- /// B枪状态
+ /// A枪POL温度
/// </summary>
- private string _status11;
- public string Status11
+ private string _POLTemperature1a = "0.00";
+ public string POLTemperature1a
{
- get => _status11;
- set => SetProperty(ref _status11, value);
+ get => _POLTemperature1a;
+ set => SetProperty(ref _POLTemperature1a, value);
}
/// <summary>
- /// 压力
+ /// iso压力
/// </summary>
- private string _POLPressure1 = "0.00";
- public string POLPressure1
+ private string _ISOPressure1a = "0.00";
+ public string ISOPressure1a
{
- get => _POLPressure1;
- set => SetProperty(ref _POLPressure1, value);
+ get => _ISOPressure1a;
+ set => SetProperty(ref _ISOPressure1a, value);
}
/// <summary>
- /// A枪POL温度
+ /// iso温度
/// </summary>
- private string _POLTemperature1 = "0.00";
- public string POLTemperature1
+ private string _ISOTemperature1a = "0.0";
+ public string ISOTemperature1a
{
- get => _POLTemperature1;
- set => SetProperty(ref _POLTemperature1, value);
+ get => _ISOTemperature1a;
+ set => SetProperty(ref _ISOTemperature1a, value);
}
+
/// <summary>
- /// B枪POL温度
+ /// B枪状态
/// </summary>
- private string _POLTemperature11 = "0.0";
- public string POLTemperature11
+ //private string _status1b;
+ //public string Status1b
+ //{
+ // get => _status1b;
+ // set => SetProperty(ref _status1b, value);
+ //}
+
+ /// <summary>
+ /// B枪pol压力
+ /// </summary>
+ private string _POLPressure1b = "0.00";
+ public string POLPressure1b
{
- get => _POLTemperature11;
- set => SetProperty(ref _POLTemperature11, value);
+ get => _POLPressure1b;
+ set => SetProperty(ref _POLPressure1b, value);
}
+
/// <summary>
- /// 压力
+ /// B枪POL温度
/// </summary>
- private string _ISOPressure1 = "0.00";
- public string ISOPressure1
+ private string _POLTemperature1b = "0.00";
+ public string POLTemperature1b
{
- get => _ISOPressure1;
- set => SetProperty(ref _ISOPressure1, value);
+ get => _POLTemperature1b;
+ set => SetProperty(ref _POLTemperature1b, value);
}
/// <summary>
- /// 压力
+ /// B枪iso压力
/// </summary>
- private string _ISOPressure11 = "0.00";
- public string ISOPressure11
+ private string _ISOPressure1b = "0.00";
+ public string ISOPressure1b
{
- get => _ISOPressure11;
- set => SetProperty(ref _ISOPressure11, value);
+ get => _ISOPressure1b;
+ set => SetProperty(ref _ISOPressure1b, value);
}
/// <summary>
- /// 温度
+ /// B枪iso温度
/// </summary>
- private string _ISOTemperature11 = "0.0";
- public string ISOTemperature11
+ private string _ISOTemperature1b = "0.0";
+ public string ISOTemperature1b
{
- get => _ISOTemperature11;
- set => SetProperty(ref _ISOTemperature11, value);
+ get => _ISOTemperature1b;
+ set => SetProperty(ref _ISOTemperature1b, value);
}
-
#endregion
#region 2系统属性
@@ -415,100 +584,92 @@ namespace Aucma.Core.DoorFoam.ViewModels
get => _temperature2;
set => SetProperty(ref _temperature2, value);
}
+
/// <summary>
- /// A枪状态
- /// </summary>
- private string _status2 = "";
- public string Status2
- {
- get => _status2;
- set => SetProperty(ref _status2, value);
- }
- /// <summary>
- /// B枪状态
+ /// A枪POL压力
/// </summary>
- private string _status12 = "";
- public string Status12
+ private string _POLPressure2a = "0.00";
+ public string POLPressure2a
{
- get => _status12;
- set => SetProperty(ref _status12, value);
+ get => _POLPressure2a;
+ set => SetProperty(ref _POLPressure2a, value);
}
/// <summary>
- /// 压力
+ /// A枪POL温度
/// </summary>
- private string _POLPressure2 = "0.00";
- public string POLPressure2
+ private string _POLTemperature2a = "0.00";
+ public string POLTemperature2a
{
- get => _POLPressure2;
- set => SetProperty(ref _POLPressure2, value);
+ get => _POLTemperature2a;
+ set => SetProperty(ref _POLTemperature2a, value);
}
/// <summary>
- /// 温度
+ /// iso压力
/// </summary>
- private string _POLTemperature2 = "0.00";
- public string POLTemperature2
+ private string _ISOPressure2a = "0.00";
+ public string ISOPressure2a
{
- get => _POLTemperature2;
- set => SetProperty(ref _POLTemperature2, value);
+ get => _ISOPressure2a;
+ set => SetProperty(ref _ISOPressure2a, value);
}
/// <summary>
- /// A枪压力
+ /// iso温度
/// </summary>
- private string _ISOPressure2 = "0.00";
- public string ISOPressure2
+ private string _ISOTemperature2a = "0.0";
+ public string ISOTemperature2a
{
- get => _ISOPressure2;
- set => SetProperty(ref _ISOPressure2, value);
+ get => _ISOTemperature2a;
+ set => SetProperty(ref _ISOTemperature2a, value);
}
+
/// <summary>
- ///A枪温度
+ /// B枪状态
/// </summary>
- private string _ISOTemperature22 = "0.0";
- public string ISOTemperature22
- {
- get => _ISOTemperature22;
- set => SetProperty(ref _ISOTemperature22, value);
- }
+ //private string _status2b;
+ //public string Status2b
+ //{
+ // get => _status2b;
+ // set => SetProperty(ref _status2b, value);
+ //}
+
/// <summary>
- /// B枪温度
+ /// B枪pol压力
/// </summary>
- private string _ISOTemperature222 = "0.0";
- public string ISOTemperature222
+ private string _POLPressure2b = "0.00";
+ public string POLPressure2b
{
- get => _ISOTemperature222;
- set => SetProperty(ref _ISOTemperature222, value);
+ get => _POLPressure2b;
+ set => SetProperty(ref _POLPressure2b, value);
}
+
/// <summary>
- /// B枪温度
+ /// B枪POL温度
/// </summary>
- private string _POLPressure22 = "0.0";
- public string POLPressure22
+ private string _POLTemperature2b = "0.00";
+ public string POLTemperature2b
{
- get => _POLPressure22;
- set => SetProperty(ref _POLPressure22, value);
+ get => _POLTemperature2b;
+ set => SetProperty(ref _POLTemperature2b, value);
}
-
/// <summary>
- /// B枪ISO温度
+ /// B枪iso压力
/// </summary>
- private string _POLTemperature22 = "0.0";
- public string POLTemperature22
+ private string _ISOPressure2b = "0.00";
+ public string ISOPressure2b
{
- get => _POLTemperature22;
- set => SetProperty(ref _POLTemperature22, value);
+ get => _ISOPressure2b;
+ set => SetProperty(ref _ISOPressure2b, value);
}
-
/// <summary>
- /// B枪ISO压力
+ /// B枪iso温度
/// </summary>
- private string _ISOPressure22 = "0.0";
- public string ISOPressure22
+ private string _ISOTemperature2b = "0.0";
+ public string ISOTemperature2b
{
- get => _ISOPressure22;
- set => SetProperty(ref _ISOPressure22, value);
+ get => _ISOTemperature2b;
+ set => SetProperty(ref _ISOTemperature2b, value);
}
-
#endregion
}
}
diff --git a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
index 516ffd23..6aff577f 100644
--- a/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.DoorFoam/ViewModels/IndexPageViewModel.cs
@@ -32,6 +32,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel));
private DoorCollection doorCollection = new DoorCollection();
+ private CollectionFoamMachine collectionFoam = new CollectionFoamMachine();
public IndexPageViewModel()
{
doorCollection.RefreshDoorFoamMachineEvent += info =>
@@ -41,9 +42,15 @@ namespace Aucma.Core.DoorFoam.ViewModels
Task.Run(() =>
{
- Thread.Sleep(30000);
+ Thread.Sleep(1000*10);
doorCollection.startCollect();
});
+
+ Task.Run(() =>
+ {
+ Thread.Sleep(1000 * 10);
+ collectionFoam.startCollect();
+ });
}
#region 获取今天的数据
diff --git a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
index ce551214..17d40323 100644
--- a/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
+++ b/Aucma.Core.DoorFoam/Views/FoamMachinesPageView.xaml
@@ -44,7 +44,7 @@
<Setter Property="FontSize" Value="18"/>
<Setter Property="Background" Value="#4285DE"/>
<Setter Property="Foreground" Value="White"/>
-
+
</Style>
<!--单元格样式-->
@@ -54,7 +54,7 @@
<Setter Property="BorderBrush" Value="Gray" />
<Setter Property="Height" Value="40"/>
<Setter Property="FontSize" Value="18"/>
-
+
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type DataGridCell}">
@@ -147,7 +147,7 @@
<TextBlock Text="输入压力" FontSize="18" Foreground="White"/>
</StackPanel>
<WrapPanel Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POPressure}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding PolInputPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White" />
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left">
@@ -233,7 +233,7 @@
<TextBlock Text="B枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
</Border>
<WrapPanel Grid.Column="0" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Right">
- <TextBlock Text="状态" FontSize="18" Foreground="White"/>
+ <!--<TextBlock Text="状态" FontSize="18" Foreground="White"/>-->
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock Text="{Binding Status1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
@@ -246,11 +246,11 @@
<TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLPressure1a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLPressure1b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -258,11 +258,11 @@
<TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLTemperature1a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLTemperature1b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -270,27 +270,27 @@
<TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure1}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOPressure1a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOPressure1b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOTemperature1a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature11}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOTemperature1b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
</Grid>
</Border>
- </Grid>
+ </Grid>
</Border>
</Grid>
</Border>
@@ -429,7 +429,7 @@
<TextBlock Text="B枪" FontSize="18" FontWeight="Bold" Foreground="White"/>
</Border>
<WrapPanel Grid.Column="0" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Right">
- <TextBlock Text="状态" FontSize="18" Foreground="White"/>
+ <!--<TextBlock Text="状态" FontSize="18" Foreground="White"/>-->
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="10" VerticalAlignment="Center" HorizontalAlignment="Left">
<TextBlock Text="{Binding Status2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="50"/>
@@ -441,16 +441,16 @@
<WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
</WrapPanel>
-
+
<WrapPanel Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Right">
<TextBlock Text="POL压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLPressure2a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="11" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLPressure2b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -458,11 +458,11 @@
<TextBlock Text="POL温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLTemperature2a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="12" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding POLTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding POLTemperature2b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -470,11 +470,11 @@
<TextBlock Text="ISO压力" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure2}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOPressure2a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="13" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOPressure22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOPressure2b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="MPa" FontSize="18" Foreground="White"/>
</WrapPanel>
@@ -482,11 +482,11 @@
<TextBlock Text="ISO温度" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="1" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature22}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOTemperature2a}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
<WrapPanel Grid.Column="2" Grid.Row="14" VerticalAlignment="Center" HorizontalAlignment="Left">
- <TextBlock Text="{Binding ISOTemperature222}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+ <TextBlock Text="{Binding ISOTemperature2b}" FontSize="18" Margin="0 0 18 0" Foreground="White" Width="200" VerticalAlignment="Center" Block.TextAlignment="Center"/>
<TextBlock Text="℃" FontSize="18" Foreground="White"/>
</WrapPanel>
</Grid>
diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json
index 03a7fd33..18151360 100644
--- a/Aucma.Core.DoorFoam/appsettings.json
+++ b/Aucma.Core.DoorFoam/appsettings.json
@@ -199,10 +199,10 @@
"PLCServer": [
{
"Id": 1,
- "EquipName": "泡前库Plc",
+ "EquipName": "FoamPlc",
"PlcType": "Siemens",
- "Enabled": false,
- "IP": "10.10.93.41",
+ "Enabled": true,
+ "IP": "10.10.93.180",
"Port": 102
},
{
From 30cc5eca3a91ecf988392d5c05648ae58c201a25 Mon Sep 17 00:00:00 2001
From: "liulb@mesnac.com" <haiwei@123>
Date: Thu, 4 Jan 2024 10:50:08 +0800
Subject: [PATCH 3/4] new
---
.../Admin.Core.Api.csproj.nuget.dgspec.json | 533 ++++++--------
.../obj/Admin.Core.Api.csproj.nuget.g.props | 10 +-
....GeneratedMSBuildEditorConfig.editorconfig | 4 +-
.../Debug/net6.0/Admin.Core.Api.assets.cache | Bin 142874 -> 140916 bytes
Admin.Core.Api/obj/project.assets.json | 43 +-
Admin.Core.Api/obj/project.nuget.cache | 452 ++++++------
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../IExecutePlanInfoRepository.cs | 2 +
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../IService_New/IExecutePlanInfoServices.cs | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../ExecutePlanInfoRepository.cs | 25 +-
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../Service_New/ExecutePlanInfoServices.cs | 5 +
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../ViewModels/OldBoxFoamPageViewModel.cs | 669 +++++++-----------
.../ViewModels/IndexPageViewModel.cs | 24 +-
.../GeneratedInternalTypeHelper.g.i.cs | 2 +-
....GeneratedMSBuildEditorConfig.editorconfig | 2 +-
.../net6.0-windows/HwControlLib.assets.cache | Bin 265 -> 152 bytes
.../HwControlLib_MarkupCompile.i.cache | 4 +-
.../obj/HwControlLib.csproj.nuget.dgspec.json | 25 +-
.../obj/HwControlLib.csproj.nuget.g.props | 8 +-
HwControlLib/obj/project.assets.json | 25 +-
HwControlLib/obj/project.nuget.cache | 4 +-
27 files changed, 788 insertions(+), 1065 deletions(-)
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 fe5e8758..0a98b80a 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,46 +1,41 @@
{
"format": 1,
"restore": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {}
},
"projects": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -83,41 +78,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
"projectName": "Admin.Core.Common",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "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"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj"
}
}
}
@@ -273,41 +263,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
"projectName": "Admin.Core.EventBus",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -347,65 +332,60 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
"projectName": "Admin.Core.Extensions",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.EventBus\\Admin.Core.EventBus.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj"
}
}
}
@@ -441,44 +421,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
"projectName": "Admin.Core.IRepository",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -508,44 +483,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
"projectName": "Admin.Core.IService",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
}
}
}
@@ -575,41 +545,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
"projectName": "Admin.Core.Model",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -639,41 +604,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
"projectName": "Admin.Core.Repository",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\Admin.Core.Repository.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Repository\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
}
}
}
@@ -703,34 +663,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
"projectName": "Admin.Core.Serilog.Es",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\Admin.Core.Serilog.Es.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Serilog.Es\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
@@ -793,47 +748,42 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
"projectName": "Admin.Core.Service",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IRepository\\Admin.Core.IRepository.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj"
}
}
}
@@ -863,53 +813,48 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
"projectName": "Admin.Core.Tasks",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Model\\Admin.Core.Model.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj"
}
}
}
@@ -945,34 +890,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
"projectName": "Aucma.Core.HwPLc",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.1"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1011,34 +951,29 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
"projectName": "Aucma.Core.PLc",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\Aucma.Core.PLc.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.PLc\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"netstandard2.1"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.1": {
@@ -1077,44 +1012,39 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
"projectName": "Aucma.Core.RunPlc",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\Aucma.Core.RunPlc.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.RunPlc\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
}
}
}
@@ -1144,41 +1074,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
"projectName": "Aucma.Core.ScannerGun",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\Aucma.Core.ScannerGun.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.ScannerGun\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -1214,41 +1139,36 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
"projectName": "Aucma.Core.Scanner",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\Aucma.Core.Scanner.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Scanner\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
}
}
}
@@ -1284,47 +1204,42 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
"projectName": "Aucma.Core.Tasks",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\Aucma.Core.Tasks.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.Tasks\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Common\\Admin.Core.Common.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.IService\\Admin.Core.IService.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Aucma.Core.HwPLc\\Aucma.Core.HwPLc.csproj"
}
}
}
@@ -1354,7 +1269,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\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 15920027..a5a55588 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,18 @@
<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\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" />
- <SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
+ <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
</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' ">
- <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>
+ <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>
</PropertyGroup>
</Project>
\ No newline at end of file
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 d1d06cea..601c80d9 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,9 @@ 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:\桌面\AUCMA_SCADA\Admin.Core.Api\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\
build_property.RazorLangVersion = 6.0
build_property.SupportLocalizedComponentNames =
build_property.GenerateRazorMetadataSourceChecksumAttributes =
-build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api
+build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api
build_property._RazorSourceGeneratorDebug =
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 d8850da534819b613f49f14b373f108fc9d2c5c0..d57995efc7954aaf5f62c45db37abc2783259951 100644
GIT binary patch
delta 17910
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
delta 20387
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
diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json
index 209a19d7..6f928a74 100644
--- a/Admin.Core.Api/obj/project.assets.json
+++ b/Admin.Core.Api/obj/project.assets.json
@@ -7052,11 +7052,12 @@
]
},
"System.Collections.NonGeneric/4.3.0": {
- "sha512": "LE/oChpRvkSi3U25u0KnJcI44JeDZ1QJCyN4qFDx2uusEypdqR24w7lKYw21eYe5esuCBuc862wRmpF63Yy1KQ==",
+ "sha512": "prtjIEMhGUnQq6RnPEYLpFt8AtLbp9yq2zxOSrY7KJJZrw25Fi97IzBqY7iqssbM61Ek5b8f3MG/sG1N2sN5KA==",
"type": "package",
"path": "system.collections.nongeneric/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -9789,11 +9790,12 @@
]
},
"System.Runtime.Serialization.Primitives/4.3.0": {
- "sha512": "2Z5t70a2SwMsfQDp9KOclaZNyQhfIga2gppq9lIUDM1A4ohTshn4JqT7ir8bvIhXgorWKYDAr6rPzEbi/nTGKg==",
+ "sha512": "Wz+0KOukJGAlXjtKr+5Xpuxf8+c8739RI1C+A2BoQZT+wMCCoMDDdO8/4IRHfaVINqL78GO8dW8G2lW/e45Mcw==",
"type": "package",
"path": "system.runtime.serialization.primitives/4.3.0",
"files": [
".nupkg.metadata",
+ ".signature.p7s",
"ThirdPartyNotices.txt",
"dotnet_library_license.txt",
"lib/MonoAndroid10/_._",
@@ -11255,47 +11257,40 @@
]
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"projectName": "Admin.Core.Api",
- "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\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Extensions\\Admin.Core.Extensions.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Service\\Admin.Core.Service.csproj"
},
- "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj": {
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Tasks\\Admin.Core.Tasks.csproj"
}
}
}
@@ -11338,7 +11333,7 @@
"privateAssets": "all"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache
index c8cd40d1..66791f7b 100644
--- a/Admin.Core.Api/obj/project.nuget.cache
+++ b/Admin.Core.Api/obj/project.nuget.cache
@@ -1,233 +1,233 @@
{
"version": 2,
- "dgSpecHash": "HsMojseCVmTxRPG4iGkEf/2OvAGUxYsYPY9resKB+wCYzU12wwdfiUulJ6iIYjBrrvQkt9KbYTYesAxpAJXRFg==",
+ "dgSpecHash": "ikzDviTkPCZihaCgfwo8AuzSJtovmijOXuLwxKtGKgxnoK/TUK28Ezke2gSYzzQArjgQtsTmEg3YwxUUY0FkCg==",
"success": true,
- "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
+ "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\Admin.Core.Api\\Admin.Core.Api.csproj",
"expectedPackageFiles": [
- "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.2\\newtonsoft.json.13.0.2.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.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\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
+ "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.2\\newtonsoft.json.13.0.2.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.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\\uaparser\\3.1.47\\uaparser.3.1.47.nupkg.sha512"
],
"logs": []
}
\ No newline at end of file
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 1fdeb046..2ffa7b25 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Extensions\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\
diff --git a/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
index 420d63e9..69c6e8bd 100644
--- a/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
+++ b/Admin.Core.IRepository/IRepository_New/IExecutePlanInfoRepository.cs
@@ -14,5 +14,7 @@ namespace Admin.Core.IRepository
Task<List<dynamic>> GetStationHourAmount(string stationCode);
Task<List<dynamic>> GetStationSheetMetalHourAmountAsync(string stationCode);
+
+ List<dynamic> GetStationSheetMetalStats(string stationCode);
}
}
\ No newline at end of file
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 968ed779..2b7e2280 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IRepository\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\
diff --git a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
index 273d5c40..7fc83e73 100644
--- a/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
+++ b/Admin.Core.IService/IService_New/IExecutePlanInfoServices.cs
@@ -110,7 +110,7 @@ namespace Admin.Core.IService
Task<List<dynamic>> GetStationSheetMetalHourAmountAsync(string stationCode);
-
+ List<dynamic> GetStationSheetMetalStats(string stationCode);
#endregion
}
}
\ No newline at end of file
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 1e7c9f10..ba998751 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.IService\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\
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 173f98e4..f17e3fdc 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Model
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Model\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Model\
diff --git a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
index 89bf2811..c2fee739 100644
--- a/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
+++ b/Admin.Core.Repository/Repository_New/ExecutePlanInfoRepository.cs
@@ -1,8 +1,12 @@
using Admin.Core.IRepository;
using Admin.Core.Model;
+using Consul.Filtering;
+using Microsoft.IdentityModel.Logging;
using SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace Admin.Core.Repository
@@ -33,7 +37,26 @@ namespace Admin.Core.Repository
/// <returns></returns>
public async Task<List<dynamic>> GetStationSheetMetalHourAmountAsync(string stationCode)
{
- return await Db.Queryable<dynamic>().AS("GET_STATION_SHEETMETALHOURAMOUNT").ToListAsync();
+ return await Db.Queryable<dynamic>().AS("GET_STATION_SHEETMETALHOURAMOUNT").Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToListAsync();
+ }
+
+ public List<dynamic> GetStationSheetMetalStats(string stationCode)
+ {
+ List<dynamic> result = null;
+ try
+ {
+ string sql = @"SELECT b.MATERIAL_NAME, r.PRODUCTLINE_CODE, SUM(r.complete_amount) AS PRODUCT_AMOUNT
+ FROM(select p.*, s.complete_amount from EXECUTE_PLANINFO p inner join RECORD_SIDEPANEL_COMPLATE s on p.TASK_CODE = s.PLAN_CODE) r
+ JOIN C##AUCMA_MES.BASE_BOMINFO b ON r.MATERIAL_CODE = b.MATERIAL_CODE
+ WHERE TRUNC(r.RECORD_TIME) = TRUNC(SYSDATE)
+ GROUP BY b.MATERIAL_NAME, r.PRODUCTLINE_CODE";
+ result = Db.SqlQueryable<dynamic>(sql).Where("PRODUCTLINE_CODE = @stationCode", new { stationCode = stationCode }).ToList();
+ }
+ catch (Exception ex)
+ {
+
+ }
+ return result;
}
}
}
\ No newline at end of file
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 67886d71..41538400 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Repository\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\
diff --git a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
index 87eb28d9..f94c13b7 100644
--- a/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
+++ b/Admin.Core.Service/Service_New/ExecutePlanInfoServices.cs
@@ -396,5 +396,10 @@ namespace Admin.Core.Service
{
return await _executePlanInfoRepository.GetStationSheetMetalHourAmountAsync(stationCode);
}
+ public List<dynamic> GetStationSheetMetalStats(string stationCode)
+ {
+ return _executePlanInfoRepository.GetStationSheetMetalStats(stationCode);
+ }
+
}
}
\ No newline at end of file
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 9c6bffa2..19486c3e 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Service\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\
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 48679c0e..d114eba8 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,4 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks
-build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Tasks\
+build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\
diff --git a/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs b/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
index 5c658f63..c1389ae7 100644
--- a/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
+++ b/Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs
@@ -2,6 +2,7 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
+using Admin.Core.Model.ViewModels;
using Aucma.Core.HwPLc;
using Aucma.Core.OldBoxFoam.Business;
using Aucma.Core.OldBoxFoam.Models;
@@ -234,490 +235,300 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
#endregion
Semaphore semaphore = new Semaphore(1, 1);
-
- #region 将采集到的数据保存
+
+
+ #region 原数据采集方法
/// <summary>
/// 将采集到的数据保存
/// </summary>
/// <param name="mode"></param>
-
public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e)
{
semaphore.WaitOne();
try
{
string productLineCode = Appsettings.app("StationInfo", "ProductLineCode");
-
+ if (Collection.listFixtureStatus == null || Collection.listFixtureStatus.Count == 0) return;
DateTime now = DateTime.Now;
- List<CurrentTeamTime> timeList = await _currentTeamTimeServices.QueryAsync(d => d.StartTime <= now && d.EndTime >= now);
-
- if (timeList.Count > 0)
+ CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
+ if (time != null)
{
- ExecHourDataAsync(productLineCode);
+ ExecHourData(productLineCode);
}
else
{
- ShiftChangeAsync(productLineCode);
+ ShiftChange(productLineCode);
}
-
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Console.WriteLine(ex.Message.ToString());
}
finally
{
semaphore.Release();
}
- }
- #endregion
+ }
- #region 获取小时数据
- public async void ExecHourDataAsync(string productLineCode)
+ private async void ShiftChange(string productLineCode)
+ {
+ //切换班组计划
+ var list = await _oldBoxFoamDataServices.QueryAsync(d => d.ProductLineCode == productLineCode);
+ List<BoxFoamDataRecord> recordList = new List<BoxFoamDataRecord>();
+ var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
+ if (currentTeamTimeList.Count == 0) return;
+ //更新计划表操作
+ CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
+ currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
+ currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
+ currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
+ await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
+ //可以使用Mapping 映射
+ list.ForEach(d =>
+ {
+ BoxFoamDataRecord record = new BoxFoamDataRecord();
+ record.OrderCode = d.OrderCode;
+ record.ProductLineCode = d.ProductLineCode;
+ record.Fixturestatus = d.Production;
+ record.CuringTimeSettingValue = d.CuringTimeSettingValue;
+ record.ActualValue = d.ActualValue;
+ record.AnHour = d.AnHour;
+ record.TwoHour = d.TwoHour;
+ record.ThreeHour = d.ThreeHour;
+ record.FourHour = d.FourHour;
+ record.FiveHour = d.FiveHour;
+ record.SixHour = d.SixHour;
+ record.SevenHour = d.SevenHour;
+ record.EightHour = d.EightHour;
+ record.NineHour = d.NineHour;
+ record.TenHour = d.TenHour;
+ record.ElevenHour = d.ElevenHour;
+ record.TwelveHour = d.TwelveHour;
+ record.BoxFixturesideplate = d.BoxFixturesideplate;
+ record.BoxClosebetatemperature = d.BoxClosebetatemperature;
+ record.BoxBeat = d.BoxBeat;
+ record.CreateTime = DateTime.Now;
+ });
+ int result = await _boxFoamDataRecordServices.AddAsync(recordList);
+ if (result > 0)
+ {
+ var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
+ if (obj2 == null) { return; }
+ obj2.plc.WriteInt16("M216", "1");//换班 数据清空
+ //清空 当班计划
+ await _oldBoxFoamDataServices.DeletesAsync(list);
+ }
+ }
+
+ private async void ExecHourData(string productLineCode)
{
- List<FixtureStatus> bLis = Collection.listFixtureStatus;
- if (bLis.Count == 0) return;
- List<BoxFoamPlan> planList = await _boxFoamPlanServices.QueryAsync();
- List<BoxFoamDataRealTime> bfds = await _boxFoamDataRealTimeServices.QueryAsync();
- for (int j = 0; j < bLis.Count; j++)
+ try
{
- try
+ List<FixtureStatus> bList = new List<FixtureStatus>();
+
+
+ var collectionList = Collection.listFixtureStatus;
+ if (collectionList.Count == 0) return;
+ bList.AddRange(collectionList);
+ List<BoxFoamData> bfds = await _oldBoxFoamDataServices.QueryAsync();
+ List<OldBoxFoamType> spaceList = await _oldBoxFoamTypeServices.QueryAsync();
+ List<BoxFoamPlan> planList = await _boxFoamPlanServices.QueryAsync();
+ for (int j = 0; j < bList.Count; j++)
{
- if (string.IsNullOrEmpty(bLis[j].FixtureBoxType)) continue;
- BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == bLis[j].FixtureBoxType && d.PlanAmount > d.CompleteAmount);
- if (plan != null)
+ try
{
- int complateAmount = 0;
- BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId);
- if (bfd != null)
- {
- //更新计划数量
- complateAmount = bLis[j].Yield - bfd.FixtureProductioncapacity;
- UpdateClampData(bLis[j], bfd);
- }
- else
- {
- FixtureStatus fixtureStatus = bLis[j];
- SaveClampData(productLineCode, fixtureStatus);
- }
- plan.CompleteAmount = plan.CompleteAmount + complateAmount;
- if (complateAmount > 0)
- {
- //保存历史记录
- BoxFoamDataRealTimeHistory history = new BoxFoamDataRealTimeHistory();
-
- history.PlantCode = bfd.PlantCode;
- history.ProductlineCode = bfd.ProductlineCode;
- history.ProcessCode = bfd.ProcessCode;
- history.StationCode = bfd.StationCode;
- history.FixtureProductioncapacity = bLis[j].Yield;
- history.FixtureCuringtimesettingvalue = bLis[j].PlanCuringTime.ToString();
- history.FixtureActualtime = bLis[j].RealCuringTime.ToString();
- history.UpdatedTime = DateTime.Now;
- //事务合并
- await _boxFoamDataRealTimeHistoryServices.AddAsync(history);
- await _boxFoamPlanServices.UpdateAsync(plan);
- }
- }
- else
- {
- //更新小时数据
- BoxFoamDataRealTime bfd = bfds.SingleOrDefault(d => d.FixtureBoxtype == bLis[j].FixtureBoxType && d.SerialNumber == bLis[j].ObjId);
- if (bfd != null)
+
+ OldBoxFoamType space = spaceList.FirstOrDefault(d => d.Boxtype == bList[j].FixtureBoxType);
+ //根据夹具找货道，根据货道找物料
+ if (spaceList != null)
{
- UpdateClampData(bLis[j], bfd);
+ BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == space.MaterialCode && d.PlanAmount > d.CompleteAmount);
+ if (plan != null)
+ {
+ int complateAmount = 0;
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ //更新计划数量
+ complateAmount = bList[j].Yield - bfd.Production;
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
+ plan.CompleteAmount = plan.CompleteAmount + complateAmount;
+ await _boxFoamPlanServices.UpdateAsync(plan);
+ }
+ else
+ {
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
+ }
}
else
{
- SaveClampData(productLineCode, bLis[j]);
+ //更新小时数据
+ BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
+ if (bfd != null)
+ {
+ UpdateBoxData(bList[j], bfd);
+ }
+ else
+ {
+ SaveBoxData(productLineCode, bList[j]);
+ }
}
}
+ catch { }
+
}
- catch { }
+
+ OldBoxFoamOnLoad(bList);
}
- }
- #endregion
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
+ }
+ }
- #region 切换班组
- private async void ShiftChangeAsync(string productLineCode)
+ private async void UpdateBoxData(FixtureStatus item, BoxFoamData bfd)
{
- try
+ int hour = GetTeamHour(DateTime.Now).Seq;
+ switch (hour)
{
- //切换班组计划
- var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
- if (currentTeamTimeList.Count == 0) return;
- var list = await _boxFoamDataRealTimeServices.QueryAsync(d => d.ProductlineCode == productLineCode);
- //更新计划表操作
- CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
- currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
- currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
- currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
-
- bool result = await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
- if (result)
- {
- var obj2 = PlcHelper.siemensList.FirstOrDefault(d => d.EquipName.Equals("foamLine1Plc"));
- if (obj2 == null) { return; }
+ case 1:
+ bfd.AnHour = item.Yield - bfd.Production;
+ break;
+ case 2:
+ bfd.TwoHour = item.Yield - bfd.Production;
+ break;
+ case 3:
+ bfd.ThreeHour = item.Yield - bfd.Production;
+ break;
+ case 4:
+ bfd.FourHour = item.Yield - bfd.Production;
+ break;
+ case 5:
+ bfd.FiveHour = item.Yield - bfd.Production;
+ break;
+ case 6:
+ bfd.SixHour = item.Yield - bfd.Production;
+ break;
+ case 7:
+ bfd.SevenHour = item.Yield - bfd.Production;
+ break;
+ case 8:
+ bfd.EightHour = item.Yield - bfd.Production;
+ break;
+ case 9:
+ bfd.NineHour = item.Yield - bfd.Production;
+ break;
+ case 10:
+ bfd.TenHour = item.Yield - bfd.Production;
+ break;
+ case 11:
+ bfd.ElevenHour = item.Yield - bfd.Production;
+ break;
+ case 12:
+ bfd.TwelveHour = item.Yield - bfd.Production;
+ break;
+ default:
+ break;
+ }
- //清空 当班计划
- var realTimeList = await _boxFoamDataRealTimeHistoryServices.QueryAsync(d => d.ProductlineCode == productLineCode);
- await _boxFoamDataRealTimeHistoryServices.DeletesAsync(realTimeList);
+ bfd.Production = item.Yield;
- var plan = await _boxFoamPlanServices.QueryAsync(d => d.ProductLineCode == productLineCode);
- await _boxFoamPlanServices.DeletesAsync(plan);
- }
- }
- catch { }
+ await _oldBoxFoamDataServices.UpdateAsync(bfd);
}
- #endregion
-
- #region 更新夹具型号
- /// <summary>
- /// 更新夹具型号
- /// </summary>
- public async void UpdateClampData(FixtureStatus fixtureStatus, BoxFoamDataRealTime bfd)
+ private async void SaveBoxData(string productLineCode, FixtureStatus item)
{
+ BoxFoamData bfdata = new BoxFoamData();
+ bfdata.MainId = item.ObjId;
+ bfdata.ProductLineCode = productLineCode;
+ bfdata.Fixtureboxtype = item.FixtureBoxType;
+ bfdata.Fixturestatus = item.Status;
+ bfdata.Production = item.Yield;
+ bfdata.CuringTimeSettingValue = item.PlanCuringTime.ToString();
+ bfdata.ActualValue = item.RealCuringTime.ToString();
+ int hour = GetTeamHour(DateTime.Now).Seq;
+ switch (hour)
+ {
+ case 1:
+ bfdata.AnHour = item.Yield = bfdata.Production;
+ break;
+ case 2:
+ bfdata.TwoHour = item.Yield = bfdata.Production;
+ break;
+ case 3:
+ bfdata.ThreeHour = item.Yield = bfdata.Production;
+ break;
+ case 4:
+ bfdata.FourHour = item.Yield = bfdata.Production;
+ break;
+ case 5:
+ bfdata.FiveHour = item.Yield = bfdata.Production;
+ break;
+ case 6:
+ bfdata.SixHour = item.Yield = bfdata.Production;
+ break;
+ case 7:
+ bfdata.SevenHour = item.Yield = bfdata.Production;
+ break;
+ case 8:
+ bfdata.EightHour = item.Yield = bfdata.Production;
+ break;
+ case 9:
+ bfdata.NineHour = item.Yield = bfdata.Production;
+ break;
+ case 10:
+ bfdata.TenHour = item.Yield = bfdata.Production;
+ break;
+ case 11:
+ bfdata.ElevenHour = item.Yield = bfdata.Production;
+ break;
+ case 12:
+ bfdata.TwelveHour = item.Yield = bfdata.Production;
+ break;
+ default:
+ break;
+ }
+ bfdata.MainId = item.ObjId;
+ await _oldBoxFoamDataServices.AddAsync(bfdata);
+ }
- try
+ public CurrentTeamTimeView GetTeamHour()
+ {
+ DateTime now = DateTime.Now;
+ var list = _sysUserInfoServices.GetTeamData().Result;
+ if (list != null)
{
- bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType;
- bfd.FixtureStatus = fixtureStatus.Status.ToString();
- bfd.FixtureProductioncapacity = fixtureStatus.Yield;
- bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString();
- bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString();
- bfd.UpdatedTime = DateTime.Now;
-
- await _boxFoamDataRealTimeServices.UpdateAsync(bfd);
+ //var obj = list.FirstOrDefault().EndTime.ToString("HH:mm");
+ var view = list.FirstOrDefault();
+ return view;
}
- catch { }
+ return null;
}
- #endregion
- #region 新增夹具型号
- /// <summary>
- /// 更新夹具型号
- /// </summary>
- public async void SaveClampData(string productLineCode, FixtureStatus fixtureStatus)
+ public CurrentTeamTimeView GetTeamHour(DateTime now)
{
- var obj = await _sysUserInfoServices.GetProductLineInfo(productLineCode);
+ var obj = _sysUserInfoServices.GetTeamData(now).Result;
if (obj != null)
{
- BoxFoamDataRealTime bfd = new BoxFoamDataRealTime();
-
- bfd.PlantCode = obj.PlantCode;
- bfd.ProductlineCode = productLineCode;
- bfd.ProcessCode = obj.ProcessCode;
- bfd.StationCode = obj.StationCode;
- bfd.SerialNumber = fixtureStatus.ObjId;
- bfd.FixtureBoxtype = fixtureStatus.FixtureBoxType;
- bfd.FixtureStatus = fixtureStatus.Status.ToString();
- bfd.FixtureProductioncapacity = fixtureStatus.Yield;
- bfd.FixtureCuringtimesettingvalue = fixtureStatus.PlanCuringTime.ToString();
- bfd.FixtureActualtime = fixtureStatus.RealCuringTime.ToString();
-
- bfd.CreatedTime = DateTime.Now;
- bfd.UpdatedTime = DateTime.Now;
-
- await _boxFoamDataRealTimeServices.AddAsync(bfd);
+ return obj;
}
-
+ return null;
}
- #endregion
-
- #region 原数据采集方法
- /// <summary>
- /// 将采集到的数据保存
- /// </summary>
- /// <param name="mode"></param>
- //public async void RealTimeFoamingTask(object? sender, ElapsedEventArgs e)
- //{
- // semaphore.WaitOne();
- // try
- // {
- // string productLineCode = Appsettings.app("StationInfo", "ProductLineCode");
- // if (Collection.listFixtureStatus == null|| Collection.listFixtureStatus.Count==0) return;
- // DateTime now = DateTime.Now;
- // CurrentTeamTime time = await _currentTeamTimeServices.FirstAsync(d => d.StartTime <= now && d.EndTime >= now);
- // if (time != null)
- // {
- // ExecHourData(productLineCode);
- // }
- // else
- // {
- // ShiftChange(productLineCode);
- // }
- // }
- // catch (Exception ex)
- // {
- // Console.WriteLine(ex.Message.ToString());
- // }
- // finally
- // {
- // semaphore.Release();
- // }
- //}
-
- //private async void ShiftChange(string productLineCode)
- //{
- // //切换班组计划
- // var list = await _oldBoxFoamDataServices.QueryAsync(d => d.ProductLineCode == productLineCode);
- // List<BoxFoamDataRecord> recordList = new List<BoxFoamDataRecord>();
- // var currentTeamTimeList = await _sysUserInfoServices.GetTeamData();
- // if (currentTeamTimeList.Count == 0) return;
- // //更新计划表操作
- // CurrentTeamTime currentTeamTime = await _currentTeamTimeServices.FirstAsync();
- // currentTeamTime.TeamName = currentTeamTimeList.FirstOrDefault().TeamName;
- // currentTeamTime.StartTime = currentTeamTimeList.Min(d => d.StartTime);
- // currentTeamTime.EndTime = currentTeamTimeList.Max(d => d.EndTime);
- // await _currentTeamTimeServices.UpdateAsync(currentTeamTime);
- // //可以使用Mapping 映射
- // list.ForEach(d =>
- // {
- // BoxFoamDataRecord record = new BoxFoamDataRecord();
- // record.OrderCode = d.OrderCode;
- // record.ProductLineCode = d.ProductLineCode;
- // record.Fixturestatus = d.Production;
- // record.CuringTimeSettingValue = d.CuringTimeSettingValue;
- // record.ActualValue = d.ActualValue;
- // record.AnHour = d.AnHour;
- // record.TwoHour = d.TwoHour;
- // record.ThreeHour = d.ThreeHour;
- // record.FourHour = d.FourHour;
- // record.FiveHour = d.FiveHour;
- // record.SixHour = d.SixHour;
- // record.SevenHour = d.SevenHour;
- // record.EightHour = d.EightHour;
- // record.NineHour = d.NineHour;
- // record.TenHour = d.TenHour;
- // record.ElevenHour = d.ElevenHour;
- // record.TwelveHour = d.TwelveHour;
- // record.BoxFixturesideplate = d.BoxFixturesideplate;
- // record.BoxClosebetatemperature = d.BoxClosebetatemperature;
- // record.BoxBeat = d.BoxBeat;
- // record.CreateTime = DateTime.Now;
- // });
- // int result = await _boxFoamDataRecordServices.AddAsync(recordList);
- // if (result > 0)
- // {
- // var obj2 = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("OldMelsecPlc1"));
- // if (obj2 == null) { return; }
- // obj2.plc.WriteInt16("M216", "1");//换班 数据清空
- // //清空 当班计划
- // await _oldBoxFoamDataServices.DeletesAsync(list);
- // }
- //}
- //Semaphore semaphore = new Semaphore(1, 1);
-
- //private async void ExecHourData(string productLineCode)
- //{
- // try
- // {
- // List<FixtureStatus> bList = new List<FixtureStatus>();
-
-
- // var collectionList = collection.listFixtureStatus;
- // if (collectionList.Count == 0) return;
- // bList.AddRange(collectionList);
- // List<BoxFoamData> bfds = await _oldBoxFoamDataServices.QueryAsync();
- // List<OldBoxFoamType> spaceList = await _oldBoxFoamTypeServices.QueryAsync();
- // List<BoxFoamPlan> planList = await _boxFoamPlanServices.QueryAsync();
- // for (int j = 0; j < bList.Count; j++)
- // {
- // try
- // {
-
- // OldBoxFoamType space = spaceList.FirstOrDefault(d => d.Boxtype == bList[j].FixtureBoxType);
- // //根据夹具找货道，根据货道找物料
- // if (spaceList != null)
- // {
- // BoxFoamPlan plan = planList.FirstOrDefault(d => d.MaterialCode == space.MaterialCode && d.PlanAmount > d.CompleteAmount);
- // if (plan != null)
- // {
- // int complateAmount = 0;
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // //更新计划数量
- // complateAmount = bList[j].Yield - bfd.Production;
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // plan.CompleteAmount = plan.CompleteAmount + complateAmount;
- // await _boxFoamPlanServices.UpdateAsync(plan);
- // }
- // else
- // {
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // }
- // }
- // else
- // {
- // //更新小时数据
- // BoxFoamData bfd = bfds.FirstOrDefault(d => d.Fixtureboxtype == bList[j].FixtureBoxType && d.MainId == bList[j].ObjId);
- // if (bfd != null)
- // {
- // UpdateBoxData(bList[j], bfd);
- // }
- // else
- // {
- // SaveBoxData(productLineCode, bList[j]);
- // }
- // }
- // }
- // catch { }
-
- // }
-
- // OldBoxFoamOnLoad(bList);
- // }
- // catch (Exception ex)
- // {
- // Console.WriteLine(ex.Message);
- // }
- //}
-
- //private async void UpdateBoxData(FixtureStatus item, BoxFoamData bfd)
- //{
- // int hour = GetTeamHour(DateTime.Now).Seq;
- // switch (hour)
- // {
- // case 1:
- // bfd.AnHour = item.Yield - bfd.Production;
- // break;
- // case 2:
- // bfd.TwoHour = item.Yield - bfd.Production;
- // break;
- // case 3:
- // bfd.ThreeHour = item.Yield - bfd.Production;
- // break;
- // case 4:
- // bfd.FourHour = item.Yield - bfd.Production;
- // break;
- // case 5:
- // bfd.FiveHour = item.Yield - bfd.Production;
- // break;
- // case 6:
- // bfd.SixHour = item.Yield - bfd.Production;
- // break;
- // case 7:
- // bfd.SevenHour = item.Yield - bfd.Production;
- // break;
- // case 8:
- // bfd.EightHour = item.Yield - bfd.Production;
- // break;
- // case 9:
- // bfd.NineHour = item.Yield - bfd.Production;
- // break;
- // case 10:
- // bfd.TenHour = item.Yield - bfd.Production;
- // break;
- // case 11:
- // bfd.ElevenHour = item.Yield - bfd.Production;
- // break;
- // case 12:
- // bfd.TwelveHour = item.Yield - bfd.Production;
- // break;
- // default:
- // break;
- // }
-
- // bfd.Production = item.Yield;
-
- // await _oldBoxFoamDataServices.UpdateAsync(bfd);
- //}
-
- //private async void SaveBoxData(string productLineCode, FixtureStatus item)
- //{
- // BoxFoamData bfdata = new BoxFoamData();
- // bfdata.MainId = item.ObjId;
- // bfdata.ProductLineCode = productLineCode;
- // bfdata.Fixtureboxtype = item.FixtureBoxType;
- // bfdata.Fixturestatus = item.Status;
- // bfdata.Production = item.Yield;
- // bfdata.CuringTimeSettingValue = item.PlanCuringTime.ToString();
- // bfdata.ActualValue = item.RealCuringTime.ToString();
- // int hour = GetTeamHour(DateTime.Now).Seq;
- // switch (hour)
- // {
- // case 1:
- // bfdata.AnHour = item.Yield = bfdata.Production;
- // break;
- // case 2:
- // bfdata.TwoHour = item.Yield = bfdata.Production;
- // break;
- // case 3:
- // bfdata.ThreeHour = item.Yield = bfdata.Production;
- // break;
- // case 4:
- // bfdata.FourHour = item.Yield = bfdata.Production;
- // break;
- // case 5:
- // bfdata.FiveHour = item.Yield = bfdata.Production;
- // break;
- // case 6:
- // bfdata.SixHour = item.Yield = bfdata.Production;
- // break;
- // case 7:
- // bfdata.SevenHour = item.Yield = bfdata.Production;
- // break;
- // case 8:
- // bfdata.EightHour = item.Yield = bfdata.Production;
- // break;
- // case 9:
- // bfdata.NineHour = item.Yield = bfdata.Production;
- // break;
- // case 10:
- // bfdata.TenHour = item.Yield = bfdata.Production;
- // break;
- // case 11:
- // bfdata.ElevenHour = item.Yield = bfdata.Production;
- // break;
- // case 12:
- // bfdata.TwelveHour = item.Yield = bfdata.Production;
- // break;
- // default:
- // break;
- // }
- // bfdata.MainId = item.ObjId;
- // await _oldBoxFoamDataServices.AddAsync(bfdata);
- //}
-
- //public CurrentTeamTimeView GetTeamHour()
- //{
- // DateTime now = DateTime.Now;
- // var list = _sysUserInfoServices.GetTeamData().Result;
- // if (list != null)
- // {
- // //var obj = list.FirstOrDefault().EndTime.ToString("HH:mm");
- // var view = list.FirstOrDefault();
- // return view;
- // }
- // return null;
- //}
-
- //public CurrentTeamTimeView GetTeamHour(DateTime now)
- //{
- // var obj = _sysUserInfoServices.GetTeamData(now).Result;
- // if (obj != null)
- // {
- // return obj;
- // }
- // return null;
- //}
#endregion
diff --git a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
index c7b440b0..7dd2e166 100644
--- a/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs
@@ -58,7 +58,7 @@ namespace Aucma.Core.SheetMetal.ViewModels
Task.WaitAll(LoadData());
AddSelectData();//添加下拉菜单
RefreshHourAmount();//小时产量
- //RefreshMaterialStats();//型号产量
+ RefreshMaterialStats();//型号产量
SheetMetalPlanTaskHandle.RefreshCurrentPlanInfoEvent += RefreshCurrentPlanInfo;
}
@@ -704,23 +704,11 @@ namespace Aucma.Core.SheetMetal.ViewModels
//获取物料型号统计
string stationCode = Appsettings.app("StationInfo", "StationCode");
- List<dynamic> materialStats = _taskExecutionPlanInfoServices.GetStationMaterialStats(stationCode).Result;
- var baseBomInfoList = _baseBomInfoServices.QueryAsync().Result;
- var taskExecutionPlanInfo=_taskExecutionPlanInfoServices.QueryAsync(d=>d.ProductLineCode== stationCode).Result;
- var recordBackPanelList = _recordBackPanelComplateServices.QueryAsync().Result;
-
- //有问题，需要修改才可以
- var list = (from d in recordBackPanelList
- join t in taskExecutionPlanInfo on d.PlanCode equals t.TaskCode
- join b in baseBomInfoList on d.MaterialCode equals b.MaterialCode
- select new
- {
- MaterialCode=b.MaterialCode,
- ProductPlanCode=t.ProductPlanCode,
- CompleteAmount= t.CompleteAmount
- }).ToList();
-
- if (list != null)
+ List<dynamic> materialStats = _taskExecutionPlanInfoServices.GetStationSheetMetalStats(stationCode);
+
+
+
+ if (materialStats != null)
{
ModelStatistics.Clear();
MaterialNameList = new List<string>();
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 57f88858..36288f46 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", "7.0.4.0")]
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.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 54fddce2..a4db58d9 100644
--- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +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.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.assets.cache
index decde3af09d0c22125e131bf62df934b15aa51db..a056af0d3f9dc463157ec9d2f3a3a69d49f71e33 100644
GIT binary patch
literal 152
zcmWIWc6a1qU|?Xq<Rmle!*;>@9Jg9SCTDi6U!hcgGHs#b-%!P^sj>5aOaZDP7BB)8
n$~#-dgche36~`o|<Ywl@=;f8Br<TMNBqnDkrl%Ii5Hbq@NZcL=
literal 265
zcmWIWc6a1qU|?8kDfadCLeXf^57!-a7k0l+zAeJyz9g1&wdn2p^RFHF#mWd&L?mDa
zs#9>biU}=FEh>)jNzKbI%a75^D@{)=i77}-&Q45EEsg=1W$t1X^K?(c)BcH1w=aF#
zx;-W=v$!-dM<KYRG$k`%!N|bSGA1}9u_!eq#;?>pwIl$l8KhSqXhA?xetJ=2u7X=;
j4$#Du{E|GN4aF(h5Y=vpIXOu{9d7wKDXB#uJ@^0sWw1zb
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 eeabcb64..303b31a5 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
-E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
+D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
HwControlLib
none
false
@@ -13,7 +13,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
1204305769
71208292394
-194-1617825143
+194-2067936865
Themes\Generic.xaml;
False
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
index 7ff994f6..8d86e7ef 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.dgspec.json
@@ -1,33 +1,28 @@
{
"format": 1,
"restore": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {}
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {}
},
"projects": {
- "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj": {
+ "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -63,7 +58,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
index 7eb906eb..d4531802 100644
--- a/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
+++ b/HwControlLib/obj/HwControlLib.csproj.nuget.g.props
@@ -5,13 +5,11 @@
<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\Lenovo\.nuget\packages\;D:\开发工具\Visual Studio 2019\Shared\NuGetPackages;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
+ <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.5.0</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.7.0</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
- <SourceRoot Include="C:\Users\Lenovo\.nuget\packages\" />
- <SourceRoot Include="D:\开发工具\Visual Studio 2019\Shared\NuGetPackages\" />
- <SourceRoot Include="C:\Program Files\dotnet\sdk\NuGetFallbackFolder\" />
+ <SourceRoot Include="C:\Users\admin\.nuget\packages\" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/HwControlLib/obj/project.assets.json b/HwControlLib/obj/project.assets.json
index 1558f2be..57c51ab1 100644
--- a/HwControlLib/obj/project.assets.json
+++ b/HwControlLib/obj/project.assets.json
@@ -8,34 +8,27 @@
"net6.0-windows7.0": []
},
"packageFolders": {
- "C:\\Users\\Lenovo\\.nuget\\packages\\": {},
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages": {},
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
+ "C:\\Users\\admin\\.nuget\\packages\\": {}
},
"project": {
"version": "1.0.0",
"restore": {
- "projectUniqueName": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectUniqueName": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"projectName": "HwControlLib",
- "projectPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
- "packagesPath": "C:\\Users\\Lenovo\\.nuget\\packages\\",
- "outputPath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\obj\\",
+ "projectPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
+ "packagesPath": "C:\\Users\\admin\\.nuget\\packages\\",
+ "outputPath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\obj\\",
"projectStyle": "PackageReference",
- "fallbackFolders": [
- "D:\\开发工具\\Visual Studio 2019\\Shared\\NuGetPackages",
- "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
- ],
"configFilePaths": [
- "C:\\Users\\Lenovo\\AppData\\Roaming\\NuGet\\NuGet.Config",
- "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
+ "C:\\Users\\admin\\AppData\\Roaming\\NuGet\\NuGet.Config",
"C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
],
"originalTargetFrameworks": [
"net6.0-windows"
],
"sources": {
- "https://api.nuget.org/v3/index.json": {},
- "https://nuget.cnblogs.com/v3/index.json": {}
+ "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
+ "https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"net6.0-windows7.0": {
@@ -71,7 +64,7 @@
"privateAssets": "none"
}
},
- "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.202\\RuntimeIdentifierGraph.json"
+ "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.402\\RuntimeIdentifierGraph.json"
}
}
}
diff --git a/HwControlLib/obj/project.nuget.cache b/HwControlLib/obj/project.nuget.cache
index 248dc48c..7ca2e0be 100644
--- a/HwControlLib/obj/project.nuget.cache
+++ b/HwControlLib/obj/project.nuget.cache
@@ -1,8 +1,8 @@
{
"version": 2,
- "dgSpecHash": "ybnvfUshvvKIc46usGVB7kox/SCKkseLBijIGbMXdvJYCOdNE/0WN/DZO6u3XNrg5fccw9Qd0IkJ00WdmrPlEg==",
+ "dgSpecHash": "vdyWe2SVons+Y6get5R5Z1bsudk/C2JG+/yY8r3PrvTCQlFwmP/yYc/iedeQUqhixJt2UKO0GhNSvd1iLTRIlw==",
"success": true,
- "projectFilePath": "E:\\桌面\\AUCMA_SCADA\\HwControlLib\\HwControlLib.csproj",
+ "projectFilePath": "D:\\Project\\gitea\\AUCMA\\SCADA\\HwControlLib\\HwControlLib.csproj",
"expectedPackageFiles": [],
"logs": []
}
\ No newline at end of file
From 1344fe88e8dd841643490d6debb564f4eafa6ceb Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 4 Jan 2024 11:16:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?change-=E9=97=A8=E4=BD=93=E5=8F=91=E6=B3=A1?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=85=B7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Aucma.Core.DoorFoam/Business/DoorCollection.cs | 2 +-
Aucma.Core.DoorFoam/appsettings.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Aucma.Core.DoorFoam/Business/DoorCollection.cs b/Aucma.Core.DoorFoam/Business/DoorCollection.cs
index a5d4ccdb..72d9b131 100644
--- a/Aucma.Core.DoorFoam/Business/DoorCollection.cs
+++ b/Aucma.Core.DoorFoam/Business/DoorCollection.cs
@@ -62,7 +62,6 @@ namespace Aucma.Core.DoorFoam.Business
//读取所有模具产量
List<DoorFoamMachine> moldOutPutList = ReadModeProduct(obj);
-
#region 读取设备状态（1运行 2停机 3故障）、生产节拍、节拍、设备报警
byte[] info = obj.plc.Read("DB4.2086", 10);
int deviceStatus = 0;
@@ -90,6 +89,7 @@ namespace Aucma.Core.DoorFoam.Business
{
StationTrolleyNumber = moldStatus.StationTrolleyNumber,
GunNumber = moldStatus.GunNumber,
+ MoldStatus = moldStatus.MoldStatus,
MoldType_A = moldType.MoldType_A,
MoldType_B = moldType.MoldType_B,
MoldProdutionA = moldOutPut.MoldProdutionA,
diff --git a/Aucma.Core.DoorFoam/appsettings.json b/Aucma.Core.DoorFoam/appsettings.json
index 18151360..cd7bdc62 100644
--- a/Aucma.Core.DoorFoam/appsettings.json
+++ b/Aucma.Core.DoorFoam/appsettings.json
@@ -202,7 +202,7 @@
"EquipName": "FoamPlc",
"PlcType": "Siemens",
"Enabled": true,
- "IP": "10.10.93.180",
+ "IP": "10.10.92.180",
"Port": 102
},
{