change -修改步骤浮动差并排除电子膨胀阀，添加打印机相关

ProductionSystem/Forms/HomeForm.cs

@@ -1777,23 +1777,31 @@ namespace ProductionSystem.Forms
                                         }
                                         else
                                         {
-                                            writeVal = step.WriteValue;
+                                            if(paraCode != "DZPZF1_DB" && paraCode != "DZPZF2_DB")
-                                            returnVal = step.ReturnValue;
-                                            int val1 = Convert.ToInt32(writeVal);
-                                            int val2 = Convert.ToInt32(returnVal);
-                                            if (returnVal == null)
                                             {
-                                                result = 2;
+                                                writeVal = step.WriteValue;
-                                            }
+                                                returnVal = step.ReturnValue;
-                                            if (val1 == val2)
+                                                int val1 = Convert.ToInt32(writeVal);
-                                            {
+                                                int val2 = Convert.ToInt32(returnVal);
-                                                result = 1;
+                                                if (returnVal == null)
+                                                {
+                                                    result = 2;
+                                                }
+                                                if (Math.Abs(val2 - val1) <= 5)
+                                                {
+                                                    result = 1;
+                                                }
+                                                else
+                                                {
+                                                    result = 2;
+                                                }
                                             }
                                             else
                                             {
-                                                result = 2;
+                                                result = 1;
                                             }
                                             
+
                                             middleMyTestResultControls[j].TestResultText = result == 1 ? "OK" : (result == 2 ? "NG" : "");
                                             middleMyTestResultControls[j].TestResultForeColor = Color.White;
                                             middleMyTestResultControls[j].TestResultBackColor = result == 1 ? Color.Green : (result == 2 ? Color.Red : Color.Gainsboro);

ProductionSystem/Forms/MainForm.cs

@@ -229,18 +229,18 @@ namespace ProductionSystem.Forms
                         paraColManagerForm.Show();
                     }
                     break;
-                case "DicSeeting"://数据字典配置
+                case "Printer"://数据字典配置
                     if (!CheckHasMdiChildForm("Form1"))
                     {
-                        DicManagerForm dicManagerForm = new DicManagerForm
+                        Form1 form1 = new Form1
                         {
                             MdiParent = this,
                             Dock = DockStyle.Fill
                         };
-                        dicManagerForm.Show();
+                        form1.Show();
                     }
                     break;
-                case "Printer"://数据字典配置
+                case "DicSeeting"://数据字典配置
                     if (!CheckHasMdiChildForm("DicManagerForm"))
                     {
                         DicManagerForm dicManagerForm = new DicManagerForm

ProductionSystem/Forms/SystemSetting/Form1.cs

@@ -1,4 +1,5 @@
 using DevExpress.XtraEditors;
+using ProductionSystem_Log;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -20,7 +21,38 @@ namespace ProductionSystem.Forms.SystemSetting
 
         private void printLabel_Click(object sender, EventArgs e)
         {
+            Print2();
+        }
+
+        private bool Print2()
+        {
+            BarTender.Application btApp = new BarTender.Application();
+            BarTender.Format btFormat;
+            btFormat = btApp.Formats.Add();
+            //LogHelper.Info($"{printCode}打开模板文件......");
+            //btFormat.SetNamedSubStringValue("sn", sn);
+            ////批次号
+            //if (!string.IsNullOrEmpty(batchNo))
+            //{
+            //    btFormat.SetNamedSubStringValue("sn1", batchNo);
+            //}
+            ////版本号
+            //if (!string.IsNullOrEmpty(softCode))
+            //{
+            //    btFormat.SetNamedSubStringValue("sn2", softCode);
+            //}
+            //btFormat.PrintSetup.NumberSerializedLabels = 1;
+            var pintOut = btFormat.PrintOut(true, false);
+
+            //LogHelper.Info($"{printCode}PrintOut方法返回值={pintOut}");
+
+            //btFormat.Close(BarTender.BtSaveOptions.btDoNotSaveChanges); //退出时是否保存标签   
+            btApp.Quit(BarTender.BtSaveOptions.btSaveChanges);//退出时同退退出BarTender进程
 
+            //var msg = $"[INFO]{printCode}打印机打印成功，打印条码={sn}";
+            //LogHelper.Info(msg);
+            //LogHandler(msg);
+            return true;
         }
     }
 }

ProductionSystem/ProductionSystem.csproj

@@ -40,8 +40,11 @@
     <ApplicationIcon>program.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Bartender, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Bartender.1.0.0\lib\net45\Bartender.dll</HintPath>
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.5.2\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="Csv, Version=2.0.93.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Csv.2.0.93\lib\net40\Csv.dll</HintPath>
     </Reference>
     <Reference Include="Custom.Communication.Framework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -72,6 +75,9 @@
     <Reference Include="EPPlus.System.Drawing, Version=6.1.1.0, Culture=neutral, PublicKeyToken=2308d35469c9bac0, processorArchitecture=MSIL">
       <HintPath>..\packages\EPPlus.System.Drawing.6.1.1\lib\net462\EPPlus.System.Drawing.dll</HintPath>
     </Reference>
+    <Reference Include="FluentFTP, Version=45.1.0.0, Culture=neutral, PublicKeyToken=f4af092b1d8df44f, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentFTP.45.1.0\lib\net472\FluentFTP.dll</HintPath>
+    </Reference>
     <Reference Include="HslCommunication, Version=10.6.1.0, Culture=neutral, PublicKeyToken=3d72ad3b6b5ec0e3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Dll\HslCommunication.dll</HintPath>
@@ -80,12 +86,20 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Dll\HslControls.dll</HintPath>
     </Reference>
+    <Reference Include="Interop.BarTender, Version=11.3.7.1, Culture=neutral, PublicKeyToken=109ff779a1b4cbc7, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>Dll\Interop.BarTender.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.HashCode, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.HashCode.1.1.1\lib\net461\Microsoft.Bcl.HashCode.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyModel, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyModel.7.0.0\lib\net462\Microsoft.Extensions.DependencyModel.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
@@ -106,6 +120,22 @@
     <Reference Include="Rougamo, Version=1.4.1.0, Culture=neutral, PublicKeyToken=5a3dc9b06a9acd5d, processorArchitecture=MSIL">
       <HintPath>..\packages\Rougamo.Fody.1.4.1\lib\netstandard2.0\Rougamo.dll</HintPath>
     </Reference>
+    <Reference Include="SdkApi.Core, Version=2.16.2905.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Zebra.Printer.SDK.2.16.2905\lib\net471\SdkApi.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="SdkApi.Desktop, Version=2.16.2905.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Zebra.Printer.SDK.2.16.2905\lib\net471\SdkApi.Desktop.dll</HintPath>
+    </Reference>
+    <Reference Include="SdkApi.Desktop.Usb, Version=2.16.2905.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Zebra.Printer.SDK.2.16.2905\lib\net471\SdkApi.Desktop.Usb.dll</HintPath>
+    </Reference>
+    <Reference Include="Seagull.BarTender.Print, Version=11.3.7.1, Culture=neutral, PublicKeyToken=109ff779a1b4cbc7, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Dll\Seagull.BarTender.Print.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpSnmpLib, Version=10.0.9.0, Culture=neutral, PublicKeyToken=4c00852d3788e005, processorArchitecture=MSIL">
+      <HintPath>..\packages\Lextm.SharpSnmpLib.10.0.9\lib\net452\SharpSnmpLib.dll</HintPath>
+    </Reference>
     <Reference Include="SqlSugar, Version=5.1.2.2, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlSugar.5.1.2.2\lib\SqlSugar.dll</HintPath>
     </Reference>
@@ -116,6 +146,11 @@
     <Reference Include="System.Collections.Immutable, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.7.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.Collections.Specialized, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -128,13 +163,29 @@
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.NameResolution, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Numerics" />
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Security" />
     <Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -143,6 +194,11 @@
     <Reference Include="System.Text.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.Json.7.0.0\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
+    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Threading.Channels, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Channels.7.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
     </Reference>

ProductionSystem/packages.config

@@ -1,28 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Bartender" version="1.0.0" targetFramework="net48" />
+  <package id="Csv" version="2.0.93" targetFramework="net48" />
   <package id="EPPlus" version="6.2.10" targetFramework="net48" />
   <package id="EPPlus.Interfaces" version="6.1.1" targetFramework="net48" />
   <package id="EPPlus.System.Drawing" version="6.1.1" targetFramework="net48" />
+  <package id="FluentFTP" version="45.1.0" targetFramework="net48" />
   <package id="Fody" version="6.2.5" targetFramework="net48" developmentDependency="true" enable="false" />
+  <package id="Lextm.SharpSnmpLib" version="10.0.9" targetFramework="net48" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net48" />
   <package id="Microsoft.Bcl.HashCode" version="1.1.1" targetFramework="net48" />
+  <package id="Microsoft.Extensions.DependencyModel" version="7.0.0" targetFramework="net48" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net48" />
   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.4.1" targetFramework="net48" />
   <package id="NewLife.Core" version="10.9.2024.402" targetFramework="net48" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Npgsql" version="4.1.12" targetFramework="net48" />
+  <package id="Portable.BouncyCastle" version="1.8.5.2" targetFramework="net48" />
   <package id="Rougamo.Fody" version="1.4.1" targetFramework="net48" />
   <package id="SqlSugar" version="5.1.2.2" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections.Immutable" version="7.0.0" targetFramework="net48" />
+  <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net48" />
   <package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net48" />
   <package id="System.Memory" version="4.5.5" targetFramework="net48" />
+  <package id="System.Net.NameResolution" version="4.3.0" targetFramework="net48" />
+  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
   <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
   <package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net48" />
   <package id="System.Text.Json" version="7.0.0" targetFramework="net48" />
+  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net48" />
   <package id="System.Threading.Channels" version="7.0.0" targetFramework="net48" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="Zebra.Printer.SDK" version="2.16.2905" targetFramework="net48" />
 </packages>