优化标签打印内容

UAS_MES_ODLF/FunctionCode/Make/Make_FuselageLabelPrintCheck.cs

@@ -33,6 +33,7 @@ namespace UAS_MES_NEW.Make
 
         string oMakeCode = "";
         string oMsId = "";
+        string oPSN = "";
 
         string oErrorMessage = "";
 
@@ -202,6 +203,7 @@ namespace UAS_MES_NEW.Make
                                 return;
                             }
                         }
+                        oPSN = "";
                         dt = (DataTable)dh.ExecuteSql("select ms_imei1,ms_imei2,ms_netcard,ms_othid1,nvl(ms_psn,mil_psn)ms_psn,ms_othid2,ms_netcode,ms_othid3,ms_mac,ms_bt from makeserial left join makeimeilist on mil_sncode=ms_sncode and ms_makecode=mil_makecode where ms_id='" + oMsId + "'", "select");
                         string[] par = sncheck.Text.Split('#');
                         for (int i = 0; i < par.Length; i++)
@@ -269,6 +271,7 @@ namespace UAS_MES_NEW.Make
                                     case "OPSN":
                                         if (value.ToUpper() == dt.Rows[0]["ms_psn"].ToString().ToUpper())
                                         {
+                                            oPSN = value.ToUpper();
                                             OperateResult.AppendText(">>oPSN:" + value + "核对成功\n", Color.Green);
                                         }
                                         else
@@ -326,7 +329,7 @@ namespace UAS_MES_NEW.Make
                                 }
                             }
                         }
-                        dh.ExecuteSql("update makeserial set ms_sncode='" + dt.Rows[0]["ms_psn"].ToString().ToUpper() + "',ms_firstsn='" + dt.Rows[0]["ms_psn"].ToString().ToUpper() + "',ms_tsn='" + sncode.Text + "' where ms_id='" + oMsId + "' ", "update");
+                        dh.ExecuteSql("update makeserial set ms_sncode='" + oPSN + "',ms_firstsn='" + oPSN + "',ms_tsn='" + sncode.Text + "' where ms_id='" + oMsId + "' ", "update");
                         //所选标签不为空
                         if (PrintLabel.SelectedValue != null)
                         {
@@ -343,7 +346,7 @@ namespace UAS_MES_NEW.Make
                             OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
                             //按照打印张数打印
                             //doc = lbl.Documents.Open(PrintLabel.Text);
-                            if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, sncode.Text, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
+                            if (Print.CodeSoft(Tag.ToString(), ref lbl, PrintLabel.Text, PrintLabel.SelectedValue.ToString(), Printer.Text, oPSN, int.Parse(PrintNum.Text), oMakeCode, ma_prodcode.Text, "机身标", "0", out oErrorMessage))
                             {
                                 //提示用户打印成功
                                 OperateResult.AppendText(">>序列号:" + sncode.Text + "打印成功\n", Color.Green);
@@ -355,7 +358,7 @@ namespace UAS_MES_NEW.Make
                             //记录日志
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "机身标打印", "机身标打印成功", sncode.Text, "");
                             //更新打印的数据
-                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
+                            if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, oPSN, "机身标打印", "机身标打印成功", User.UserCode, out oErrorMessage))
                             {
                                 sncheck.Clear();
                                 sncheck.Focus();