文件合并

UAS-MES/PublicMethod/LogicHandler.cs

@@ -973,10 +973,10 @@ namespace UAS_MES.PublicMethod
                 }
                 else
                 {
-                    if (ifrework == "0")
+                    if (ifrework == "0")    
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_status=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "' ");
                     else
-                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                        dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
                     SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", "NG", iUserCode, out oErrorMessage);
                 }
             }