修改

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -86,7 +86,7 @@ namespace UAS_MES.Make
                     if (!LogicHandler.GetMakeInfo(sncode.Text, out oMakeCode, out oErrorMessage))
                     {
                         OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red);
-                        OperateResult.AppendText(">>请输入序列号\n", Color.Black,sncode);
+                        OperateResult.AppendText(">>请输入序列号\n", Color.Black, sncode);
                         return;
                     }
                     //调用公共方法CheckStepSNAndMacode判断工序是否正确
@@ -110,12 +110,17 @@ namespace UAS_MES.Make
                                 OperateResult.AppendText("<<工单号：" + ma_code.Text + "\n", Color.Black);
                                 //提示用户“<< 序列号：XXXX”
                                 OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
+                                if (PrintLabel.SelectedValue == null)
+                                {
+                                    OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
+                                    return;
+                                }
                                 if (pr_change)
                                 {
                                     pr_change = false;
                                     if (MessageBox.Show("是否使用默认标签", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
                                     {
-                                        OperateResult.AppendText(">>请选择标签模板\n", Color.Green);
+                                        OperateResult.AppendText(">>请选择标签模板\n", Color.Green,sncode);
                                         return;
                                     }
                                 }
@@ -132,7 +137,7 @@ namespace UAS_MES.Make
                             //如果打印张数为空，返回
                             if (PrintNum.Text == "" || int.Parse(PrintNum.Text) == 0)
                             {
-                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red,sncode);
+                                OperateResult.AppendText(">>打印张数不可空或者为0\n", Color.Red, sncode);
                                 //清空输入框的值，聚焦
                                 sncode.Focus();
                                 //提示用户“>>请输入SN”
@@ -145,7 +150,7 @@ namespace UAS_MES.Make
                             //提示用户打印成功
                             OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
                             //记录日志
-                            LogicHandler.DoCommandLog(Tag.ToString(),User.UserCode,oMakeCode,User.UserLineCode,User.UserSourceCode, "机身标打印","机身标打印成功", sncode.Text,"");
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
                             //更新打印的数据
                             LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage);
                             //清空输入框的值，聚焦
@@ -172,17 +177,17 @@ namespace UAS_MES.Make
                         //标签为空
                         else
                         {
-                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red,sncode);
+                            OperateResult.AppendText(">>产品编号:" + ma_prodcode.Text + "未维护机身标签\n", Color.Red, sncode);
                         }
                     }
                     else
                     {
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red,sncode);
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                     }
                 }
                 else
                 {
-                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red,sncode);
+                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
                 }
             }
         }
@@ -191,7 +196,7 @@ namespace UAS_MES.Make
             dt = (DataTable)dh.ExecuteSql("select pl_labelcode ||':'||pl_labelname pl_name,pl_labelname,pl_labelcode, pl_indate,pl_labelurl from productlabel where pl_prodcode='" + ma_prodcode.Text + "'and PL_LABELTYPE='机身标' order by pl_isdefault desc", "select");
             if (dt.Rows.Count == 0)
             {
-                OperateResult.AppendText(">>产品:" + ma_prodcode.Text + "未维护机身标标签模板\n", Color.Red);
+                return;
             }
             PrintLabel.DataSource = dt;
             PrintLabel.DisplayMember = "pl_name";