卡通箱核对

UAS_MES_LGDZ/FunctionCode/Make/Make_OutBoxSnCheck.cs

@@ -45,7 +45,7 @@ namespace UAS_MES_NEW.Make
         }
         string ErrorMessage = "";
 
-        int CheckRow = 0;
+
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
             //判断是enter事件
@@ -88,13 +88,14 @@ namespace UAS_MES_NEW.Make
                         }
                     }
                 }
-             
+                int CheckRow = 0;
                 for (int i = 0; i < CheckSnDGV.Rows.Count; i++)
                 {
                     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)
                     {
@@ -118,12 +119,16 @@ namespace UAS_MES_NEW.Make
                 {
                     if (pa_nextstep != "" && pa_nextstep == User.CurrentStepCode)
                     {
-                        LogicHandler.OutBoxStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode, User.UserCode, "栈板采集成功，栈板号:" + pa_outboxcode.Text, "栈板采集", out ErrorMessage);
+                        if (LogicHandler.OutBoxStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode, User.UserCode, "栈板采集成功，栈板号:" + pa_outboxcode.Text, "栈板采集", out ErrorMessage))
+                        {
+                            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='" + pa_outboxcode.Text + "'").ToString() + "', PA_CURRENTSTEP = '' ", "pa_outboxcode='" + pa_outboxcode.Text + "'");
+                        };
                     }
                     CheckRow = 0;
                     SetCheck set = new SetCheck("OK", Color.Green);
                     BaseUtil.SetFormCenter(set);
                     set.ShowDialog();
+                    pa_outboxcode.Clear();
                     pa_outboxcode.Focus();
                 }
             }
@@ -136,7 +141,7 @@ namespace UAS_MES_NEW.Make
                 dt = (DataTable)dh.ExecuteSql("select pd_barcode,pd_makecode pa_makecode,pa_nextstep from packagedetail left join package on pa_id=pd_paid where pd_outboxcode='" + pa_outboxcode.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
-                    CheckNum.Text = CheckRow + "/" + CheckSnDGV.Rows.Count;
+                    //CheckNum.Text = CheckRow + "/" + CheckSnDGV.Rows.Count;
                     pa_nextstep = dt.Rows[0]["pa_nextstep"].ToString();
                     if (pa_nextstep != User.CurrentStepCode && pa_nextstep != "")
                     {