Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/PublicMethod/LogicHandler.cs

@@ -961,9 +961,9 @@ namespace UAS_MES.PublicMethod
                 if (ms_stepcode == StepCode)
                 {
                     if (ifrework == "0")
-                        dh.UpdateByCondition("makeserial", "ms_status=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                        dh.UpdateByCondition("makeserial", "ms_status=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
                     else
-                        dh.UpdateByCondition("makeserial", "ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
+                        dh.UpdateByCondition("makeserial", "ms_reworkstatus=3,ms_nextstepcode=''", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
                 }
                 else
                 {