shim 8 years ago
parent
commit
3e903646cc
2 changed files with 10 additions and 1 deletions
  1. 1 1
      UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs
  2. 9 0
      UAS-MES/UAS-MES.csproj

+ 1 - 1
UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -171,7 +171,7 @@ namespace UAS_MES.Make
                                         else
                                         //不为空,进行过转换。不勾选修改结果,就不能再修改
                                         {
-                                            OperateResult.AppendText(">>序列号" + code.Text + "错误,或者已经转换过\n", Color.Red);
+                                            OperateResult.AppendText(">>序列号" + code.Text + "已经转换过\n", Color.Red);
                                             code.Text = "";
                                             OperateResult.AppendText("<<请重新输入TSN\n", Color.Black);
                                         }

+ 9 - 0
UAS-MES/UAS-MES.csproj

@@ -501,6 +501,12 @@
     <Compile Include="FunctionCode\Make\Make_NewPallet.Designer.cs">
       <DependentUpon>Make_NewPallet.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_PackageCollectionWeigh.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_PackageCollectionWeigh.Designer.cs">
+      <DependentUpon>Make_PackageCollectionWeigh.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_PalletCollection.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -997,6 +1003,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_NewPallet.resx">
       <DependentUpon>Make_NewPallet.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_PackageCollectionWeigh.resx">
+      <DependentUpon>Make_PackageCollectionWeigh.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_PalletCollection.resx">
       <DependentUpon>Make_PalletCollection.cs</DependentUpon>
     </EmbeddedResource>