代码合并

UAS_MES_HGS/FunctionCode/Make/Make_ColorBoxWeigh.cs

@@ -14,6 +14,9 @@ using UAS_MES_NEW.PublicForm;
 using System.Net.Sockets;
 using System.Collections.Generic;
 using System.Net;
+using System.Text;
+using Seagull.BarTender.Print;
+using System.Linq;
 
 namespace UAS_MES_NEW.Make
 {
@@ -349,7 +352,6 @@ namespace UAS_MES_NEW.Make
             dh.Dispose();
             //thread.Abort();
         }
-        Engine engine;
         private void Confirm_Click(object sender, EventArgs e)
         {
             if (PrintLabel.Items.Count != 0)

UAS_MES_HGS/UAS_MES_HGS.csproj

@@ -123,7 +123,6 @@
     <Reference Include="DevExpress.XtraScheduler.v15.2.Core, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraScheduler.v15.2.Extensions, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraSpellChecker.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DevExpress.XtraTreeList.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="ExcelHelper, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>Tool\ExcelHelper.dll</HintPath>
@@ -567,6 +566,18 @@
     <Compile Include="FunctionCode\Make\Make_ColorBoxLoadPrintBZ.Designer.cs">
       <DependentUpon>Make_ColorBoxLoadPrintBZ.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh.Designer.cs">
+      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh_ReadLine.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_ColorBoxWeigh_ReadLine.Designer.cs">
+      <DependentUpon>Make_ColorBoxWeigh_ReadLine.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_FeedingCollectionCombineFix.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1349,6 +1360,12 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxLoadPrintBZ.resx">
       <DependentUpon>Make_ColorBoxLoadPrintBZ.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh.resx">
+      <DependentUpon>Make_ColorBoxWeigh.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_ColorBoxWeigh_ReadLine.resx">
+      <DependentUpon>Make_ColorBoxWeigh_ReadLine.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_FeedingCollectionCombineFix.resx">
       <DependentUpon>Make_FeedingCollectionCombineFix.cs</DependentUpon>
     </EmbeddedResource>