Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -157,7 +157,7 @@ namespace UAS_MES.Make
                 else
                 {
                     //查询箱号是否存在
-                    dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=1", "select");
+                    dt = (DataTable)dh.ExecuteSql("select pa_id,pa_prodcode pr_code,pa_makecode ms_makecode,pr_detail from package left join product on pr_code=pa_prodcode where pa_outboxcode='" + inputText.Text + "' and pa_type=1", "select");
                     if (dt.Rows.Count==0) {
                         //无值，返回提示用户“箱号不存在”， “>>请输入卡通箱号”
                         OperateResult.AppendText("<<箱号:" + inputText.Text + "不存在\n", Color.Red, inputText);
@@ -176,6 +176,9 @@ namespace UAS_MES.Make
 
         private void PrintLabel_TextChanged(object sender, EventArgs e)
         {
+            if (pr_code.Text=="") {
+                return;
+            }
             if (fuselagel.Checked)
             {
                 getlabel = "select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + pr_code.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc";
@@ -414,6 +417,10 @@ namespace UAS_MES.Make
             pr_code.Text = "";
             pr_detail.Text = "";
             TSN = "";
+            if (listA != null)
+            {
+                listA.Clear();
+            }
         }
     }
 }

UAS-MES/UAS-MES.csproj

@@ -513,6 +513,12 @@
     <Compile Include="FunctionCode\Make\Make_PalletCollection.Designer.cs">
       <DependentUpon>Make_PalletCollection.cs</DependentUpon>
     </Compile>
+    <Compile Include="FunctionCode\Make\Make_RePrintLabel.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FunctionCode\Make\Make_RePrintLabel.Designer.cs">
+      <DependentUpon>Make_RePrintLabel.cs</DependentUpon>
+    </Compile>
     <Compile Include="FunctionCode\Make\Make_SeqProgramTransform.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1009,6 +1015,9 @@
     <EmbeddedResource Include="FunctionCode\Make\Make_PalletCollection.resx">
       <DependentUpon>Make_PalletCollection.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="FunctionCode\Make\Make_RePrintLabel.resx">
+      <DependentUpon>Make_RePrintLabel.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FunctionCode\Make\Make_SeqProgramTransform.resx">
       <DependentUpon>Make_SeqProgramTransform.cs</DependentUpon>
     </EmbeddedResource>
@@ -1180,6 +1189,7 @@
       <DependentUpon>SystemSetting_ScaleTest.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Cert\深圳市优软科技有限公司.pfx" />
+    <None Include="ClassDiagram1.cd" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>