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

UAS-MES/FunctionCode/Make/Make_PalletWeigh.cs

@@ -103,6 +103,10 @@ namespace UAS_MES.Make
                     OperateResult.AppendText("<<输入不能为空\n", Color.Red);
                     return;
                 }
+                if (weight.Text=="") {
+                    OperateResult.AppendText("<<未读取到重量信息\n", Color.Red);
+                    return;
+                }
                 //校验栈板号
                 sql.Clear();
                 sql.Append("select pa_id,pa_prodcode,pr_spec ||','|| pr_detail pr_detailspec,pa_makecode,pa_salecode,pa_totalqty,");
@@ -152,7 +156,7 @@ namespace UAS_MES.Make
                         {
                             try
                             {
-                                if (PrintLabel.SelectedValue.ToString() == "")
+                                if (PrintLabel.SelectedValue==null)
                                 {
                                     OperateResult.AppendText(">>产品:" + pa_prodcode.Text + "未维护栈板标签模板\n", Color.Red, palletcode);
                                     return;