调整打印和称重顺序

UAS_MES_LGDZ/FunctionCode/Packing/Packing_CartonBoxWeigh_ReadLine.cs

@@ -153,7 +153,7 @@ namespace UAS_MES_NEW.Packing
                         {
                             LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱" + outboxcode.Text + "称重", "称量不合格:" + weight.Text.Trim(), outboxcode.Text, "");
                             LogicHandler.RecordProdWeight(outboxcode.Text, "CARTON", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
-                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测未通过\n", Color.Red, outboxcode);
+                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "检测未通过\n", Color.Red);
                             return;
                         }
                     }
@@ -162,17 +162,7 @@ namespace UAS_MES_NEW.Packing
                         LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "卡通箱" + outboxcode.Text + "称重", "称量完成:" + weight.Text.Trim(), outboxcode.Text, "");
                         LogicHandler.RecordProdWeight(outboxcode.Text, "CARTON", float.Parse(ActualWeight.ToString()), "kg", User.UserLineCode, pr_code.Text, User.UserSourceCode, User.UserName);
                     }
-                    if (AutoPrint.Checked)
-                    {
-                        if (PrintLabel.Items.Count > 0)
-                        {
-                            Confirm.PerformClick();
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>产品" + pr_code.Text + "未维护卡通标签\n", Color.Red);
-                        }
-                    }
+                   
                     ListViewItem lsi = new ListViewItem();
                     lsi.SubItems.Add(outboxcode.Text);
                     lsi.SubItems.Add(ActualWeight.ToString() + pr_cartonunit.Text);
@@ -190,15 +180,26 @@ namespace UAS_MES_NEW.Packing
                     //}
                     if (!LogicHandler.OutBoxStepPass(outboxcode.Text, ma_code.Text, User.UserSourceCode, User.UserCode, "卡通箱:" + outboxcode.Text + "整箱过站", "卡通箱整箱过站", out ErrorMessage))
                     {
-                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, outboxcode);
+                        OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
                         return;
                     }
                     dh.UpdateByCondition("package", "pa_printcount= nvl(pa_printcount,0)+1,pa_weight='" + ActualWeight + "',pa_status=1,pa_packageqty=pa_currentqty,pa_totalqty=pa_currentqty", "pa_outboxcode='" + outboxcode.Text + "'");
                     dh.UpdateByCondition("package", "pa_nextstep='" + dh.getFieldDataByCondition("packagedetail left join makeserial on ms_sncode=pd_barcode and ms_makecode=pd_makecode", "max(ms_nextstepcode)", "pd_outboxcode='" + outboxcode.Text + "'").ToString() + "' ,PA_CURRENTSTEP = '' ", "pa_outboxcode='" + outboxcode.Text + "'");
+                    if (AutoPrint.Checked)
+                    {
+                        if (PrintLabel.Items.Count > 0)
+                        {
+                            Confirm.PerformClick();
+                        }
+                        else
+                        {
+                            OperateResult.AppendText(">>产品" + pr_code.Text + "未维护卡通标签\n", Color.Red);
+                        }
+                    }
                     LoadCheckQTY();
-                    outboxcode.Clear();
+                    outboxcode.SelectAll();
                 }
-                else OperateResult.AppendText(">>箱号" + outboxcode.Text + "当前执行工序不是" + User.CurrentStepCode + "\n", Color.Red, outboxcode);
+                else OperateResult.AppendText(">>箱号" + outboxcode.Text + "当前执行工序不是" + User.CurrentStepCode + "\n", Color.Red);
             }
         }
 
@@ -233,9 +234,9 @@ namespace UAS_MES_NEW.Packing
                             }
                         }
                     }
-                    catch (IOException ex) { OperateResult.AppendText(">>" + ex.Message + "\n", Color.Red, outboxcode); }
+                    catch (IOException ex) { OperateResult.AppendText(">>" + ex.Message + "\n", Color.Red); }
                 }
-                else OperateResult.AppendText(">>端口已被占用，请关闭其他窗口\n", Color.Red, outboxcode);
+                else OperateResult.AppendText(">>端口已被占用，请关闭其他窗口\n", Color.Red);
             }
         }