Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -213,10 +213,10 @@ namespace UAS_MES.Make
                                 string cm_status = dt.Rows[0]["cm_status"].ToString();
                                 string cm_makecode = dt.Rows[0]["cm_makecode"].ToString();
                                 string cm_craftcode = dt.Rows[0]["cm_craftcode"].ToString();
-                             // sql.Clear();
-                             // sql.Append("update makeserial set ms_nextstepcode=ms_stepcode where ms_id=" + oMsid);
-                             // dh.ExecuteSql(sql.GetString(), "update");
-                             // 清除已被使用的序列号
+                                sql.Clear();
+                                sql.Append("update makeserial set ms_nextstepcode=ms_stepcode where ms_id=" + oMsid);
+                                dh.ExecuteSql(sql.GetString(), "update");
+                                // 清除已被使用的序列号
                                 sql.Clear();
                                 sql.Append("update makeserial set ms_nextmacode='' where ms_sncode in(select cm_barcode from craftmaterial where ");
                                 sql.Append("cm_makecode='" + cm_makecode + "' and cm_sncode='" + code.Text + "' and cm_stepcode='" + cm_stepcode + "' and cm_craftcode='" + cm_craftcode + "' ");