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

UAS_MesInterface/LogicHandler.cs

@@ -395,6 +395,7 @@ namespace UAS_MesInterface
                     {
                         string nextstepcode = dh.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").ToString();
                         dh.UpdateByCondition("makeserial", "ms_status=1,ms_nextstepcode='"+ nextstepcode + "'", "ms_sncode='" + iSN + "'");
+                        dh.UpdateByCondition("makebad", "mb_status=-1", "mb_sncode='" +iSN+ "'");
                     }
                 }
             }