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

UAS-MES/FunctionCode/Make/Make_RePrintLabel.cs

@@ -156,7 +156,7 @@ namespace UAS_MES.Make
                     inputText.Text = "";
                 }
                 //打印类型为卡通箱
-                else
+                else if(CartonBox.Checked)
                 {
                     //查询箱号是否存在
                     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");
@@ -255,13 +255,13 @@ namespace UAS_MES.Make
                 }
             }
             //打印类型为卡通箱标签
-            else
+            else if(CartonBox.Checked)
             {
                 //select pa_downstatus from package where pa_outboxcode=? 输入值code
-                mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='"+label.Text+"'", "select");
+                mapB = (DataTable)dh.ExecuteSql("select pa_downstatus from package where pa_outboxcode='"+inputValue.Text+"'", "select");
                 //无值提示用户箱号错误，不存在。
                 if (mapB.Rows.Count==0) {
-                    OperateResult.AppendText("<<箱号:"+label.Text+"错误,不存在\n", Color.Red);
+                    OperateResult.AppendText("<<箱号:"+inputValue.Text+"错误,不存在\n", Color.Red);
                     return;
                 }
                 //判断通过,打印
@@ -372,7 +372,7 @@ namespace UAS_MES.Make
                     }
                 }
                 //勾选的是卡通箱
-                else
+                else if(CartonBox.Checked)
                 {
                     //第一次输入
                     if (TSN == "")