优化箱号过站

UAS_MES_HYSX/FunctionCode/Make/Make_OutBoxSnCheck.cs

@@ -127,7 +127,8 @@ namespace UAS_MES_NEW.Make
                 {
                     if (pa_nextstep != "" && pa_nextstep == User.CurrentStepCode)
                     {
-                        if (LogicHandler.OutBoxStepPass(pa_outboxcode.Text, pa_makecode.Text, User.UserSourceCode, User.UserCode, "栈板采集成功，栈板号:" + pa_outboxcode.Text, "栈板采集", out ErrorMessage))
+                        string outboxcode = dh.getFieldDataByCondition("package", "pa_outboxcode", "pa_zxcode='"+ pa_outboxcode.Text + "'").ToString();
+                        if (LogicHandler.OutBoxStepPass(outboxcode==""?pa_outboxcode.Text:outboxcode, 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 + "'");
                         }