LastSncode记录送检前最后一个序列号

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -26,7 +26,7 @@ namespace UAS_MES.Make
         string oMsID = "";
         string oOutBoxCode = "";
         decimal StandardQTY = 0;
-
+        string LastSncode;
         System.DateTime[] indate;
 
         public Make_PackageCollection()
@@ -247,6 +247,7 @@ namespace UAS_MES.Make
                                     if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                                     {
                                         LoadCheckQTY();
+                                        LastSncode = sn_code.Text;
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "装箱采集", "采集成功", sn_code.Text, "");
                                         //满箱更新状态为1
@@ -341,7 +342,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -37,6 +37,7 @@ namespace UAS_MES.Make
         decimal StandardQTY = 0;
 
         string oOutBoxCode = "";
+        string LastSncode;
 
         //创建串口实例
         SerialPort serialPort1 = new SerialPort();
@@ -331,6 +332,7 @@ namespace UAS_MES.Make
                                                 pa_standardqty.Text = "";
                                                 pa_status.Text = "1";
                                                 OperateResult.AppendText(">>箱号" + pa_outboxcode.Text + "称量合格\n", Color.Green);
+                                                LastSncode = sn_code.Text;
                                                 if (AutoPrint.Checked)
                                                     Print_Click(new object(), new EventArgs());
                                             }
@@ -423,7 +425,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -35,7 +35,7 @@ namespace UAS_MES.Make
         double MinWeight;
 
         int StandardQTY = 0;
-
+        string LastSncode;
         string oOutBoxCode = "";
 
         //创建串口实例
@@ -266,6 +266,7 @@ namespace UAS_MES.Make
                                     {
                                         LoadCheckQTY();
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
+                                        LastSncode = sn_code.Text;
                                         //满箱更新状态为1
                                         if (int.Parse(pa_currentqty.Text == "" ? "0" : pa_currentqty.Text) + 1 == int.Parse(pr_outboxinnerqty.Text))
                                         {
@@ -345,7 +346,7 @@ namespace UAS_MES.Make
                 ob_nowcheckqty.ForeColor = Color.Black;
                 SendCheck.Enabled = false;
                 OperateResult.AppendText(">>批次" + ob_checkno.Text + "送检成功\n", Color.Green);
-                LogicHandler.InsertMakeProcess(sn_code.Text, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
+                LogicHandler.InsertMakeProcess(LastSncode, oMakeCode, User.UserSourceCode, "手动送检", "手动送检成功", User.UserCode);
                 //记录操作日志
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "手动送检", "手动送检成功", "", ob_checkno.Text);
                 ob_checkno.Text = "";