卡通箱核对

UAS_MES_LGDZ/FunctionCode/Make/Make_OutBoxSnCheck.cs

@@ -93,9 +93,17 @@ namespace UAS_MES_NEW.Make
                 {
                     if (CheckSnDGV.Rows[i].Cells["pd_barcode"].Value.ToString() == sncode.Text)
                     {
-                        CheckSnDGV.Rows[i].Cells["pd_checksn"].Value = sncode.Text;
-                        FindSN = true;
-                        LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱装箱核对成功", "核对条码" + sncode.Text + "箱号" + pa_outboxcode.Text, "", "");
+                        if (CheckSnDGV.Rows[i].Cells["pd_checksn"].Value == null)
+                        {
+                            CheckSnDGV.Rows[i].Cells["pd_checksn"].Value = sncode.Text;
+                            FindSN = true;
+                            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, pa_makecode.Text, User.UserLineCode, User.UserSourceCode, "卡通箱装箱核对成功", "核对条码" + sncode.Text + "箱号" + pa_outboxcode.Text, "", "");
+                        }
+                        else
+                        {
+                            OperateResult.AppendText("<<SN" + sncode.Text + "已校验\n", Color.Red, sncode);
+                            return;
+                        }
                     }
                     if (CheckSnDGV.Rows[i].Cells["pd_checksn"].Value == null)
                     {
@@ -112,7 +120,7 @@ namespace UAS_MES_NEW.Make
                 }
                 else
                 {
-                    OperateResult.AppendText("<<SN" + sncode.Text + "校验失败\n", Color.Red, sncode);
+                    OperateResult.AppendText("<<SN" + sncode.Text + "校验失败,不在箱中\n", Color.Red, sncode);
                 }
                 CheckNum.Text = CheckRow + "/" + CheckSnDGV.Rows.Count;
                 if (AllCheck)