From e6f5b275fce42a874e2982670cc908149d406fad Mon Sep 17 00:00:00 2001
From: ldw <11622064+ldw888@user.noreply.gitee.com>
Date: Thu, 7 Aug 2025 15:36:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JinYuan.ControlCenter/app.config          |  12 ++++++++++--
 JinYuan.DAL/JinYuan.DAL.csproj            |   2 +-
 JinYuan.DAL/app.config                    |   2 +-
 JinYuan.DAL/packages.config               |   2 +-
 JinYuan.MES/app.config                    |   8 ++++----
 JinYuan.VirtualDataLibrary/app.config     |  12 ++++++++++--
 LargeSquareOne/LargeSquareOne.csproj      |   2 +-
 LargeSquareOne/LargeSquareOne.csproj.user |   2 +-
 LargeSquareOne/packages.config            |   2 +-
 数据库/dbo.Hourprod.Table.sql             | Bin 1334 -> 1334 bytes
 10 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/JinYuan.ControlCenter/app.config b/JinYuan.ControlCenter/app.config
index 2f8cf2e..49f6200 100644
--- a/JinYuan.ControlCenter/app.config
+++ b/JinYuan.ControlCenter/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
@@ -40,7 +40,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
@@ -50,6 +50,14 @@
         <assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-0.7.2.0" newVersion="0.7.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/JinYuan.DAL/JinYuan.DAL.csproj b/JinYuan.DAL/JinYuan.DAL.csproj
index 68671f1..8d2376a 100644
--- a/JinYuan.DAL/JinYuan.DAL.csproj
+++ b/JinYuan.DAL/JinYuan.DAL.csproj
@@ -57,7 +57,7 @@
       <HintPath>..\packages\NLog.6.0.2\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="NLog.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.Windows.Forms.6.0.2\lib\net35\NLog.Windows.Forms.dll</HintPath>
+      <HintPath>..\packages\NLog.Windows.Forms.6.0.0\lib\net35\NLog.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="SqlSugar, Version=5.1.4.94, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlSugar.5.1.4.94\lib\SqlSugar.dll</HintPath>
diff --git a/JinYuan.DAL/app.config b/JinYuan.DAL/app.config
index c57a44c..3d97034 100644
--- a/JinYuan.DAL/app.config
+++ b/JinYuan.DAL/app.config
@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/JinYuan.DAL/packages.config b/JinYuan.DAL/packages.config
index b5cb6cd..f3b2555 100644
--- a/JinYuan.DAL/packages.config
+++ b/JinYuan.DAL/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
   <package id="MySql.Data" version="8.1.0" targetFramework="net472" />
   <package id="NLog" version="6.0.2" targetFramework="net472" />
-  <package id="NLog.Windows.Forms" version="6.0.2" targetFramework="net472" />
+  <package id="NLog.Windows.Forms" version="6.0.0" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net462" />
   <package id="SqlSugar" version="5.1.4.94" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
diff --git a/JinYuan.MES/app.config b/JinYuan.MES/app.config
index 720b767..4312428 100644
--- a/JinYuan.MES/app.config
+++ b/JinYuan.MES/app.config
@@ -8,11 +8,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -24,11 +24,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/JinYuan.VirtualDataLibrary/app.config b/JinYuan.VirtualDataLibrary/app.config
index 5230b0c..d053702 100644
--- a/JinYuan.VirtualDataLibrary/app.config
+++ b/JinYuan.VirtualDataLibrary/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -40,7 +40,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
@@ -50,6 +50,14 @@
         <assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-0.7.2.0" newVersion="0.7.2.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file
diff --git a/LargeSquareOne/LargeSquareOne.csproj b/LargeSquareOne/LargeSquareOne.csproj
index b9ee221..e0c399d 100644
--- a/LargeSquareOne/LargeSquareOne.csproj
+++ b/LargeSquareOne/LargeSquareOne.csproj
@@ -115,7 +115,7 @@
       <HintPath>..\packages\NLog.6.0.2\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="NLog.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.Windows.Forms.6.0.2\lib\net35\NLog.Windows.Forms.dll</HintPath>
+      <HintPath>..\packages\NLog.Windows.Forms.6.0.0\lib\net35\NLog.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="PLCCommunication, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="PresentationCore" />
diff --git a/LargeSquareOne/LargeSquareOne.csproj.user b/LargeSquareOne/LargeSquareOne.csproj.user
index 78c201e..ea14450 100644
--- a/LargeSquareOne/LargeSquareOne.csproj.user
+++ b/LargeSquareOne/LargeSquareOne.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
     <PublishUrlHistory>publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />
diff --git a/LargeSquareOne/packages.config b/LargeSquareOne/packages.config
index d1d60ab..59c2873 100644
--- a/LargeSquareOne/packages.config
+++ b/LargeSquareOne/packages.config
@@ -13,7 +13,7 @@
   <package id="MySql.Data" version="8.1.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="NLog" version="6.0.2" targetFramework="net472" />
-  <package id="NLog.Windows.Forms" version="6.0.2" targetFramework="net472" />
+  <package id="NLog.Windows.Forms" version="6.0.0" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
   <package id="SeeSharpTools.JY.GUI" version="1.4.4.533" targetFramework="net472" />
   <package id="SqlSugar" version="5.1.4.94" targetFramework="net472" />
diff --git a/数据库/dbo.Hourprod.Table.sql b/数据库/dbo.Hourprod.Table.sql
index 53279a0a177e2aecdf2944cd274023f26ea11b6b..3c0fab227bed40a764621b34a0ccb4d3be3afdd0 100644
GIT binary patch
delta 18
ZcmdnSwT+AA|GzYbjZ6kin@yOQm;plc1-k$M

delta 20
ccmdnSwT+AE|G$ka227LxF$!&VVfw@b09ell_y7O^